Author: ruchithf
Date: Fri Feb 1 02:54:05 2013
New Revision: 1441298
URL: http://svn.apache.org/viewvc?rev=1441298&view=rev
Log:
Removing the deprecated basic configuration (This was deprecated since version
1.1).
Excluded the Rahas tests from the integration tests to update them to work with
policy configuration.
Removed basic configuration test cases.
Added WS-SecurityPolicy 1.2 namespace to supported policy namespaces in the
module.xml
Removed:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/axis2/
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/
axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1441298&r1=1441297&r2=1441298&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Fri Feb
1 02:54:05 2013
@@ -363,8 +363,8 @@
<copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/default_security_client_repo/modules/addressing-${axis2.version}.mar"
/>
<copy file="src/test/resources/conf/axis2.xml"
tofile="target/test-resources/default_security_client_repo/conf/axis2.xml" />
<!--
- RahasSAMLTokenAttributeTest
- -->
+ RahasSAMLTokenAttributeTest
+ -->
<mkdir
dir="target/test-resources/rahas_service_repo_5" />
<mkdir
dir="target/test-resources/rahas_service_repo_5/conf" />
<mkdir
dir="target/test-resources/rahas_service_repo_5/services" />
@@ -375,182 +375,8 @@
<!-- copy the services.xml and create the aar
-->
<copy overwrite="yes"
file="src/test/resources/rahas/s5-services.xml"
tofile="target/temp-rahas/META-INF/services.xml" />
<jar
jarfile="target/test-resources/rahas_service_repo_5/services/SecureService.aar"
basedir="target/temp-rahas" />
-
<!--RahasAttributeTest END-->
- <!-- 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="src/test/resources/security/s1.client.axis2.xml"
tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario1_client_repo/modules/rampart-${project.version}.mar"
/>
- <!-- setup scenario 1 service repository-->
- <copy
file="src/test/resources/security/s1.service.axis2.xml"
tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario1_service_repo/modules/rampart-${project.version}.mar"
/>
-
- <mkdir dir="target/temp-interop/META-INF" />
-
- <!-- Create the .aar file -->
- <copy
file="src/test/resources/security/s1.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
- <!-- Scenario 2 - Setup the client and service
repos -->
- <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" />
- <copy
file="src/test/resources/security/s2.client.axis2.xml"
tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s2.service.axis2.xml"
tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s2.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 2a - set up repos -->
- <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" />
- <copy
file="src/test/resources/security/s2a.client.axis2.xml"
tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2a_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s2a.service.axis2.xml"
tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s2a.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
- <!-- Scenario 3 -->
- <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" />
- <copy
file="src/test/resources/security/s3.client.axis2.xml"
tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario3_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s3.service.axis2.xml"
tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario3_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s3.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/s4.client.axis2.xml"
tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario4_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s4.service.axis2.xml"
tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario4_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s4.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/s5.client.axis2.xml"
tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario5_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s5.service.axis2.xml"
tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario5_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s5.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/s6.client.axis2.xml"
tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario6_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s6.service.axis2.xml"
tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario6_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s6.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/s7.client.axis2.xml"
tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario7_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s7.service.axis2.xml"
tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenario7_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/s7.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/sST1.client.axis2.xml"
tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenarioST1_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/sST1.service.axis2.xml"
tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/sST1.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- 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" />
- <copy
file="src/test/resources/security/secMtom.client.axis2.xml"
tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/mtom_sec_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/secMtom.service.axis2.xml"
tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="src/test/resources/security/secMtom.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
- <!-- 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 addressing and MTOM client
repository-->
- <copy
file="src/test/resources/security/complete.client.axis2.xml"
tofile="target/test-resources/complete_client_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/complete_client_repo/modules/addressing-${axis2.version}.mar"
/>
- <!-- Test with addressing and MTOMservice
repository-->
- <copy
file="src/test/resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml" />
- <copy
file="target/artifacts/rampart-${project.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/rampart-${project.version}.mar"
/>
- <copy
file="target/artifacts/addressing-${axis2.version}.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing-${axis2.version}.mar"
/>
- <copy
file="src/test/resources/security/complete.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <!-- Create the .aar file -->
- <jar
jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
</tasks>
</configuration>
<goals>
@@ -582,6 +408,9 @@
<configuration>
<!-- Add the Xerces/Xalan versions expected by OpenSAML to
the boot classpath so that the build succeeds on older 1.5 JDKs -->
<argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
+ <excludes>
+ <exclude>org/apache/rahas/*.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml?rev=1441298&r1=1441297&r2=1441298&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml Fri Feb 1
02:54:05 2013
@@ -9,9 +9,6 @@
<handler name="PolicyBasedSecurityInHandler"
class="org.apache.rampart.handler.RampartReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
- <handler name="SecurityInHandler"
class="org.apache.rampart.handler.WSDoAllReceiver">
- <order phase="Security"/>
- </handler>
<handler name="PostDispatchVerificationHandler"
class="org.apache.rampart.handler.PostDispatchVerificationHandler">
<order phase="Dispatch" phaseLast="true"/>
</handler>
@@ -19,18 +16,12 @@
</InFlow>
<OutFlow>
- <handler name="SecurityOutHandler"
class="org.apache.rampart.handler.WSDoAllSender">
- <order phase="Security"/>
- </handler>
<handler name="PolicyBasedSecurityOutHandler"
class="org.apache.rampart.handler.RampartSender">
<order phase="Security" phaseLast="true"/>
</handler>
</OutFlow>
<OutFaultFlow>
- <handler name="SecurityOutHandler"
class="org.apache.rampart.handler.WSDoAllSender">
- <order phase="Security"/>
- </handler>
<handler name="PolicyBasedSecurityOutHandler"
class="org.apache.rampart.handler.RampartSender">
<order phase="Security" phaseLast="true"/>
</handler>
@@ -40,12 +31,9 @@
<handler name="PolicyBasedSecurityInHandler"
class="org.apache.rampart.handler.RampartReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
- <handler name="SecurityInHandler"
class="org.apache.rampart.handler.WSDoAllReceiver">
- <order phase="Security"/>
- </handler>
</InFaultFlow>
- <supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
+ <supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy
http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"/>
<local-policy-assertions>
<rampart:RampartConfig
xmlns:rampart="http://ws.apache.org/rampart/policy"; />
</local-policy-assertions>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt?rev=1441298&r1=1441297&r2=1441298&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt Fri Feb 1
02:54:05 2013
@@ -4,9 +4,6 @@
This directory contains three sub directories:
- - basic - A set of samples that uses basic rampart configuration using
- parameters
-
- policy - A set of samples that uses rampart with WS-SecurityPolicy
- keys - The keystore files that contains the keys used by the samples
