Author: veithen
Date: Thu Dec 22 10:57:51 2011
New Revision: 1222176
URL: http://svn.apache.org/viewvc?rev=1222176&view=rev
Log:
Merged r1221940 to the 1.6 branch to get log4j working in the samples.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 10:57:51 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221940
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1222176&r1=1222175&r2=1222176&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
Thu Dec 22 10:57:51 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/branches/1_6/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1222176&r1=1222175&r2=1222176&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
Thu Dec 22 10:57:51 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>
