You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/11/27 13:16:49 UTC
svn commit: r479599 - in /webservices/axis2/branches/java/1_1: ./ etc/
modules/integration/ modules/rahas/ modules/samples/security/
modules/security/ modules/security/release-docs/
Author: ruchithf
Date: Mon Nov 27 04:16:47 2006
New Revision: 479599
URL: http://svn.apache.org/viewvc?view=rev&rev=479599
Log:
Preparing for the Rampart-1.1-RC1 release
Modified:
webservices/axis2/branches/java/1_1/etc/project.properties
webservices/axis2/branches/java/1_1/maven.xml
webservices/axis2/branches/java/1_1/modules/integration/maven.xml
webservices/axis2/branches/java/1_1/modules/rahas/maven.xml
webservices/axis2/branches/java/1_1/modules/samples/security/README.txt
webservices/axis2/branches/java/1_1/modules/samples/security/build.xml
webservices/axis2/branches/java/1_1/modules/security/maven.xml
webservices/axis2/branches/java/1_1/modules/security/release-docs/README.txt
Modified: webservices/axis2/branches/java/1_1/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/etc/project.properties?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_1/etc/project.properties Mon Nov 27 04:16:47 2006
@@ -22,8 +22,10 @@
#version_affix=
axis2_version=${version_number}
addressing_version=${axis2_version}
-rampart_version=${axis2_version}
-rahas_version=${axis2_version}
+rampart_version=1.1-RC1
+rahas_version=1.1-RC1
+rampart_module_version=1.1
+rahas_module_version=1.1
soapmonitor_version=${axis2_version}
savan_version=${axis2_version}
@@ -131,7 +133,7 @@
xerces.version=2.8.1
xml_apis.version=1.3.03
XmlSchema.version=1.2
-xmlsec.version=1.4-SNAPSHOT
+xmlsec.version=1.3.0
xmlunit.version=1.0
log4j.version=1.2.13
Modified: webservices/axis2/branches/java/1_1/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/maven.xml?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/maven.xml Mon Nov 27 04:16:47 2006
@@ -1024,7 +1024,7 @@
<!-- ================================================================ -->
<!--- Create Apache Rampart Release Artifacts -->
<!-- ================================================================ -->
- <goal name="rampart-release" prereqs="jar">
+ <goal name="rampart-release">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Rampart Release</ant:echo>
@@ -1048,19 +1048,17 @@
<ant:echo>| Creating: Rampart Binary Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:property name="moddir"
- value="target/temp-rampart-bin/rampart-${rampart_version}/modules"/>
+ <ant:property name="destdir" value="target/temp-rampart-bin/rampart-${rampart_version}"/>
<ant:property name="libdir" value="target/temp-rampart-bin/rampart-${rampart_version}/lib"/>
<ant:property name="samplesdir"
value="target/temp-rampart-bin/rampart-${rampart_version}/samples"/>
- <ant:mkdir dir="${moddir}"/>
<ant:mkdir dir="${libdir}"/>
<ant:mkdir dir="${samplesdir}"/>
- <ant:copy toDir="${moddir}">
- <ant:fileset file="modules/security/target/rampart-${rampart_version}.mar"/>
- <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.mar"/>
- <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.aar"/>
+ <ant:copy toDir="target/temp-rampart-bin/rampart-${rampart_version}">
+ <ant:fileset file="modules/security/target/rampart-${rampart_module_version}.mar"/>
+ <ant:fileset file="modules/rahas/target/rahas-${rahas_module_version}.mar"/>
+ <ant:fileset file="modules/rahas/target/rahas-${rahas_version}.zip"/>
</ant:copy>
<ant:copy toDir="${libdir}">
@@ -1083,11 +1081,18 @@
<ant:fileset file="LICENSE.txt"/>
</ant:copy>
+
+ <!-- copy axis2-security.jar and axis2-rahas.jar -->
+ <copy file="modules/security/target/axis2-security-${axis2_version}.jar"
+ tofile="${libdir}/axis2-security-${rampart_version}.jar" overwrite="true"/>
+ <copy file="modules/rahas/target/axis2-rahas-${axis2_version}.jar"
+ tofile="${libdir}/axis2-rahas-${rahas_version}.jar" overwrite="true"/>
<ant:copy toDir="${samplesdir}">
<ant:fileset dir="modules/samples/security/"/>
</ant:copy>
+
<ant:copy toDir="${destdir}">
<ant:fileset dir="modules/security/release-docs"/>
</ant:copy>
Modified: webservices/axis2/branches/java/1_1/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/maven.xml?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/maven.xml Mon Nov 27 04:16:47 2006
@@ -24,8 +24,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/rampart-${rampart_version}.mar"
- tofile="target/test-classes/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-classes/modules/rampart-${rampart_module_version}.mar"/>
<j:set var="axis2.home" value="${basedir}/target"/>
@@ -201,10 +201,10 @@
<mkdir dir="target/test-resources/rampart_client_repo/conf"/>
<mkdir dir="target/test-resources/rampart_client_repo/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rampart_client_repo/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rampart_client_repo/modules/addressing-${addressing_version}.mar"/>
@@ -213,10 +213,10 @@
<mkdir dir="target/test-resources/rampart_service_repo/services"/>
<mkdir dir="target/test-resources/rampart_service_repo/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rampart_service_repo/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rampart_service_repo/modules/addressing-${addressing_version}.mar"/>
@@ -327,8 +327,8 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_client_repo/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- SecConv Test - 1 -->
@@ -338,10 +338,10 @@
<mkdir dir="target/test-resources/sc_service_repo_1/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_1/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_1/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_1/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_1/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_1/modules/addressing-${addressing_version}.mar"/>
@@ -361,10 +361,10 @@
<mkdir dir="target/test-resources/sc_service_repo_2/services"/>
<mkdir dir="target/test-resources/sc_service_repo_2/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_2/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_2/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_2/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_2/modules/addressing-${addressing_version}.mar"/>
@@ -384,8 +384,8 @@
<mkdir dir="target/test-resources/sc_service_repo_3/services"/>
<mkdir dir="target/test-resources/sc_service_repo_3/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_3/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_3/modules/rampart-${rampart_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_3/modules/addressing-${addressing_version}.mar"/>
<!-- copy the services.xml and create the aar -->
@@ -404,10 +404,10 @@
<mkdir dir="target/test-resources/sc_service_repo_4/services"/>
<mkdir dir="target/test-resources/sc_service_repo_4/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/sc_service_repo_4/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/sc_service_repo_4/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_4/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/sc_service_repo_4/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/sc_service_repo_4/modules/addressing-${addressing_version}.mar"/>
@@ -449,8 +449,8 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing_version}.mar"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
@@ -473,10 +473,10 @@
<mkdir dir="target/test-resources/rahas_service_repo_1/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_1/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_1/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_service_repo_1/modules/addressing-${addressing_version}.mar"/>
@@ -497,10 +497,10 @@
<mkdir dir="target/test-resources/rahas_service_repo_3/services"/>
<mkdir dir="target/test-resources/rahas_service_repo_3/modules"/>
- <copy file="../security/target/rampart-${rampart_version}.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart_version}.mar"/>
- <copy file="../rahas/target/rahas-${rahas_version}.mar"
- tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="../rahas/target/rahas-${rahas_module_version}.mar"
+ tofile="target/test-resources/rahas_service_repo_3/modules/rahas-${rahas_module_version}.mar"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/rahas_service_repo_3/modules/addressing-${addressing_version}.mar"/>
@@ -647,8 +647,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/rampart-${rampart_module_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="conf/axis2.xml"
@@ -668,8 +668,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario1_client_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- This is to add the PWCallback in to the classpath for the client to pick
the password callback class.
@@ -680,8 +680,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario1_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s1.service.xml"
@@ -705,14 +705,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2.service.xml"
@@ -736,14 +736,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2a.service.xml"
@@ -767,14 +767,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s3.service.xml"
@@ -799,14 +799,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario4_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario4_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s4.service.xml"
@@ -831,14 +831,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario5_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario5_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s5.service.xml"
@@ -863,14 +863,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s6.service.xml"
@@ -895,14 +895,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s7.service.xml"
@@ -926,14 +926,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/sST1.service.xml"
@@ -958,14 +958,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${rampart_module_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/secMtom.service.xml"
@@ -1001,16 +1001,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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/rampart-${rampart_module_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/rampart-${rampart_version}.mar"
- tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart_version}.mar"/>
+ <copy file="../security/target/rampart-${rampart_module_version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/rampart-${rampart_module_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/branches/java/1_1/modules/rahas/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/maven.xml?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/maven.xml Mon Nov 27 04:16:47 2006
@@ -13,49 +13,49 @@
<!-- Create the sts.aar : STATRT -->
- <mkdir dir="target/sts"/>
- <mkdir dir="target/sts/lib"/>
+ <mkdir dir="target/sts/rahas-${rahas_version}/"/>
+ <mkdir dir="target/sts/rahas-${rahas_version}/lib"/>
<!-- Copy classes -->
- <copy todir="target/sts">
+ <copy todir="target/sts/rahas-${rahas_version}/">
<fileset dir="target/classes">
<include name="**/*.class"/>
</fileset>
</copy>
<!-- copy jars -->
<j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
- <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
- <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
+ <copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/opensaml-${opensaml.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
</j:if>
<j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
- <copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/sts/lib"/>
- <copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/sts/lib"/>
+ <copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/opensaml/jars/opensaml-${opensaml.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
+ <copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar" todir="target/sts/rahas-${rahas_version}/lib"/>
</j:if>
- <copy file="src/META-INF/module.xml" toFile="target/sts/META-INF/module.xml"/>
+ <copy file="src/META-INF/module.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/module.xml"/>
- <jar jarfile="target/rahas-${rahas_version}.mar" basedir="target/sts/">
+ <jar jarfile="target/rahas-${rahas_module_version}.mar" basedir="target/sts/rahas-${rahas_version}/">
<include name="**/*"/>
</jar>
<delete file="target/sts/META-INF/module.xml"/>
<delete includeEmptyDirs="true">
- <fileset dir="target/sts/org/apache/rahas/client"/>
+ <fileset dir="target/sts/rahas-${rahas_version}/org/apache/rahas/client"/>
</delete>
- <copy file="sts-aar-resources/services.xml" toFile="target/sts/META-INF/services.xml"/>
- <copy file="sts-aar-resources/sct-issuer-config.xml" toFile="target/sts/META-INF/sct-issuer-config.xml"/>
- <copy file="sts-aar-resources/saml-issuer-config.xml" toFile="target/sts/META-INF/saml-issuer-config.xml"/>
- <copy file="sts-aar-resources/token-canceler-config.xml" toFile="target/sts/META-INF/token-canceler-config.xml"/>
- <copy file="sts-aar-resources/token-dispatcher-configuration.xml" toFile="target/sts/META-INF/token-dispatcher-configuration.xml"/>
+ <copy file="sts-aar-resources/services.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/services.xml"/>
+ <copy file="sts-aar-resources/sct-issuer-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/sct-issuer-config.xml"/>
+ <copy file="sts-aar-resources/saml-issuer-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/saml-issuer-config.xml"/>
+ <copy file="sts-aar-resources/token-canceler-config.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/token-canceler-config.xml"/>
+ <copy file="sts-aar-resources/token-dispatcher-configuration.xml" toFile="target/sts/rahas-${rahas_version}/META-INF/token-dispatcher-configuration.xml"/>
<copy file="sts-aar-resources/rahas-sts.jks" toFile="target/sts/META-INF/rahas-sts.jks"/>
- <jar jarfile="target/rahas-${rahas_version}.aar" basedir="target/sts/">
+ <zip zipfile="target/rahas-${rahas_version}.zip" basedir="target/sts/">
<include name="**/*"/>
- </jar>
+ </zip>
<delete includeEmptyDirs="true">
<fileset dir="target/sts"/>
@@ -65,7 +65,7 @@
</postGoal>
<postGoal name="test:compile">
- <copy file="target/rahas-${rahas_version}.mar" tofile="target/modules/rahas-${rahas_version}.mar"/>
- <copy file="target/rahas-${rahas_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rahas-${rahas_version}.mar"/>
+ <copy file="target/rahas-${rahas_module_version}.mar" tofile="target/modules/rahas-${rahas_module_version}.mar"/>
+ <copy file="target/rahas-${rahas_module_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rahas-${rahas_module_version}.mar"/>
</postGoal>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/samples/security/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/security/README.txt?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/security/README.txt (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/security/README.txt Mon Nov 27 04:16:47 2006
@@ -11,13 +11,3 @@
- rahas - A set of samples demonstrating WS-Trust features provided by Rahas
-IMPORTANT: Before you try any of the samples makesure you
-
-1.) Have the Axis2 standard binary distribution downloaded and extracted.
-2.) Set the AXIS2_HOME envirenment variable
-3.) Run ant from the "samples" directory to copy the required libraries and
- modules to relevant directories in AXIS2_HOME.
-4.) Download xalan-2.7.0.jar from here[1] and put under AXIS2_HOME\lib folder,
- if you use JDK 1.5.
-
-[1] http://www.apache.org/dist/java-repository/xalan/jars/
\ No newline at end of file
Modified: webservices/axis2/branches/java/1_1/modules/samples/security/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/security/build.xml?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/security/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/security/build.xml Mon Nov 27 04:16:47 2006
@@ -1,7 +1,7 @@
<project basedir="." default="setup">
<property name="lib.dir" value="../lib"/>
- <property name="modules.dir" value="../modules"/>
+ <property name="modules.dir" value="../"/>
<property environment="env"/>
Modified: webservices/axis2/branches/java/1_1/modules/security/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/maven.xml?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/security/maven.xml Mon Nov 27 04:16:47 2006
@@ -72,12 +72,12 @@
<copy file="src/META-INF/services/org.apache.neethi.builders.AssertionBuilder"
tofile="target/temp-mar/META-INF/services/org.apache.neethi.builders.AssertionBuilder" overwrite="true" />
- <jar jarfile="target/rampart-${rampart_version}.mar" basedir="target/temp-mar/">
+ <jar jarfile="target/rampart-${rampart_module_version}.mar" basedir="target/temp-mar/">
<include name="**/*"/>
</jar>
- <copy file="target/rampart-${rampart_version}.mar" tofile="target/modules/rampart-${rampart_version}.mar"/>
- <copy file="target/rampart-${rampart_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rampart-${rampart_version}.mar"/>
+ <copy file="target/rampart-${rampart_module_version}.mar" tofile="target/modules/rampart-${rampart_module_version}.mar"/>
+ <copy file="target/rampart-${rampart_module_version}.mar" tofile="${maven.repo.local}/org.apache.axis2/mars/rampart-${rampart_module_version}.mar"/>
<delete includeEmptyDirs="true">
<fileset dir="target/temp-mar"/>
Modified: webservices/axis2/branches/java/1_1/modules/security/release-docs/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/release-docs/README.txt?view=diff&rev=479599&r1=479598&r2=479599
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/release-docs/README.txt (original)
+++ webservices/axis2/branches/java/1_1/modules/security/release-docs/README.txt Mon Nov 27 04:16:47 2006
@@ -12,14 +12,27 @@
in addition to the libraries available in the axis2 standard binary
release.
-modules - This directory contains all Apache Axis2 modules shipped with
- Apache Rampart:
- rampart-1.1.mar
- rahas-1.1.mar
+
+rampart-1.1.mar - WS-Security and WS-SecureConversation support for Axis2
+rahas-1.1.mar - STS module - to be used to add STS operations to a service
+rahas-1.1-RC1.zip - STS zip - you can use this to create your own configured STS
samples - This contains samples on using Apache Rampart and configuring
different conponents to carryout different WS-Sec* operations.
+README.txt - This file
+
+build.xml - Setup file to copy all jars to required places
+
+IMPORTANT: Before you try any of the samples makesure you
+
+1.) Have the Axis2 standard binary distribution downloaded and extracted.
+2.) Set the AXIS2_HOME envirenment variable
+3.) Run ant from the "samples" directory to copy the required libraries and
+ modules to relevant directories in AXIS2_HOME.
+4.) Download xalan-2.7.0.jar from here[1] and put under AXIS2_HOME\lib folder,
+ if you use JDK 1.5.
+
___________________
Support
===================
@@ -40,3 +53,4 @@
The Apache Rampart team.
+[1] http://www.apache.org/dist/java-repository/xalan/jars/
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org