Author: veithen
Date: Wed Dec 21 22:55:49 2011
New Revision: 1221926
URL: http://svn.apache.org/viewvc?rev=1221926&view=rev
Log:
RAMPART-338: Avoid hardcoded module version numbers.
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=1221926&r1=1221925&r2=1221926&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 22:55:49 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-SNAPSHOT.mar"/>
- <property name="rampart.mar" value="rampart-SNAPSHOT.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/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=1221926&r1=1221925&r2=1221926&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 22:55:49 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-SNAPSHOT.mar"/>
- <property name="rampart.mar" value="rampart-SNAPSHOT.mar"/>
- <property name="rahas.mar" value="rahas-SNAPSHOT.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}"/>
