You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by am...@apache.org on 2012/06/25 21:59:10 UTC

svn commit: r1353719 - in /axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09: client.axis2.xml services.xml src/org/apache/rampart/samples/sample09/PWCBHandler.java

Author: amilaj
Date: Mon Jun 25 19:59:09 2012
New Revision: 1353719

URL: http://svn.apache.org/viewvc?rev=1353719&view=rev
Log:
Fixing issue RAMPART-377

Modified:
    axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/client.axis2.xml
    axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/services.xml
    axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/client.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/client.axis2.xml?rev=1353719&r1=1353718&r2=1353719&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/client.axis2.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/client.axis2.xml Mon Jun 25 19:59:09 2012
@@ -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>client.properties</encryptionPropFile> 
-            <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+            <embeddedKeyName>SessionKey</embeddedKeyName>
         </action>
     </parameter>
 
@@ -36,7 +36,8 @@
         <action>
             <items>Encrypt</items>
             <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
-            <decryptionPropFile>client.properties</decryptionPropFile> 
+            <decryptionPropFile>client.properties</decryptionPropFile>
+            <isBSPCompliant>false</isBSPCompliant>
         </action>
     </parameter>
 

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/services.xml?rev=1353719&r1=1353718&r2=1353719&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/services.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/services.xml Mon Jun 25 19:59:09 2012
@@ -29,6 +29,7 @@
             <items>Encrypt</items>
             <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass>
             <decryptionPropFile>service.properties</decryptionPropFile>
+            <isBSPCompliant>false</isBSPCompliant>
         </action>
     </parameter>
     
@@ -38,8 +39,8 @@
             <user>service</user>
             <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
             <encryptionPropFile>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>
     

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java?rev=1353719&r1=1353718&r2=1353719&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java Mon Jun 25 19:59:09 2012
@@ -41,7 +41,7 @@ public class PWCBHandler implements Call
         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);
             }
         }