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 a06889cb25114b31fbc7d69427d04e362a88f421
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Thu Dec 22 10:16:50 2011 +0000
RAMPART-338: Merged r1221926 to the 1.5 branch.
---
modules/rampart-samples/basic/build.xml | 19 ++++++++++++-------
modules/rampart-samples/policy/build.xml | 32 ++++++++++++++++++++------------
2 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/modules/rampart-samples/basic/build.xml
b/modules/rampart-samples/basic/build.xml
index 830b5e0..7f3b690 100644
--- a/modules/rampart-samples/basic/build.xml
+++ b/modules/rampart-samples/basic/build.xml
@@ -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.5.4.mar"/>
- <property name="rampart.mar" value="rampart-1.5.1.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}"/>
diff --git a/modules/rampart-samples/policy/build.xml
b/modules/rampart-samples/policy/build.xml
index cab2149..b913e69 100644
--- a/modules/rampart-samples/policy/build.xml
+++ b/modules/rampart-samples/policy/build.xml
@@ -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.5.4.mar"/>
- <property name="rampart.mar" value="rampart-1.5.1.mar"/>
- <property name="rahas.mar" value="rahas-1.5.1.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}"/>
