Author: chathura
Date: Tue Feb 15 02:45:24 2005
New Revision: 153928
URL: http://svn.apache.org/viewcvs?view=rev&rev=153928
Log:
Change the build files to pick the jars from the axis lib inside Tomcat
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml?view=diff&r1=153927&r2=153928
==============================================================================
---
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
(original)
+++
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
Tue Feb 15 02:45:24 2005
@@ -21,20 +21,22 @@
-
<path id="classpath.library">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="classpath.classes">
- <pathelement location="${classes.dir}"/>
- </path>
-
- <path id="classpath.runtimelibraries">
- <pathelement path="classpath.classes"/>
- </path>
+ <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath.client">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath.runtimelibraries">
+ <path refid="classpath.library" />
+ <path refid="classpath.client" />
+ </path>
@@ -43,6 +45,7 @@
<delete dir="${classes.dir}" />
<delete dir="${services.dir}" failonerror="false"/>
<delete dir="${build.dir}" />
+ <delete dir="${lib.dir}"/>
</target>
<target name="validateTomcatHome">
@@ -60,6 +63,7 @@
<target name="createDir">
<mkdir dir="${build.dir}" />
+ <mkdir dir="${lib.dir}"/>
<mkdir dir="${classes.dir}" />
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
@@ -91,7 +95,7 @@
<target name="echoString" depends="compile">
<java classname="samples.userguide.sample1.client.EchoString">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="Hi Axis2 this is to test the EchoString(to
change the string look in the build file)"/>
</java>
@@ -99,7 +103,7 @@
<target name="echoInt" depends="compile">
<java
classname="samples.userguide.sample1.client.EchoInt">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="329"/>
</java>
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml?view=diff&r1=153927&r2=153928
==============================================================================
---
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
(original)
+++
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
Tue Feb 15 02:45:24 2005
@@ -23,18 +23,21 @@
<path id="classpath.library">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <path id="classpath.classes">
- <pathelement location="${classes.dir}"/>
- </path>
-
- <path id="classpath.runtimelibraries">
- <pathelement path="classpath.classes"/>
- </path>
+ <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath.client">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath.runtimelibraries">
+ <path refid="classpath.library" />
+ <path refid="classpath.client" />
+ </path>
@@ -43,6 +46,7 @@
<delete dir="${classes.dir}" />
<delete dir="${services.dir}" failonerror="false"/>
<delete dir="${build.dir}" />
+ <delete dir="${lib.dir}"/>
</target>
<target name="validateTomcatHome">
@@ -60,6 +64,7 @@
<target name="createDir">
<mkdir dir="${build.dir}" />
+ <mkdir dir="${lib.dir}"/>
<mkdir dir="${classes.dir}" />
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
@@ -92,7 +97,7 @@
<target name="echoString" depends="compile">
<java classname="samples.userguide.sample2.client.EchoString">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="Hi Axis2 this is to test the EchoString(to
change the string look in the build file)"/>
</java>
@@ -100,7 +105,7 @@
<target name="echoInt" depends="compile">
<java
classname="samples.userguide.sample2.client.EchoInt">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="329"/>
</java>
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml?view=diff&r1=153927&r2=153928
==============================================================================
---
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
(original)
+++
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
Tue Feb 15 02:45:24 2005
@@ -23,26 +23,29 @@
<path id="classpath.library">
- <fileset dir="${lib.dir}">
+ <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
</path>
- <path id="classpath.classes">
- <pathelement location="${classes.dir}"/>
+ <path id="classpath.client">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<path id="classpath.runtimelibraries">
- <pathelement path="classpath.classes"/>
+ <path refid="classpath.library" />
+ <path refid="classpath.client" />
</path>
-
<target name="clean" description="Delete all generated files">
<delete dir="${classes.dir}" />
<delete dir="${services.dir}" failonerror="false"/>
<delete dir="${build.dir}" />
+ <delete dir="${lib.dir}"/>
</target>
<target name="validateTomcatHome">
@@ -61,6 +64,7 @@
<target name="createDir">
<mkdir dir="${build.dir}" />
<mkdir dir="${classes.dir}" />
+ <mkdir dir="${lib.dir}"/>
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
@@ -92,7 +96,7 @@
<target name="echoString" depends="compile">
<java classname="samples.userguide.sample3.client.EchoString">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="Hi Axis2 this is to test the EchoString(to
change the string look in the build file)"/>
</java>
@@ -100,7 +104,7 @@
<target name="echoInt" depends="compile">
<java
classname="samples.userguide.sample3.client.EchoInt">
- <classpath refid="classpath.library"/>
+ <classpath refid="classpath.runtimelibraries"/>
<arg value="8080"/>
<arg value="329"/>
</java>
