This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 703a0181392ebdd46c00217d149c614e3b1f69ef
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Thu Dec 22 10:29:15 2011 +0000
Merged r1221940 (with changes) to the 1.5 branch to get log4j working in
the samples.
---
modules/rampart-samples/basic/build.xml | 21 +++++++++++----------
modules/rampart-samples/policy/build.xml | 30 +++++++++++++-----------------
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/modules/rampart-samples/basic/build.xml
b/modules/rampart-samples/basic/build.xml
index 7f3b690..6517093 100644
--- a/modules/rampart-samples/basic/build.xml
+++ b/modules/rampart-samples/basic/build.xml
@@ -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}"/>
+ </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>
diff --git a/modules/rampart-samples/policy/build.xml
b/modules/rampart-samples/policy/build.xml
index b913e69..af91b66 100644
--- a/modules/rampart-samples/policy/build.xml
+++ b/modules/rampart-samples/policy/build.xml
@@ -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}"/>
+ </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>
