You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/01/26 15:18:04 UTC
svn commit: r372531 - in /webservices/axis2/trunk/java:
etc/project.properties maven.xml modules/integration/maven.xml
modules/security/maven.xml
Author: chinthaka
Date: Thu Jan 26 06:17:49 2006
New Revision: 372531
URL: http://svn.apache.org/viewcvs?rev=372531&view=rev
Log:
Making security also "versionable".
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/security/maven.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=372531&r1=372530&r2=372531&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Thu Jan 26 06:17:49 2006
@@ -21,8 +21,8 @@
version_number=0.95
version_affix=SNAPSHOT
axis2_version=${version_number}-${version_affix}
-addressing_version=${version_number}
-security_version=${version_affix}-${version_number}
+addressing_version=${axis2_version}
+security_version=${axis2_version}
# -------------------------------------------------------------------
# Dependency Repositories
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=372531&r1=372530&r2=372531&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Thu Jan 26 06:17:49 2006
@@ -449,7 +449,7 @@
file="modules/addressing/target/addressing-${addressing_version}.mar"/>
<ant:copy toFile="target/dist/security-${pom.currentVersion}.mar"
- file="modules/security/target/security.mar"/>
+ file="modules/security/target/security-${security_version}.mar"/>
<ant:delete dir="target/temp"/>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=372531&r1=372530&r2=372531&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Jan 26 06:17:49 2006
@@ -23,8 +23,8 @@
<!-- copy the mars so that they are available on the test classpath -->
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-classes/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-classes/modules/security-${security_version}.mar"/>
<j:set var="axis2.home" value="${basedir}/target"/>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
@@ -153,8 +153,8 @@
<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="../security/target/security.mar"
- tofile="target/test-resources/default_security_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/security-${security_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
@@ -174,8 +174,8 @@
<!-- setup scenario 1 client repository-->
<copy file="test-resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario1_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario1_client_repo/modules/security-${security_version}.mar"/>
<!-- This is to add the PWCallback in to the classpath for the client to pick
the password callback class.
@@ -186,8 +186,8 @@
<!-- setup scenario 1 service repository-->
<copy file="test-resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario1_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s1.service.xml"
@@ -211,14 +211,14 @@
<!-- setup scenario 2 client repository-->
<copy file="test-resources/security/s2.client.axis2.xml"
tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 2 service repository-->
<copy file="test-resources/security/s2.service.axis2.xml"
tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario2_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2.service.xml"
@@ -242,14 +242,14 @@
<!-- setup scenario 2a client repository-->
<copy file="test-resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 2a service repository-->
<copy file="test-resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2a.service.xml"
@@ -273,14 +273,14 @@
<!-- setup scenario 3 client repository-->
<copy file="test-resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 3 service repository-->
<copy file="test-resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s3.service.xml"
@@ -305,14 +305,14 @@
<!-- setup scenario 4 client repository-->
<copy file="test-resources/security/s4.client.axis2.xml"
tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario4_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 4 service repository-->
<copy file="test-resources/security/s4.service.axis2.xml"
tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario4_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s4.service.xml"
@@ -337,14 +337,14 @@
<!-- setup scenario 5 client repository-->
<copy file="test-resources/security/s5.client.axis2.xml"
tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario5_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 5 service repository-->
<copy file="test-resources/security/s5.service.axis2.xml"
tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario5_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s5.service.xml"
@@ -369,14 +369,14 @@
<!-- setup scenario 6 client repository-->
<copy file="test-resources/security/s6.client.axis2.xml"
tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario6_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 6 service repository-->
<copy file="test-resources/security/s6.service.axis2.xml"
tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s6.service.xml"
@@ -401,14 +401,14 @@
<!-- setup scenario 7 client repository-->
<copy file="test-resources/security/s7.client.axis2.xml"
tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario7_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario 7 service repository-->
<copy file="test-resources/security/s7.service.axis2.xml"
tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s7.service.xml"
@@ -441,14 +441,14 @@
<!-- setup scenario ST1 client repository-->
<copy file="test-resources/security/sST1.client.axis2.xml"
tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenarioST1_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenarioST1_client_repo/modules/security-${security_version}.mar"/>
<!-- setup scenario ST1 service repository-->
<copy file="test-resources/security/sST1.service.axis2.xml"
tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/scenarioST1_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/sST1.service.xml"
@@ -473,14 +473,14 @@
<!-- MTOM Optimized Security Test client repository-->
<copy file="test-resources/security/secMtom.client.axis2.xml"
tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/mtom_sec_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/mtom_sec_client_repo/modules/security-${security_version}.mar"/>
<!-- MTOM Optimized Security Test service repository-->
<copy file="test-resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/mtom_sec_service_repo/modules/security-${security_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/secMtom.service.xml"
@@ -505,16 +505,16 @@
<!-- Test with addressing and MTOM client repository-->
<copy file="test-resources/security/complete.client.axis2.xml"
tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/complete_client_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/security-${security_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing_version}.mar"/>
<!-- Test with addressing and MTOMservice repository-->
<copy file="test-resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
- <copy file="../security/target/security.mar"
- tofile="target/test-resources/complete_service_repo/modules/security.mar"/>
+ <copy file="../security/target/security-${security_version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/security-${security_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing_version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=372531&r1=372530&r2=372531&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Thu Jan 26 06:17:49 2006
@@ -45,10 +45,10 @@
<copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/temp-mar/lib"/>
<copy file="${maven.repo.local}/commons-codec/jars/commons-codec-${commons.codec.version}.jar" todir="target/temp-mar/lib"/>
- <jar jarfile="target/security.mar" basedir="target/temp-mar/">
+ <jar jarfile="target/security-${security_version}.mar" basedir="target/temp-mar/">
<include name="**/*"/>
</jar>
- <copy file="target/security.mar" tofile="target/modules/security.mar"/>
+ <copy file="target/security-${security_version}.mar" tofile="target/modules/security-${security_version}.mar"/>
<delete includeEmptyDirs="true">
<fileset dir="target/temp-mar"/>
</delete>