Author: veithen
Date: Wed Dec 21 23:37:41 2011
New Revision: 1221940
URL: http://svn.apache.org/viewvc?rev=1221940&view=rev
Log:
Include the Axis2 conf directory in the class path so that log4j is properly
configured.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/build.xml?rev=1221940&r1=1221939&r2=1221940&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/build.xml
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/build.xml Wed
Dec 21 23:37:41 2011
@@ -30,6 +30,15 @@
<property environment="env"/>
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <path id="runtime.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${env.AXIS2_HOME}/conf"/>
+ </path>
+
<target name="check.dependency" unless="env.AXIS2_HOME">
<echo message="AXIS2_HOME must be set"/>
</target>
@@ -155,7 +164,6 @@
<sequential>
<property name="modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir
dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir
dir="${service.repos.dir}/sample@{sample.number}/services"/>
@@ -196,11 +204,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer"
fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -211,7 +215,6 @@
<sequential>
<property name="modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<!-- Create the client repo -->
<mkdir
dir="${client.repos.dir}/sample@{sample.number}"/>
@@ -250,9 +253,7 @@
<arg
value="${sample.services.url}/sample@{sample.number}"/>
<arg value="${client.repos.dir}/sample@{sample.number}"/>
<classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
+ <path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
</java>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml?rev=1221940&r1=1221939&r2=1221940&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml Wed
Dec 21 23:37:41 2011
@@ -30,7 +30,16 @@
<property name="sample.services.url"
value="http://localhost:${client.port}/axis2/services"/>
<property environment="env"/>
-
+
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <path id="runtime.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${env.AXIS2_HOME}/conf"/>
+ </path>
+
<target name="check.dependency" unless="env.AXIS2_HOME">
<echo message="AXIS2_HOME must be set"/>
</target>
@@ -126,7 +135,6 @@
<sequential>
<property name="modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir
dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir
dir="${service.repos.dir}/sample@{sample.number}/services"/>
@@ -169,11 +177,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer"
fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -185,7 +189,6 @@
<sequential>
<property name="modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
@@ -229,11 +232,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer"
fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -244,7 +243,6 @@
<sequential>
<property name="modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<!-- Create the client repo -->
<mkdir
dir="${client.repos.dir}/sample@{sample.number}"/>
@@ -281,9 +279,7 @@
<arg value="${client.repos.dir}/sample@{sample.number}"/>
<arg value="sample@{sample.number}/policy.xml"/>
<classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
+ <path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
</java>
