Author: shankar
Date: Wed Dec 22 08:15:09 2010
New Revision: 1051784
URL: http://svn.apache.org/viewvc?rev=1051784&view=rev
Log:
Applying patch from RAMPART-254
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
Wed Dec 22 08:15:09 2010
@@ -660,9 +660,9 @@ public class SAML2TokenIssuer implements
Attribute[] attributes = null;
//Call the attribute callback handlers to get any attributes if exists
- if (config.getCallbackHander() != null) {
+ if (config.getCallbackHandler() != null) {
SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
- SAMLCallbackHandler handler = config.getCallbackHander();
+ SAMLCallbackHandler handler = config.getCallbackHandler();
handler.handle(cb);
attributes = cb.getSAML2Attributes();
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Wed Dec 22 08:15:09 2010
@@ -254,10 +254,10 @@ public class SAMLTokenIssuer implements
// In the case where the principal is a UT
if (principal instanceof WSUsernameTokenPrincipal) {
SAMLNameIdentifier nameId = null;
- if(config.getCallbackHander() != null){
+ if(config.getCallbackHandler() != null){
SAMLNameIdentifierCallback cb = new
SAMLNameIdentifierCallback(data);
cb.setUserId(principal.getName());
- SAMLCallbackHandler callbackHandler =
config.getCallbackHander();
+ SAMLCallbackHandler callbackHandler =
config.getCallbackHandler();
callbackHandler.handle(cb);
nameId = cb.getNameId();
}else{
@@ -432,9 +432,9 @@ public class SAMLTokenIssuer implements
SAMLAttribute[] attrs = null;
- if(config.getCallbackHander() != null){
+ if(config.getCallbackHandler() != null){
SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
- SAMLCallbackHandler handler = config.getCallbackHander();
+ SAMLCallbackHandler handler = config.getCallbackHandler();
handler.handle(cb);
attrs = cb.getAttributes();
} else if (config.getCallbackHandlerName() != null
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Wed Dec 22 08:15:09 2010
@@ -98,7 +98,7 @@ public class SAMLTokenIssuerConfig exten
protected String issuerName;
protected Map trustedServices = new HashMap();
protected String trustStorePropFile;
- protected SAMLCallbackHandler callbackHander;
+ protected SAMLCallbackHandler callbackHandler;
protected String callbackHandlerName;
/**
@@ -258,7 +258,7 @@ public class SAMLTokenIssuerConfig exten
try {
String value = attrElemet.getText();
Class handlerClass =
Class.forName(value);
- this.callbackHander =
(SAMLCallbackHandler)handlerClass.newInstance();
+ this.callbackHandler =
(SAMLCallbackHandler)handlerClass.newInstance();
} catch (ClassNotFoundException e) {
log.debug("Error loading class" , e);
throw new TrustException("Error loading
class" , e);
@@ -302,7 +302,7 @@ public class SAMLTokenIssuerConfig exten
OMElement timeToLive = fac.createOMElement(TTL, configElem);
timeToLive.setText(String.valueOf(this.ttl));
-
+
configElem.addChild(this.cryptoPropertiesElement);
OMElement keySizeElem = fac.createOMElement(KEY_SIZE, configElem);
@@ -408,12 +408,22 @@ public class SAMLTokenIssuerConfig exten
return trustedServices;
}
+ @Deprecated
public SAMLCallbackHandler getCallbackHander() {
- return callbackHander;
+ return callbackHandler;
+ }
+
+ @Deprecated
+ public void setCallbackHander(SAMLCallbackHandler callbackHandler) {
+ this.callbackHandler = callbackHandler;
+ }
+
+ public SAMLCallbackHandler getCallbackHandler() {
+ return callbackHandler;
}
- public void setCallbackHander(SAMLCallbackHandler callbackHander) {
- this.callbackHander = callbackHander;
+ public void setCallbackHandler(SAMLCallbackHandler callbackHandler) {
+ this.callbackHandler = callbackHandler;
}
public String getCallbackHandlerName() {
