You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2005/08/31 08:58:09 UTC
svn commit: r264954 - in /webservices/axis2/trunk/java/modules/integration:
./ test-resources/security/ test/org/apache/axis2/security/
Author: ruchithf
Date: Tue Aug 30 23:57:44 2005
New Revision: 264954
URL: http://svn.apache.org/viewcvs?rev=264954&view=rev
Log:
WS-Sec Introp scenario 3
Added:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.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=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Tue Aug 30 23:57:44 2005
@@ -150,6 +150,28 @@
<copy file="../security/target/PingPort.aar"
tofile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"/>
+ <!-- Scenario 3 -->
+ <mkdir dir="target/test-resources/scenario3_client_repo"/>
+ <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/services"/>
+ <mkdir dir="target/test-resources/scenario3_service_repo/modules"/>
+
+ <!-- setup scenario3 client repository-->
+ <copy file="test-resources/security/s3.client.axis2.xml"
+ tofile="target/test-resources/scenario3_client_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario3_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario3 service repository-->
+ <copy file="test-resources/security/s3.service.axis2.xml"
+ tofile="target/test-resources/scenario3_service_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
+ <copy file="../security/target/PingPort.aar"
+ tofile="target/test-resources/scenario3_service_repo/services/PingPort.aar"/>
+
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml?rev=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml Tue Aug 30 23:57:44 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 3: Client's Configuration:START-->
- <parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
- <parameter name="user" locked="xsd:false">Chris</parameter>
+ <parameter name="OutAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="xsd:false">alice</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
+ <parameter name="OutSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="xsd:false">DirectReference</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="xsd:false">bob</parameter>
- <parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <parameter name="InAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <!-- Scenario 3: Client's Configuration:END-->
<transportReceiver name="http">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml?rev=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml Tue Aug 30 23:57:44 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 3: 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="xsd:false">UsernameToken</parameter>
+ <parameter name="InAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
<parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="InSignaturePropFile" locked="xsd:false">interop.properties</parameter>
- <parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
+ <parameter name="OutAction" locked="xsd:false">Signature Encrypt Timestamp</parameter>
+ <parameter name="user" locked="xsd:false">bob</parameter>
+ <parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="OutSignaturePropFile" locked="xsd:false">interop.properties</parameter>
+ <parameter name="OutSignatureKeyIdentifier" locked="xsd:false">DirectReference</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
+ <parameter name="encryptionUser" locked="xsd:false">alice</parameter>
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 3: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java?rev=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java Tue Aug 30 23:57:44 2005
@@ -17,7 +17,7 @@
package org.apache.axis2.security;
/**
- *
+ * WS-Security interop scenario 1
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
public class Scenario1Test extends InteropTestBase {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java?rev=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java Tue Aug 30 23:57:44 2005
@@ -17,7 +17,7 @@
package org.apache.axis2.security;
/**
- *
+ * WS-Security inteorp scenario 2
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
public class Scenario2Test extends InteropTestBase {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java?rev=264954&r1=264953&r2=264954&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java Tue Aug 30 23:57:44 2005
@@ -17,7 +17,7 @@
package org.apache.axis2.security;
/**
- *
+ * WS-Security interop scenario 2a
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
public class Scenario2aTest extends InteropTestBase {
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java?rev=264954&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java Tue Aug 30 23:57:44 2005
@@ -0,0 +1,32 @@
+/*
+* 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 3
+ * @author Ruchith Fernando (ruchith.fernando@gmail.com)
+ */
+public class Scenario3Test extends InteropTestBase {
+
+ protected void setUp() throws Exception {
+ this.setClientRepo(SCENARIO3_CLIENT_REPOSITORY);
+ this.setServiceRepo(SCENARIO3_SERVICE_REPOSITORY);
+ super.setUp();
+ }
+
+
+}