You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/08/15 09:29:01 UTC
svn commit: r1157731 - in /axis/axis2/java/rampart/trunk:
modules/distribution/src.xml modules/rampart-integration/pom.xml pom.xml
Author: veithen
Date: Mon Aug 15 07:29:00 2011
New Revision: 1157731
URL: http://svn.apache.org/viewvc?rev=1157731&view=rev
Log:
Removed the rampart.mar.version and rahas.mar.version properties. Starting with version 1.5.1, Axis2 supports version numbers with multiple components so that there is no need anymore to have different version numbers for MARs.
Modified:
axis/axis2/java/rampart/trunk/modules/distribution/src.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/distribution/src.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/src.xml?rev=1157731&r1=1157730&r2=1157731&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/src.xml Mon Aug 15 07:29:00 2011
@@ -8,7 +8,7 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>rampart-src-${rampart.version}</outputDirectory>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
<includes>
<include>**/modules/**/*</include>
<include>**/pom.xml</include>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1157731&r1=1157730&r2=1157731&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Mon Aug 15 07:29:00 2011
@@ -51,7 +51,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -59,7 +59,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
- <version>${rahas.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -134,7 +134,7 @@
<tasks>
<property name="addressing.mar" value="addressing-${axis2.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-classes/modules/addressing-${axis2.version}.mar" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-classes/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-classes/modules/rampart-${project.version}.mar" />
<mkdir dir="target/temp-ramp" />
<mkdir dir="target/temp-ramp/META-INF" />
@@ -147,15 +147,15 @@
<mkdir dir="target/test-resources/rampart_client_repo" />
<mkdir dir="target/test-resources/rampart_client_repo/conf" />
<mkdir dir="target/test-resources/rampart_client_repo/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart.mar.version}.mar" />
- <copy file="target/artifacts/rahas-${rahas.mar.version}.mar" tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rampart_client_repo/modules/rampart-${project.version}.mar" />
+ <copy file="target/artifacts/rahas-${project.version}.mar" tofile="target/test-resources/rampart_client_repo/modules/rahas-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rampart_client_repo/modules/addressing-${axis2.version}.mar" />
<mkdir dir="target/test-resources/rampart_service_repo" />
<mkdir dir="target/test-resources/rampart_service_repo/conf" />
<mkdir dir="target/test-resources/rampart_service_repo/services" />
<mkdir dir="target/test-resources/rampart_service_repo/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart.mar.version}.mar" />
- <copy file="target/artifacts/rahas-${rahas.mar.version}.mar" tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rampart_service_repo/modules/rampart-${project.version}.mar" />
+ <copy file="target/artifacts/rahas-${project.version}.mar" tofile="target/test-resources/rampart_service_repo/modules/rahas-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rampart_service_repo/modules/addressing-${axis2.version}.mar" />
<!-- Service 1 -->
@@ -306,14 +306,14 @@
<mkdir dir="target/test-resources/rahas_client_repo/conf" />
<mkdir dir="target/test-resources/rahas_client_repo/modules" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rahas_client_repo/modules/addressing-${axis2.version}.mar" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rahas_client_repo/modules/rampart-${project.version}.mar" />
<!-- Rahas Test1: SAML Token test -->
<mkdir dir="target/test-resources/rahas_service_repo_1" />
<mkdir dir="target/test-resources/rahas_service_repo_1/conf" />
<mkdir dir="target/test-resources/rahas_service_repo_1/services" />
<mkdir dir="target/test-resources/rahas_service_repo_1/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart.mar.version}.mar" />
- <copy file="target/artifacts/rahas-${rahas.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${project.version}.mar" />
+ <copy file="target/artifacts/rahas-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${axis2.version}.mar" />
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/rahas/s1-services.xml" tofile="target/temp-rahas/META-INF/services.xml" />
@@ -326,8 +326,8 @@
<mkdir dir="target/test-resources/rahas_service_repo_3/conf" />
<mkdir dir="target/test-resources/rahas_service_repo_3/services" />
<mkdir dir="target/test-resources/rahas_service_repo_3/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart.mar.version}.mar" />
- <copy file="target/artifacts/rahas-${rahas.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${project.version}.mar" />
+ <copy file="target/artifacts/rahas-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${axis2.version}.mar" />
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/rahas/s3-services.xml" tofile="target/temp-rahas/META-INF/services.xml" />
@@ -338,7 +338,7 @@
<mkdir dir="target/test-resources/default_security_client_repo" />
<mkdir dir="target/test-resources/default_security_client_repo/conf" />
<mkdir dir="target/test-resources/default_security_client_repo/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/default_security_client_repo/modules/rampart-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/default_security_client_repo/modules/addressing-${axis2.version}.mar" />
<copy file="src/test/resources/conf/axis2.xml" tofile="target/test-resources/default_security_client_repo/conf/axis2.xml" />
<!--
@@ -348,8 +348,8 @@
<mkdir dir="target/test-resources/rahas_service_repo_5/conf" />
<mkdir dir="target/test-resources/rahas_service_repo_5/services" />
<mkdir dir="target/test-resources/rahas_service_repo_5/modules" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_5/modules/rampart-${rampart.mar.version}.mar" />
- <copy file="target/artifacts/rahas-${rahas.mar.version}.mar" tofile="target/test-resources/rahas_service_repo_5/modules/rahas-${rahas.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_5/modules/rampart-${project.version}.mar" />
+ <copy file="target/artifacts/rahas-${project.version}.mar" tofile="target/test-resources/rahas_service_repo_5/modules/rahas-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/rahas_service_repo_5/modules/addressing-${axis2.version}.mar" />
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes" file="src/test/resources/rahas/s5-services.xml" tofile="target/temp-rahas/META-INF/services.xml" />
@@ -367,10 +367,10 @@
<mkdir dir="target/test-resources/scenario1_service_repo/modules" />
<!-- setup scenario 1 client repository-->
<copy file="src/test/resources/security/s1.client.axis2.xml" tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario1_client_repo/modules/rampart-${project.version}.mar" />
<!-- setup scenario 1 service repository-->
<copy file="src/test/resources/security/s1.service.axis2.xml" tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario1_service_repo/modules/rampart-${project.version}.mar" />
<mkdir dir="target/temp-interop/META-INF" />
@@ -386,9 +386,9 @@
<mkdir dir="target/test-resources/scenario2_service_repo/services" />
<mkdir dir="target/test-resources/scenario2_service_repo/modules" />
<copy file="src/test/resources/security/s2.client.axis2.xml" tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario2_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s2.service.axis2.xml" tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario2_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s2.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -401,9 +401,9 @@
<mkdir dir="target/test-resources/scenario2a_service_repo/services" />
<mkdir dir="target/test-resources/scenario2a_service_repo/modules" />
<copy file="src/test/resources/security/s2a.client.axis2.xml" tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s2a.service.axis2.xml" tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s2a.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
<!-- Scenario 3 -->
@@ -415,9 +415,9 @@
<mkdir dir="target/test-resources/scenario3_service_repo/services" />
<mkdir dir="target/test-resources/scenario3_service_repo/modules" />
<copy file="src/test/resources/security/s3.client.axis2.xml" tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario3_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s3.service.axis2.xml" tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario3_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s3.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -430,9 +430,9 @@
<mkdir dir="target/test-resources/scenario4_service_repo/services" />
<mkdir dir="target/test-resources/scenario4_service_repo/modules" />
<copy file="src/test/resources/security/s4.client.axis2.xml" tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario4_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s4.service.axis2.xml" tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario4_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s4.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -445,9 +445,9 @@
<mkdir dir="target/test-resources/scenario5_service_repo/services" />
<mkdir dir="target/test-resources/scenario5_service_repo/modules" />
<copy file="src/test/resources/security/s5.client.axis2.xml" tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario5_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s5.service.axis2.xml" tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario5_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s5.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -460,9 +460,9 @@
<mkdir dir="target/test-resources/scenario6_service_repo/services" />
<mkdir dir="target/test-resources/scenario6_service_repo/modules" />
<copy file="src/test/resources/security/s6.client.axis2.xml" tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario6_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s6.service.axis2.xml" tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario6_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s6.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -475,9 +475,9 @@
<mkdir dir="target/test-resources/scenario7_service_repo/services" />
<mkdir dir="target/test-resources/scenario7_service_repo/modules" />
<copy file="src/test/resources/security/s7.client.axis2.xml" tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario7_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s7.service.axis2.xml" tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenario7_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/s7.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -490,9 +490,9 @@
<mkdir dir="target/test-resources/scenarioST1_service_repo/services" />
<mkdir dir="target/test-resources/scenarioST1_service_repo/modules" />
<copy file="src/test/resources/security/sST1.client.axis2.xml" tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/sST1.service.axis2.xml" tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/sST1.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -505,9 +505,9 @@
<mkdir dir="target/test-resources/mtom_sec_service_repo/services" />
<mkdir dir="target/test-resources/mtom_sec_service_repo/modules" />
<copy file="src/test/resources/security/secMtom.client.axis2.xml" tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/secMtom.service.axis2.xml" tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${project.version}.mar" />
<copy file="src/test/resources/security/secMtom.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar" basedir="target/temp-interop" />
@@ -521,11 +521,11 @@
<mkdir dir="target/test-resources/complete_service_repo/modules" />
<!-- Test with addressing and MTOM client repository-->
<copy file="src/test/resources/security/complete.client.axis2.xml" tofile="target/test-resources/complete_client_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/complete_client_repo/modules/rampart-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/complete_client_repo/modules/addressing-${axis2.version}.mar" />
<!-- Test with addressing and MTOMservice repository-->
<copy file="src/test/resources/security/complete.service.axis2.xml" tofile="target/test-resources/complete_service_repo/conf/axis2.xml" />
- <copy file="target/artifacts/rampart-${rampart.mar.version}.mar" tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart.mar.version}.mar" />
+ <copy file="target/artifacts/rampart-${project.version}.mar" tofile="target/test-resources/complete_service_repo/modules/rampart-${project.version}.mar" />
<copy file="target/artifacts/addressing-${axis2.version}.mar" tofile="target/test-resources/complete_service_repo/modules/addressing-${axis2.version}.mar" />
<copy file="src/test/resources/security/complete.service.xml" tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
<!-- Create the .aar file -->
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1157731&r1=1157730&r2=1157731&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Mon Aug 15 07:29:00 2011
@@ -383,11 +383,6 @@
</modules>
<properties>
-
- <rampart.version>${project.version}</rampart.version>
- <rampart.mar.version>${project.version}</rampart.mar.version>
- <rahas.mar.version>${project.version}</rahas.mar.version>
-
<axis2.version>1.7.0-SNAPSHOT</axis2.version>
<axiom.version>1.2.13-SNAPSHOT</axiom.version>