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 2006/12/11 11:16:51 UTC
svn commit: r485588 - in /webservices/axis2/branches/java/1_1/modules:
integration/test/org/apache/rahas/ security/src/org/apache/rampart/builder/
Author: ruchithf
Date: Mon Dec 11 02:16:47 2006
New Revision: 485588
URL: http://svn.apache.org/viewvc?view=rev&rev=485588
Log:
- Fixed AXIS2-1859
- Fixed imports of rahas tests
Modified:
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java?view=diff&rev=485588&r1=485587&r2=485588
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java Mon Dec 11 02:16:47 2006
@@ -19,7 +19,7 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.security.sc.PWCallback;
+import org.apache.rahas.PWCallback;
import org.apache.neethi.Policy;
import org.apache.rampart.handler.config.InflowConfiguration;
import org.apache.rampart.handler.config.OutflowConfiguration;
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java?view=diff&rev=485588&r1=485587&r2=485588
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java Mon Dec 11 02:16:47 2006
@@ -19,7 +19,7 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.security.sc.PWCallback;
+import org.apache.rahas.PWCallback;
import org.apache.neethi.Policy;
import org.apache.rampart.handler.config.InflowConfiguration;
import org.apache.rampart.handler.config.OutflowConfiguration;
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=485588&r1=485587&r2=485588
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/builder/BindingBuilder.java Mon Dec 11 02:16:47 2006
@@ -173,8 +173,13 @@
WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
if(token.getInclusion().equals(Constants.INCLUDE_NEVER)) {
- //Use thumbprint
- encrKey.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
+ if(rpd.getWss11() != null) {
+ //Use thumbprint
+ encrKey.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
+ } else {
+ //Use SKI
+ encrKey.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+ }
} else {
encrKey.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
}
@@ -201,8 +206,13 @@
log.debug("Token inclusion: " + token.getInclusion());
if(token.getInclusion().equals(Constants.INCLUDE_NEVER)) {
- //Use thumbprint
- sig.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
+ if(rpd.getWss11() != null) {
+ //Use thumbprint
+ sig.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
+ } else {
+ //Use SKI
+ sig.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+ }
} else {
sig.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org