Author: veithen
Date: Thu Dec 22 10:48:14 2011
New Revision: 1222171
URL: http://svn.apache.org/viewvc?rev=1222171&view=rev
Log:
RAMPART-338: Merged r1221926 to the 1.6 branch.
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:48:14 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
+/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
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=1222171&r1=1222170&r2=1222171&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:48:14 2011
@@ -23,9 +23,6 @@
<property name="keys.dir" value="../keys"/>
<property name="temp.client.dir" value="build/temp_client"/>
- <property name="addressing.mar" value="addressing-1.6.0.mar"/>
- <property name="rampart.mar" value="rampart-1.6.0.mar"/>
-
<property name="client.port" value="8080"/>
<property name="server.port" value="8080"/>
@@ -165,8 +162,12 @@
<mkdir
dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}"
overwrite="true"/>
+ <copy
todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -221,8 +222,12 @@
<copy file="sample@{sample.number}/client.axis2.xml"
tofile="${client.repos.dir}/sample@{sample.number}/conf/axis2.xml"
overwrite="true"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}"
tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}"
tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}"
overwrite="true"/>
+ <copy
todir="${client.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<mkdir dir="${temp.client.dir}"/>
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=1222171&r1=1222170&r2=1222171&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:48:14 2011
@@ -24,10 +24,6 @@
<property name="keys.dir" value="../keys"/>
<property name="temp.client.dir" value="build/temp_client"/>
- <property name="addressing.mar" value="addressing-1.6.0.mar"/>
- <property name="rampart.mar" value="rampart-1.6.0.mar"/>
- <property name="rahas.mar" value="rahas-1.6.0.mar"/>
-
<property name="client.port" value="8080"/>
<property name="server.port" value="8080"/>
@@ -137,9 +133,13 @@
<mkdir
dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rahas.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${rahas.mar}"
overwrite="true"/>
+ <copy
todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ <include name="rahas-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -192,9 +192,13 @@
<mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rahas.mar}"
tofile="${service.repos.dir}/sample@{sample.number}/modules/${rahas.mar}"
overwrite="true"/>
+ <copy
todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ <include name="rahas-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -248,8 +252,12 @@
<mkdir
dir="${client.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}"
tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}"
overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}"
tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}"
overwrite="true"/>
+ <copy
todir="${client.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<mkdir dir="${temp.client.dir}"/>
