You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ru...@apache.org on 2007/08/08 01:12:50 UTC
svn commit: r563696 - in /webservices/rampart/branches/java/1_3: ./
modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/
modules/rampart-policy/ modules/rampart-tests/ modules/rampart-trust-mar/
modules/rampart-trust/
Author: ruchithf
Date: Tue Aug 7 16:12:49 2007
New Revision: 563696
URL: http://svn.apache.org/viewvc?view=rev&rev=563696
Log:
Fixed version issues and got the 1.3-SNAPSHOT build working
Modified:
webservices/rampart/branches/java/1_3/modules/rampart-core/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-integration/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-mar/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-policy/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-tests/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-trust-mar/pom.xml
webservices/rampart/branches/java/1_3/modules/rampart-trust/pom.xml
webservices/rampart/branches/java/1_3/pom.xml
Modified: webservices/rampart/branches/java/1_3/modules/rampart-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-core/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-core/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-core/pom.xml Tue Aug 7 16:12:49 2007
@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.rampart</groupId>
+ <groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-core</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Rampart - Core</name>
<build>
@@ -34,16 +34,16 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-integration/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-integration/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-integration/pom.xml Tue Aug 7 16:12:49 2007
@@ -5,13 +5,13 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-integration</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Rampart - Integration</name>
<build>
@@ -31,7 +31,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${pom.version}</version>
+ <version>${rampart.mar.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -39,7 +39,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
- <version>${pom.version}</version>
+ <version>${rahas.mar.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -47,7 +47,7 @@
<artifactItem>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>SNAPSHOT</version>
+ <version>${addressing.mar.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/artifacts</outputDirectory>
@@ -129,11 +129,11 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <property name="addressing.mar" value="addressing-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-classes/modules/addressing-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rampart-SNAPSHOT.mar"
- tofile="target/test-classes/modules/rampart-SNAPSHOT.mar"/>
+ <property name="addressing.mar" value="addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-classes/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-classes/modules/rampart-${rampart.mar.version}.mar"/>
<mkdir dir="target/temp-ramp"/>
<mkdir dir="target/temp-ramp/META-INF"/>
@@ -151,22 +151,22 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rahas-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rahas-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_client_repo/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/addressing-${addressing.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rahas-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rahas-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rampart_service_repo/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/addressing-${addressing.mar.version}.mar"/>
<!-- Service 1 -->
<copy overwrite="yes"
@@ -282,10 +282,10 @@
<mkdir dir="target/test-resources/rahas_client_repo"/>
<mkdir dir="target/test-resources/rahas_client_repo/conf"/>
<mkdir dir="target/test-resources/rahas_client_repo/modules"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_client_repo/modules/addressing-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rampart-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart.mar.version}.mar"/>
<!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
<copy file="${user.home}/.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"
@@ -297,12 +297,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rahas-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rahas-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${addressing.mar.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s1-services.xml"
@@ -317,12 +317,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rahas-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rahas-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${addressing.mar.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s3-services.xml"
@@ -335,10 +335,10 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/default_security_client_repo/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/default_security_client_repo/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing.mar.version}.mar"/>
<copy file="src/test/resources/conf/axis2.xml"
tofile="target/test-resources/default_security_client_repo/conf/axis2.xml"/>
<!--
@@ -348,12 +348,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_5/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/rahas-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_5/modules/rahas-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/rahas_service_repo_5/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/rahas_service_repo_5/modules/addressing-${addressing.mar.version}.mar"/>
<!-- copy the services.xml and create the aar -->
<copy overwrite="yes"
file="src/test/resources/rahas/s5-services.xml"
@@ -374,13 +374,13 @@
<!-- 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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario1_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<mkdir dir="target/temp-interop/META-INF"/>
@@ -400,12 +400,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario2_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario2_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s2.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -422,12 +422,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario2a_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario2a_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s2a.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -443,12 +443,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario3_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario3_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s3.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -465,12 +465,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario4_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario4_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s4.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -487,12 +487,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario5_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario5_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s5.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -509,12 +509,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario6_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario6_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s6.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -531,12 +531,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario7_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenario7_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/s7.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -553,12 +553,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <copy file="target/artifacts/rampart-${rampart.mar.version}.mar"
+ tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart.mar.version}.mar"/>
<copy file="src/test/resources/security/sST1.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -575,12 +575,12 @@
<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-SNAPSHOT.mar"
- tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-SNAPSHOT.mar"/>
+ <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="src/test/resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml"/>
- <copy file="target/artifacts/rampart-SNAPSHOT.mar"
- tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-SNAPSHOT.mar"/>
+ <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="src/test/resources/security/secMtom.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
@@ -598,17 +598,17 @@
<!-- 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-SNAPSHOT.mar"
- tofile="target/test-resources/complete_client_repo/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/complete_client_repo/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing.mar.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-SNAPSHOT.mar"
- tofile="target/test-resources/complete_service_repo/modules/rampart-SNAPSHOT.mar"/>
- <copy file="target/artifacts/addressing-SNAPSHOT.mar"
- tofile="target/test-resources/complete_service_repo/modules/addressing-SNAPSHOT.mar"/>
+ <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/addressing-${addressing.mar.version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing.mar.version}.mar"/>
<copy file="src/test/resources/security/complete.service.xml"
tofile="target/temp-interop/META-INF/services.xml"
overwrite="true"/>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-mar/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-mar/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-mar/pom.xml Tue Aug 7 16:12:49 2007
@@ -1,13 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+ <parent>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-project</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<packaging>mar</packaging>
- <version>SNAPSHOT</version>
+ <version>${rampart.mar.version}</version>
<name>Rampart - Mar</name>
<scm>
@@ -51,12 +55,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${rampart.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${rampart.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-policy/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-policy/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-policy/pom.xml Tue Aug 7 16:12:49 2007
@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.rampart</groupId>
+ <groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-policy</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Rampart - Policy</name>
<build>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-tests/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-tests/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-tests/pom.xml Tue Aug 7 16:12:49 2007
@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.rampart</groupId>
+ <groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-tests</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Rampart - Test Suite</name>
<build>
@@ -39,21 +39,21 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-trust-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-trust-mar/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-trust-mar/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-trust-mar/pom.xml Tue Aug 7 16:12:49 2007
@@ -2,20 +2,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-project</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
<packaging>mar</packaging>
- <version>SNAPSHOT</version>
+ <version>${rahas.mar.version}</version>
<name>Rampart - Trust-Mar</name>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</developerConnection>
- <url>https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</url>
- </scm>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</developerConnection>
+ <url>https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</url>
+ </scm>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
@@ -51,12 +56,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${rampart.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${rampart.version}</version>
</dependency>
</dependencies>
@@ -90,16 +95,16 @@
</releases>
</pluginRepository>
</pluginRepositories>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
- <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
- <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Maven Central Repository</name>
+ <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Development Repository</name>
+ <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
Modified: webservices/rampart/branches/java/1_3/modules/rampart-trust/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/modules/rampart-trust/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/modules/rampart-trust/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/modules/rampart-trust/pom.xml Tue Aug 7 16:12:49 2007
@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.rampart</groupId>
+ <groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-trust</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Rampart - Trust</name>
<build>
@@ -39,11 +39,11 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/branches/java/1_3/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_3/pom.xml?view=diff&rev=563696&r1=563695&r2=563696
==============================================================================
--- webservices/rampart/branches/java/1_3/pom.xml (original)
+++ webservices/rampart/branches/java/1_3/pom.xml Tue Aug 7 16:12:49 2007
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<description>WS-Security, WS-Trust and WS-SecureConversation implementaion for Apache
Axis2</description>
- <version>SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<name>Apache Rampart</name>
<url>http://ws.apache.org/rampart</url>
@@ -108,6 +108,22 @@
<name>Apache ws.zones - 2</name>
<url>http://ws.zones.apache.org/repository2</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>axis2-1.3-rc3</id>
+ <name>Axis2-1.3-RC3</name>
+ <url>http://people.apache.org/~deepal/axis2/1.3-RC3/m2-repo/</url>
+ </repository>
+
</repositories>
@@ -136,6 +152,18 @@
</releases>
</pluginRepository>
+ <pluginRepository>
+ <id>axis2-1.3-RC3</id>
+ <name>Axis2-1.3-RC3 repo</name>
+ <url>http://people.apache.org/~deepal/axis2/1.3-RC3/m2-repo/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+
</pluginRepositories>
<reporting>
@@ -465,9 +493,12 @@
<properties>
<axis2.version>1.3-RC3</axis2.version>
+ <rampart.version>1.3-SNAPSHOT</rampart.version>
+ <rampart.mar.version>1.3</rampart.mar.version>
+ <rahas.mar.version>1.3</rahas.mar.version>
<axiom.version>1.2.5</axiom.version>
- <addressing.mar.version>1.3</addressing.mar.version>
+ <addressing.mar.version>1.3-SNAPSHOT</addressing.mar.version>
<wss4j.version>SNAPSHOT</wss4j.version>
<xmlsec.version>1.4.0</xmlsec.version>
@@ -478,7 +509,7 @@
<neethi.version>SNAPSHOT</neethi.version>
<xbean.version>2.1.0</xbean.version>
- <woden.version>1.0-incubating-M7a</woden.version>
+ <woden.version>1.0-incubating-M7b</woden.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<annogen.version>0.1.0</annogen.version>