Author: sagara
Date: Tue Jun 26 07:39:17 2012
New Revision: 1353845
URL: http://svn.apache.org/viewvc?rev=1353845&view=rev
Log:
RAMPART-377 - This revision (r1353719) is not actually merged to 1.6 branch in
order fix in 1.6.3 release.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/client.axis2.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/services.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1353719
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/client.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/client.axis2.xml?rev=1353845&r1=1353844&r2=1353845&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/client.axis2.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/client.axis2.xml
Tue Jun 26 07:39:17 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/branches/1_6/modules/rampart-samples/basic/sample09/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/services.xml?rev=1353845&r1=1353844&r2=1353845&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/services.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/services.xml
Tue Jun 26 07:39:17 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/branches/1_6/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java?rev=1353845&r1=1353844&r2=1353845&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/sample09/src/org/apache/rampart/samples/sample09/PWCBHandler.java
Tue Jun 26 07:39:17 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);
}
}
