You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2014/10/12 12:47:41 UTC

git commit: ODE-1021: Rampart Basic Sample08 fixed by RAMPART-376 and Sample09 fixed by RAMPART-377

Repository: ode
Updated Branches:
  refs/heads/ode-1.3.x 1c4921d15 -> 66bcc3293


ODE-1021: Rampart Basic Sample08 fixed by RAMPART-376 and Sample09 fixed by RAMPART-377


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/66bcc329
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/66bcc329
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/66bcc329

Branch: refs/heads/ode-1.3.x
Commit: 66bcc3293017c041aa68cd50d18089d9f1af2677
Parents: 1c4921d
Author: sathwik <sa...@apache.org>
Authored: Sun Oct 12 16:17:06 2014 +0530
Committer: sathwik <sa...@apache.org>
Committed: Sun Oct 12 16:17:06 2014 +0530

----------------------------------------------------------------------
 .../apache/ode/axis2/rampart/basic/SecuredProcessesTest.java    | 1 -
 .../apache/ode/axis2/rampart/policy/SecuredProcessesTest.java   | 1 -
 .../java/org/apache/rampart/samples/sample09/PWCBHandler.java   | 2 +-
 .../TestRampartBasic/secured-processes/sample08-client.axis2    | 2 +-
 .../TestRampartBasic/secured-processes/sample09-client.axis2    | 5 +++--
 .../TestRampartBasic/secured-processes/sample09-service.xml     | 5 +++--
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
index 7764e25..57d5a9b 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
@@ -96,7 +96,6 @@ public class SecuredProcessesTest extends Axis2TestBase {
             String response = DOMUtils.domToString(OMUtils.toDOM(responseElement));
             System.out.println(response);
 
-            System.out.println(response);
             assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!"));
         } finally {
             server.undeployProcess(bundleName);

http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
index 9535b3a..d7dcf1d 100644
--- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
+++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
@@ -107,7 +107,6 @@ public class SecuredProcessesTest extends Axis2TestBase {
             String response = DOMUtils.domToString(OMUtils.toDOM(responseElement));
             System.out.println(response);
 
-            System.out.println(response);
             assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!"));
         } finally {
             server.undeployProcess(bundleName);

http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java b/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
index ff4c8ca..0fc470b 100644
--- a/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
+++ b/axis2-war/src/test/java/org/apache/rampart/samples/sample09/PWCBHandler.java
@@ -60,7 +60,7 @@ public class PWCBHandler implements CallbackHandler {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pwcb = (WSPasswordCallback) callbacks[i];
 
-            if (pwcb.getUsage() == WSPasswordCallback.KEY_NAME) {
+            if (pwcb.getUsage() == WSPasswordCallback.SECRET_KEY) {
                 pwcb.setKey(key);
             }
         }

http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
index 77372d9..4d4d095 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample08-client.axis2
@@ -25,7 +25,7 @@
     <parameter name="OutflowSecurity">
 
         <action>
-            <items>Timestamp Signature NoSerialization</items>
+            <items>Timestamp Signature</items>
             <user>client</user>
             <passwordCallbackClass>org.apache.rampart.samples.sample08.PWCBHandler</passwordCallbackClass>
             <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
index 8de65db..4a2bbbf 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-client.axis2
@@ -26,9 +26,9 @@
             <items>Encrypt</items>
             <user>client</user>
             <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
-            <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass>
+            <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass>
             <encryptionPropFile>TestRampartBasic/secured-processes/client.properties</encryptionPropFile>
-            <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+            <embeddedKeyName>SessionKey</embeddedKeyName>
         </action>
     </parameter>
 
@@ -37,6 +37,7 @@
             <items>Encrypt</items>
             <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
             <decryptionPropFile>TestRampartBasic/secured-processes/client.properties</decryptionPropFile>
+            <isBSPCompliant>false</isBSPCompliant>
         </action>
     </parameter>
 

http://git-wip-us.apache.org/repos/asf/ode/blob/66bcc329/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml
----------------------------------------------------------------------
diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml
index a6aaa7d..bb33ff0 100644
--- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml
+++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml
@@ -24,6 +24,7 @@
             <items>Encrypt</items>
             <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
             <decryptionPropFile>TestRampartBasic/secured-processes/service.properties</decryptionPropFile>
+            <isBSPCompliant>false</isBSPCompliant>
         </action>
     </parameter>
 
@@ -33,8 +34,8 @@
             <user>service</user>
             <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
             <encryptionPropFile>TestRampartBasic/secured-processes/service.properties</encryptionPropFile>
-            <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass>
-            <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+            <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass>
+            <embeddedKeyName>SessionKey</embeddedKeyName>
         </action>
     </parameter>