rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add mx4j{,-impl,-jmx} to tomcatwrapper build classpath.

This commit is contained in:
Andrew Overholt 2006-07-05 16:52:38 +00:00
parent 8ff44ba0bc
commit 4f6cb3cf64
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-tomcat55-build.patch
View File

@ -1,5 +1,5 @@
--- build.xml.orig 2006-07-04 16:09:31.000000000 -0400
+++ build.xml 2006-07-04 16:14:19.000000000 -0400
--- build.xml.orig 2006-07-05 12:47:26.000000000 -0400
+++ build.xml 2006-07-05 12:50:49.000000000 -0400
@@ -58,7 +58,7 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
@ -9,7 +9,7 @@
<delete dir="${temp.folder}"/>
</target>
@@ -144,50 +144,51 @@
@@ -144,50 +144,56 @@
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
@ -81,6 +81,12 @@
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="lib/jmx.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
+ <pathelement path="lib/mx4j.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j.jar"/>
+ <pathelement path="lib/mx4j-impl.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
+ <pathelement path="lib/mx4j-jmx.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
+ <pathelement path="lib/jsp-api.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
+ <pathelement path="lib/naming-factory.jar"/>
@ -101,11 +107,10 @@
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
+ <pathelement path="lib/servlets-invoker.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
+
</path>
<!-- compile the source code -->
<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
@@ -224,37 +225,37 @@
@@ -224,37 +230,37 @@
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
@ -154,7 +159,7 @@
<delete dir="${temp.folder}"/>
</target>
@@ -277,7 +278,7 @@
@@ -277,7 +283,7 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
</delete>