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 2005/08/31 12:00:25 UTC
svn commit: r264997 - in /webservices/axis2/trunk/java/modules/integration:
./ test-resources/security/ test/org/apache/axis2/security/
Author: ruchithf
Date: Wed Aug 31 03:00:12 2005
New Revision: 264997
URL: http://svn.apache.org/viewcvs?rev=264997&view=rev
Log:
WS-Sec interop scenarios 6 and 7
Added:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Aug 31 03:00:12 2005
@@ -215,6 +215,50 @@
tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
<copy file="../security/target/PingPort.aar"
tofile="target/test-resources/scenario5_service_repo/services/PingPort.aar"/>
+
+ <!-- Scenario 6 -->
+ <mkdir dir="target/test-resources/scenario6_client_repo"/>
+ <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/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/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario6_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 6 service repository-->
+ <copy file="test-resources/security/s6.service.axis2.xml"
+ tofile="target/test-resources/scenario6_service_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
+ <copy file="../security/target/PingPort.aar"
+ tofile="target/test-resources/scenario6_service_repo/services/PingPort.aar"/>
+
+ <!-- Scenario 7 -->
+ <mkdir dir="target/test-resources/scenario7_client_repo"/>
+ <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/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/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario7_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario 7 service repository-->
+ <copy file="test-resources/security/s7.service.axis2.xml"
+ tofile="target/test-resources/scenario7_service_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
+ <copy file="../security/target/PingPort.aar"
+ tofile="target/test-resources/scenario7_service_repo/services/PingPort.aar"/>
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml Wed Aug 31 03:00:12 2005
@@ -10,7 +10,7 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
- <!-- Scenario 1: Client's Configuration:START-->
+ <!-- Scenario 5: Client's Configuration:START-->
<parameter name="OutAction" locked="false">UsernameToken</parameter>
<parameter name="user" locked="false">alice</parameter>
@@ -19,7 +19,7 @@
<parameter name="InAction" locked="false">NoSecurity</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 5: Client's Configuration:END-->
<transportReceiver name="http">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml Wed Aug 31 03:00:12 2005
@@ -9,7 +9,7 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Scenario 1: Service's Configuration: START-->
+ <!-- Scenario 5: Service's Configuration: START-->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
<parameter name="InAction" locked="false">UsernameToken</parameter>
@@ -17,7 +17,7 @@
<parameter name="OutAction" locked="false">NoSecurity</parameter>
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 5: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml Wed Aug 31 03:00:12 2005
@@ -10,16 +10,21 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
- <!-- Scenario 1: Client's Configuration:START-->
+ <!-- Scenario 6: Client's Configuration:START-->
- <parameter name="OutAction" locked="false">UsernameToken</parameter>
- <parameter name="user" locked="false">Chris</parameter>
+ <parameter name="OutAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="user" locked="false">alice</parameter>
<parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="false">PasswordText</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="false">bob</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <parameter name="InAction" locked="false">NoSecurity</parameter>
+ <parameter name="InAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 6: Client's Configuration:END-->
<transportReceiver name="http">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml Wed Aug 31 03:00:12 2005
@@ -9,15 +9,22 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Scenario 1: Service's Configuration: START-->
+ <!-- Scenario 6: Service's Configuration: START-->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
- <parameter name="InAction" locked="false">UsernameToken</parameter>
+ <parameter name="InAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
<parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
+ <parameter name="OutAction" locked="false">Encrypt Signature Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 6: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml Wed Aug 31 03:00:12 2005
@@ -10,16 +10,24 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
- <!-- Scenario 1: Client's Configuration:START-->
+ <!-- Scenario 7: Client's Configuration:START-->
- <parameter name="OutAction" locked="false">UsernameToken</parameter>
- <parameter name="user" locked="false">Chris</parameter>
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">alice</parameter>
<parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="false">PasswordText</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="false">bob</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="encryptionPropFile" locked="false">interop.properties</parameter>
+ <parameter name="signatureParts" locked="false">{}{http://schemas.xmlsoap.org/soap/envelope/}Body;STRTransform</parameter>
- <parameter name="InAction" locked="false">NoSecurity</parameter>
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
+ <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 7: Client's Configuration:END-->
<transportReceiver name="http">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml Wed Aug 31 03:00:12 2005
@@ -9,15 +9,24 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Scenario 1: Service's Configuration: START-->
+ <!-- Scenario 7: Service's Configuration: START-->
<!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
- <parameter name="InAction" locked="false">UsernameToken</parameter>
+ <parameter name="InAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="decryptionPropFile" locked="false">interop.properties</parameter>
<parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
+ <parameter name="OutAction" locked="false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="false">DirectReference</parameter>
+ <parameter name="encryptionUser" locked="false">alice</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
+ <parameter name="OutSignaturePropFile" locked="false">interop.properties</parameter>
+ <parameter name="encryptionPropFile" locked="false">interop.properties</parameter>
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 71: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Wed Aug 31 03:00:12 2005
@@ -110,7 +110,7 @@
*/
public void testInterop() {
try {
- //InteropScenarioClient.main(new String[]{Constants.TESTING_PATH + clientRepo,targetEpr});
+ InteropScenarioClient.main(new String[]{Constants.TESTING_PATH + clientRepo,targetEpr});
} catch (Exception e) {
e.printStackTrace();
fail("Error in introperating with " + targetEpr + ", client configuration: " + clientRepo);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java?rev=264997&r1=264996&r2=264997&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java Wed Aug 31 03:00:12 2005
@@ -22,8 +22,8 @@
public class Scenario4Test extends InteropTestBase {
protected void setUp() throws Exception {
- this.setClientRepo(SCENARIO3_CLIENT_REPOSITORY);
- this.setServiceRepo(SCENARIO3_SERVICE_REPOSITORY);
+ this.setClientRepo(SCENARIO4_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO4_SERVICE_REPOSITORY);
super.setUp();
}
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java?rev=264997&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java Wed Aug 31 03:00:12 2005
@@ -0,0 +1,30 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.axis2.security;
+
+/**
+ * WS-Security interop scenario 6
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class Scenario6Test extends InteropTestBase {
+
+ protected void setUp() throws Exception {
+ this.setClientRepo(SCENARIO6_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO6_SERVICE_REPOSITORY);
+ super.setUp();
+ }
+}
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java?rev=264997&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java Wed Aug 31 03:00:12 2005
@@ -0,0 +1,30 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.axis2.security;
+
+/**
+ * WS-Security interop scenario 7
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class Scenario7Test extends InteropTestBase {
+
+ protected void setUp() throws Exception {
+ this.setClientRepo(SCENARIO7_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO7_SERVICE_REPOSITORY);
+ super.setUp();
+ }
+}