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:18:41 UTC
svn commit: r264951 - in /webservices/axis2/trunk/java/modules: integration/
integration/test-resources/security/ security/src/org/apache/axis2/security/
security/src/org/apache/axis2/security/util/
Author: ruchithf
Date: Tue Aug 30 23:18:09 2005
New Revision: 264951
URL: http://svn.apache.org/viewcvs?rev=264951&view=rev
Log:
WS-Securty scenario 2a - 3 down 5 more to go :-)
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.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=264951&r1=264950&r2=264951&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Tue Aug 30 23:18:09 2005
@@ -109,7 +109,6 @@
<!-- Scenario 2 -->
<mkdir dir="target/test-resources/scenario2_client_repo"/>
<mkdir dir="target/test-resources/scenario2_client_repo/modules"/>
- <mkdir dir="target/test-resources/scenario2_client_repo/classes"/>
<mkdir dir="target/test-resources/scenario2_service_repo"/>
<mkdir dir="target/test-resources/scenario2_service_repo/services"/>
@@ -128,6 +127,29 @@
tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
<copy file="../security/target/PingPort.aar"
tofile="target/test-resources/scenario2_service_repo/services/PingPort.aar"/>
+
+ <!-- Scenario 2a -->
+ <mkdir dir="target/test-resources/scenario2a_client_repo"/>
+ <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/services"/>
+ <mkdir dir="target/test-resources/scenario2a_service_repo/modules"/>
+
+ <!-- setup scenario2a client repository-->
+ <copy file="test-resources/security/s2a.client.axis2.xml"
+ tofile="target/test-resources/scenario2a_client_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2a_client_repo/modules/security.mar"/>
+
+ <!-- setup scenario2a service repository-->
+ <copy file="test-resources/security/s2a.service.axis2.xml"
+ tofile="target/test-resources/scenario2a_service_repo/axis2.xml"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
+ <copy file="../security/target/PingPort.aar"
+ tofile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"/>
+
<!-- Standard repository -->
<mkdir dir="target/Repository"/>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml?rev=264951&r1=264950&r2=264951&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml Tue Aug 30 23:18:09 2005
@@ -10,16 +10,19 @@
<!-- 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 2: Client's Configuration:START-->
- <parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
+ <parameter name="OutAction" locked="xsd:false">UsernameTokenSignature Encrypt Timestamp</parameter>
<parameter name="user" locked="xsd:false">Chris</parameter>
+ <parameter name="encryptionParts" locked="xsd:false">{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</parameter>
+ <parameter name="encryptionUser" locked="xsd:false">bob</parameter>
+ <parameter name="encryptionPropFile" locked="xsd:false">interop.properties</parameter>
<parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
- <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
+ <parameter name="encryptionKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
<parameter name="InAction" locked="xsd:false">NoSecurity</parameter>
- <!-- Scenario 1: Client's Configuration:END-->
+ <!-- Scenario 2: Client's Configuration:END-->
<transportReceiver name="http">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml?rev=264951&r1=264950&r2=264951&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml Tue Aug 30 23:18:09 2005
@@ -9,15 +9,16 @@
<!-- This is only till we get the service specific parameters fixed in service.xml -->
- <!-- Scenario 1: Service's Configuration: START-->
- <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
+ <!-- Scenario 2: Service's Configuration: START-->
+ <!-- Also we can switch back to the 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">UsernameTokenSignature UsernameToken Encrypt Timestamp</parameter>
<parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+ <parameter name="decryptionPropFile" locked="xsd:false">interop.properties</parameter>
<parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
- <!-- Scenario 1: Service's Configuration: END-->
+ <!-- Scenario 2: Service's Configuration: END-->
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=264951&r1=264950&r2=264951&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java Tue Aug 30 23:18:09 2005
@@ -85,7 +85,7 @@
Document doc = null;
try {
- doc = Axis2Util.getDocumentFromSOAPEnvelope(msgContext.getEnvelope());
+ doc = Axis2Util.getDocumentFromSOAPEnvelope(msgContext.getEnvelope());
} catch (WSSecurityException wssEx) {
throw new AxisFault("WSDoAllReceiver: Error in converting to Document", wssEx);
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java?rev=264951&r1=264950&r2=264951&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java Tue Aug 30 23:18:09 2005
@@ -48,6 +48,7 @@
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ env.build();
/**
* There are plans to deprecate the OmNode.serialize(XMLStreamWriter)
* method therefore using OMOutoutImpl to serialize the env
@@ -55,9 +56,8 @@
OMOutputImpl output = new OMOutputImpl(baos, false);
env.serialize(output);
output.flush();
-
- ByteArrayInputStream bais = new ByteArrayInputStream(baos
- .toByteArray());
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);