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 2007/02/07 14:34:00 UTC
svn commit: r504542 - in /webservices/axis2/trunk/java: etc/
modules/integration/ modules/integration/test-resources/rahas/
modules/integration/test-resources/rampart/
modules/integration/test-resources/security/
modules/integration/test/org/apache/axi...
Author: ruchithf
Date: Wed Feb 7 05:33:59 2007
New Revision: 504542
URL: http://svn.apache.org/viewvc?view=rev&rev=504542
Log:
Removing all rampart related stuff from Axis2
The rampart project is available at :
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
Removed:
webservices/axis2/trunk/java/modules/integration/test-resources/rahas/
webservices/axis2/trunk/java/modules/integration/test-resources/rampart/
webservices/axis2/trunk/java/modules/integration/test-resources/security/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/
webservices/axis2/trunk/java/modules/integration/test/org/apache/rampart/
webservices/axis2/trunk/java/modules/rahas/
webservices/axis2/trunk/java/modules/secpolicy/
webservices/axis2/trunk/java/modules/security/
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/samples/project.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=504542&r1=504541&r2=504542
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Feb 7 05:33:59 2007
@@ -22,11 +22,6 @@
#version_affix=
axis2_version=${version_number}
addressing_version=${axis2_version}
-rampart_version=SNAPSHOT
-rahas_version=SNAPSHOT
-secpolicy_version=SNAPSHOT
-rampart_module_version=SNAPSHOT
-rahas_module_version=SNAPSHOT
soapmonitor_version=${axis2_version}
savan_version=${axis2_version}
@@ -59,14 +54,11 @@
modules/addressing/project.xml,\
modules/tool/project.xml,\
modules/samples/project.xml,\
-modules/security/project.xml,\
modules/spring/project.xml,\
modules/soapmonitor/project.xml,\
modules/integration/project.xml,\
modules/jibx/project.xml,\
modules/savan/project.xml,\
-modules/rahas/project.xml,\
-modules/secpolicy/project.xml,\
modules/mtompolicy/project.xml,\
${optional.includes}
@@ -124,7 +116,6 @@
maven.multiproject.plugin.version=1.5-SNAPSHOT
maven.plugin.plugin.version=1.8-SNAPSHOT
maven.test.plugin.version=1.8.1-SNAPSHOT
-opensaml.version=1.1
neethi.version=SNAPSHOT
servletapi.version=2.3
spring.version=1.2.8
@@ -135,13 +126,11 @@
stax_utils.version=20060915
woden.version=1.0-incubating-SNAPSHOT
wsdl4j.version=1.6.2
-wss4j.version=SNAPSHOT
xalan.version=2.7.0
xbean.version=2.2.0
xerces.version=2.8.1
xml_apis.version=1.3.03
XmlSchema.version=1.2
-xmlsec.version=1.3.0
xmlunit.version=1.0
log4j.version=1.2.13
jettison.version=1.0-alpha-2-SNAPSHOT
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=504542&r1=504541&r2=504542
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Feb 7 05:33:59 2007
@@ -24,9 +24,6 @@
<!-- 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_module_version}.mar"
- tofile="target/test-classes/modules/rampart-${rampart_module_version}.mar"/>
-
<j:set var="axis2.home" value="${basedir}/target"/>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
@@ -189,340 +186,8 @@
<postGoal name="test:compile">
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
- <!--Setting up service and client repos for org.apache.rampart.* tests -->
- <mkdir dir="target/temp-ramp"/>
- <mkdir dir="target/temp-ramp/META-INF"/>
-
- <copy overwrite="yes" file="target/test-classes/org/apache/rampart/Service.class"
- tofile="target/temp-ramp/org/apache/rampart/Service.class"/>
- <copy overwrite="yes" file="target/test-classes/org/apache/rampart/PWCallback.class"
- tofile="target/temp-ramp/org/apache/rampart/PWCallback.class"/>
-
- <copy overwrite="yes" file="test-resources/rampart/store.jks"
- tofile="target/temp-ramp/store.jks"/>
-
- <ant:path id="ramp.client.props" location="test-resources/rampart"/>
- <maven:addPath id="maven.dependency.classpath" refid="ramp.client.props"/>
-
- <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="../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"/>
-
- <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="../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"/>
-
- <!-- Service 1 -->
- <copy overwrite="yes" file="test-resources/rampart/services-1.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService1.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 2 -->
- <copy overwrite="yes" file="test-resources/rampart/services-2.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService2.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 3 -->
- <copy overwrite="yes" file="test-resources/rampart/services-3.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService3.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 4 -->
- <copy overwrite="yes" file="test-resources/rampart/services-4.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService4.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 5 -->
- <copy overwrite="yes" file="test-resources/rampart/services-5.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService5.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 6 -->
- <copy overwrite="yes" file="test-resources/rampart/services-6.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService6.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 7 -->
- <copy overwrite="yes" file="test-resources/rampart/services-7.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService7.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 8 -->
- <copy overwrite="yes" file="test-resources/rampart/services-8.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService8.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service 9 -->
- <copy overwrite="yes" file="test-resources/rampart/services-9.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService9.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service SC-1 -->
- <copy overwrite="yes" file="test-resources/rampart/issuer.properties"
- tofile="target/temp-ramp/issuer.properties"/>
-
- <copy overwrite="yes" file="test-resources/rampart/services-sc-1.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureServiceSC1.aar"
- basedir="target/temp-ramp"/>
-
- <copy overwrite="yes" file="test-resources/rampart/issuer.properties"
- tofile="target/temp-ramp/issuer.properties"/>
-
- <copy overwrite="yes" file="test-resources/rampart/services-sc-2.xml"
- tofile="target/temp-ramp/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/rampart_service_repo/services/SecureServiceSC2.aar"
- basedir="target/temp-ramp"/>
-
- <!-- Service classes for the SecConv tests -->
- <mkdir dir="target/temp-sc"/>
- <mkdir dir="target/temp-sc/META-INF"/>
-
- <copy overwrite="yes" file="target/test-classes/org/apache/axis2/security/sc/Service.class"
- tofile="target/temp-sc/org/apache/axis2/security/sc/Service.class"/>
- <copy overwrite="yes" file="target/test-classes/org/apache/axis2/security/sc/PWCallback.class"
- tofile="target/temp-sc/org/apache/axis2/security/sc/PWCallback.class"/>
-
- <copy overwrite="yes" todir="target/temp-sc">
- <fileset dir="test-resources/security/sc">
- <include name="sctIssuer.properties"/>
- <include name="sts.jks"/>
- </fileset>
- </copy>
-
- <ant:path id="sc.client.props" location="test-resources/security/sc"/>
- <maven:addPath id="maven.dependency.classpath" refid="sc.client.props"/>
-
- <mkdir dir="target/test-resources/sc_client_repo"/>
- <mkdir dir="target/test-resources/sc_client_repo/conf"/>
- <mkdir dir="target/test-resources/sc_client_repo/modules"/>
-
- <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_module_version}.mar"
- tofile="target/test-resources/sc_client_repo/modules/rampart-${rampart_module_version}.mar"/>
-
- <!-- SecConv Test - 1 -->
-
- <mkdir dir="target/test-resources/sc_service_repo_1"/>
- <mkdir dir="target/test-resources/sc_service_repo_1/conf"/>
- <mkdir dir="target/test-resources/sc_service_repo_1/services"/>
- <mkdir dir="target/test-resources/sc_service_repo_1/modules"/>
-
-
- <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"/>
-
- <!-- copy the services.xml and create the aar -->
- <copy overwrite="yes" file="test-resources/security/sc/s1-services.xml"
- tofile="target/temp-sc/META-INF/services.xml"/>
-
- <jar jarfile="target/test-resources/sc_service_repo_1/services/SecureService.aar"
- basedir="target/temp-sc"/>
-
- <!-- SecConv Test - 1 :END -->
-
- <!-- SecConv Test - 2 -->
-
- <mkdir dir="target/test-resources/sc_service_repo_2"/>
- <mkdir dir="target/test-resources/sc_service_repo_2/conf"/>
- <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_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"/>
-
- <!-- copy the services.xml and create the aar -->
- <copy overwrite="yes" file="test-resources/security/sc/s2-services.xml"
- tofile="target/temp-sc/META-INF/services.xml"/>
-
- <jar overwrite="yes" jarfile="target/test-resources/sc_service_repo_2/services/SecureService.aar"
- basedir="target/temp-sc"/>
-
- <!-- SecConv Test - 2 :END -->
-
- <!-- SecConv Test - 3 -->
-
- <mkdir dir="target/test-resources/sc_service_repo_3"/>
- <mkdir dir="target/test-resources/sc_service_repo_3/conf"/>
- <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_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 -->
- <copy overwrite="yes" file="test-resources/security/sc/s3-services.xml"
- tofile="target/temp-sc/META-INF/services.xml"/>
-
- <jar overwrite="yes" jarfile="target/test-resources/sc_service_repo_3/services/SecureService.aar"
- basedir="target/temp-sc"/>
-
- <!-- SecConv Test - 3 :END -->
-
- <!-- SecConv Test - 4 -->
-
- <mkdir dir="target/test-resources/sc_service_repo_4"/>
- <mkdir dir="target/test-resources/sc_service_repo_4/conf"/>
- <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_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"/>
- <!-- copy the services.xml and create the aar -->
- <copy overwrite="yes" file="test-resources/security/sc/s4-services.xml"
- tofile="target/temp-sc/META-INF/services.xml"/>
-
- <jar overwrite="yes" jarfile="target/test-resources/sc_service_repo_4/services/SecureService.aar"
- basedir="target/temp-sc"/>
-
- <!-- SecConv Test - 4 :END -->
-
- <!-- clean up temp sc stuff -->
- <delete dir="target/temp-sc"/>
-
- <!-- Set up the infra for rahas tests and the rahas client repo -->
-
- <mkdir dir="target/temp-rahas"/>
- <mkdir dir="target/temp-rahas/META-INF"/>
-
- <copy overwrite="yes" file="target/test-classes/org/apache/rahas/Service.class"
- tofile="target/temp-rahas/org/apache/rahas/Service.class"/>
- <copy overwrite="yes" file="target/test-classes/org/apache/rahas/PWCallback.class"
- tofile="target/temp-rahas/org/apache/rahas/PWCallback.class"/>
-
- <copy overwrite="yes" todir="target/temp-rahas">
- <fileset dir="test-resources/rahas">
- <include name="issuer.properties"/>
- <include name="rahas-sts.jks"/>
- </fileset>
- </copy>
-
- <ant:path id="rahas.client.props" location="test-resources/rahas"/>
- <maven:addPath id="maven.dependency.classpath" refid="rahas.client.props"/>
-
- <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="../addressing/target/addressing-${addressing_version}.mar"
- tofile="target/test-resources/rahas_client_repo/modules/addressing-${addressing_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"/>
- <j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
- <copy file="${dependencies.dir}/xercesImpl-${xerces.version}.jar"
- todir="target/test-resources/endorsed"/>
- <copy file="${dependencies.dir}/xml-apis-${xml_apis.version}.jar"
- todir="target/test-resources/endorsed"/>
- </j:if>
- <j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar"
- todir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar"
- todir="target/test-resources/endorsed"/>
- </j:if>
-
- <!-- Rahas Test1: SAML Token test -->
- <mkdir dir="target/test-resources/rahas_service_repo_1"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/conf"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/services"/>
- <mkdir dir="target/test-resources/rahas_service_repo_1/modules"/>
-
- <copy file="../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"/>
-
-
- <!-- copy the services.xml and create the aar -->
- <copy overwrite="yes" file="test-resources/rahas/s1-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
-
- <jar overwrite="yes" jarfile="target/test-resources/rahas_service_repo_1/services/SecureService.aar"
- basedir="target/temp-rahas"/>
-
- <!-- Rahas Test1: SAML Token test : END -->
-
-
- <!-- Rahas Test 3 & 4: RahasSAMLTokenUTForHoKTest and RahasSAMLTokenUTForHoKV1205Test -->
- <mkdir dir="target/test-resources/rahas_service_repo_3"/>
- <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="../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"/>
-
-
- <!-- copy the services.xml and create the aar -->
- <copy overwrite="yes" file="test-resources/rahas/s3-services.xml"
- tofile="target/temp-rahas/META-INF/services.xml"/>
-
- <jar overwrite="yes" jarfile="target/test-resources/rahas_service_repo_3/services/SecureService.aar"
- basedir="target/temp-rahas"/>
-
- <!-- Rahas Test 3 & 4: RahasSAMLTokenUTForHoKTest and RahasSAMLTokenUTForHoKV1205Test : END-->
-
-
- <mkdir dir="target/test-resources/samples/modules"/>
+ <mkdir dir="target/test-resources/samples/modules"/>
<mkdir dir="target/test-resources/samples/conf"/>
<mkdir dir="target/test-resources/repository-client/modules"/>
<mkdir dir="target/test-resources/repository-client/conf"/>
@@ -649,352 +314,6 @@
<copy file="../spring/test-resources/applicationContext.xml"
tofile="target/test-classes/spring/applicationContext.xml"/>
- <!--Axis2 repositories for WS-Security interop tests -->
-
- <!-- A default repository with security and addressing modules -->
- <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_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"
- tofile="target/test-resources/default_security_client_repo/conf/axis2.xml"/>
-
- <!-- Scenario 1 -->
- <mkdir dir="target/test-resources/scenario1_client_repo"/>
- <mkdir dir="target/test-resources/scenario1_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario1_client_repo/modules"/>
- <mkdir dir="target/test-resources/scenario1_client_repo/services"/>
-
- <mkdir dir="target/test-resources/scenario1_service_repo"/>
- <mkdir dir="target/test-resources/scenario1_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario1_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario1_service_repo/modules"/>
-
- <!-- 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_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.
- -->
- <ant:path id="sec.interop.service.jar" location="../security/target/PingPort.aar"/>
- <maven:addPath id="maven.dependency.classpath" refid="sec.interop.service.jar"/>
-
- <!-- 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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
- <!-- Scenario 2 -->
- <mkdir dir="target/test-resources/scenario2_client_repo"/>
- <mkdir dir="target/test-resources/scenario2_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario2_service_repo"/>
- <mkdir dir="target/test-resources/scenario2_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario2_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario2_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
- <!-- Scenario 2a -->
- <mkdir dir="target/test-resources/scenario2a_client_repo"/>
- <mkdir dir="target/test-resources/scenario2a_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario2a_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario2a_service_repo"/>
- <mkdir dir="target/test-resources/scenario2a_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario2a_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
- <!-- Scenario 3 -->
- <mkdir dir="target/test-resources/scenario3_client_repo"/>
- <mkdir dir="target/test-resources/scenario3_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario3_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario3_service_repo"/>
- <mkdir dir="target/test-resources/scenario3_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario3_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- Scenario 4 -->
- <mkdir dir="target/test-resources/scenario4_client_repo"/>
- <mkdir dir="target/test-resources/scenario4_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario4_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario4_service_repo"/>
- <mkdir dir="target/test-resources/scenario4_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario4_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario4_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- Scenario 5 -->
- <mkdir dir="target/test-resources/scenario5_client_repo"/>
- <mkdir dir="target/test-resources/scenario5_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario5_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario5_service_repo"/>
- <mkdir dir="target/test-resources/scenario5_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario5_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario5_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- Scenario 6 -->
- <mkdir dir="target/test-resources/scenario6_client_repo"/>
- <mkdir dir="target/test-resources/scenario6_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario6_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario6_service_repo"/>
- <mkdir dir="target/test-resources/scenario6_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario6_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario6_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- Scenario 7 -->
- <mkdir dir="target/test-resources/scenario7_client_repo"/>
- <mkdir dir="target/test-resources/scenario7_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenario7_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenario7_service_repo"/>
- <mkdir dir="target/test-resources/scenario7_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenario7_service_repo/services"/>
- <mkdir dir="target/test-resources/scenario7_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
- <!-- Scenario ST1 -->
- <mkdir dir="target/test-resources/scenarioST1_client_repo"/>
- <mkdir dir="target/test-resources/scenarioST1_client_repo/conf"/>
- <mkdir dir="target/test-resources/scenarioST1_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/scenarioST1_service_repo"/>
- <mkdir dir="target/test-resources/scenarioST1_service_repo/conf"/>
- <mkdir dir="target/test-resources/scenarioST1_service_repo/services"/>
- <mkdir dir="target/test-resources/scenarioST1_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- MTOM Optimized Security Test -->
- <mkdir dir="target/test-resources/mtom_sec_client_repo"/>
- <mkdir dir="target/test-resources/mtom_sec_client_repo/conf"/>
- <mkdir dir="target/test-resources/mtom_sec_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/mtom_sec_service_repo"/>
- <mkdir dir="target/test-resources/mtom_sec_service_repo/conf"/>
- <mkdir dir="target/test-resources/mtom_sec_service_repo/services"/>
- <mkdir dir="target/test-resources/mtom_sec_service_repo/modules"/>
-
- <!-- 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_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_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"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
-
-
- <!-- Test with addressing and MTOM -->
- <mkdir dir="target/test-resources/complete_client_repo"/>
- <mkdir dir="target/test-resources/complete_client_repo/conf"/>
- <mkdir dir="target/test-resources/complete_client_repo/modules"/>
-
- <mkdir dir="target/test-resources/complete_service_repo"/>
- <mkdir dir="target/test-resources/complete_service_repo/conf"/>
- <mkdir dir="target/test-resources/complete_service_repo/services"/>
- <mkdir dir="target/test-resources/complete_service_repo/modules"/>
-
<!-- Test with target resolver -->
<mkdir dir="target/test-resources/deployment_repo"/>
<mkdir dir="target/test-resources/deployment_repo/conf"/>
@@ -1006,30 +325,6 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/deployment_repo/modules/addressing-${addressing_version}.mar"/>
- <!-- 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_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_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"/>
-
- <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
- <copy file="test-resources/security/complete.service.xml"
- tofile="../security/target/interop/classes/META-INF/services.xml"
- overwrite="true"/>
-
- <!-- Create the .aar file -->
- <jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
- basedir="../security/target/interop/classes"/>
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/project.xml?view=diff&rev=504542&r1=504541&r2=504542
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Wed Feb 7 05:33:59 2007
@@ -34,16 +34,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-security</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-secpolicy</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
@@ -105,11 +95,6 @@
<artifactId>axis2-tools</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-rahas</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
<!-- external JARs -->
<dependency>
@@ -215,38 +200,6 @@
<artifactId>maven-itest-plugin</artifactId>
<version>${maven.itest.plugin.version}</version>
<type>plugin</type>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>${bcprov.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>${opensaml.version}</version>
- <properties>
- <module>true</module>
- </properties>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/project.xml?view=diff&rev=504542&r1=504541&r2=504542
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Wed Feb 7 05:33:59 2007
@@ -142,38 +142,6 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>${bcprov.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>${opensaml.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org