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/09/10 16:35:00 UTC
svn commit: r441957 - in
/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart:
errors.properties util/RampartUtil.java
Author: ruchithf
Date: Sun Sep 10 07:34:59 2006
New Revision: 441957
URL: http://svn.apache.org/viewvc?view=rev&rev=441957
Log:
Fixed resource properties used by RampartException
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties?view=diff&rev=441957&r1=441956&r2=441957
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/errors.properties Sun Sep 10 07:34:59 2006
@@ -23,4 +23,6 @@
errorInDerivedKeyTokenSignature = Error in DerivedKeyToken signature
errorInSignatureWithX509Token = Error in signature with X509Token
errorCreatingEncryptedKey = Error in creating an encrypted key
-errorGettingSignatureValuesForSigconf = Error in getting signature values for signature confirmation
\ No newline at end of file
+errorGettingSignatureValuesForSigconf = Error in getting signature values for signature confirmation
+cannotLoadPWCBClass = Cannot load password callback class: {0}
+cannotCreatePWCBInstance = Cannot create instance of password callback : {0}
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java?view=diff&rev=441957&r1=441956&r2=441957
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/RampartUtil.java Sun Sep 10 07:34:59 2006
@@ -68,16 +68,14 @@
try {
cbClass = Loader.loadClass(classLoader, cbHandlerClass);
} catch (ClassNotFoundException e) {
- throw new RampartException(
- "WSHandler: cannot load password callback class: "
- + cbHandlerClass, e);
+ throw new RampartException("cannotLoadPWCBClass",
+ new String[]{cbHandlerClass}, e);
}
try {
cbHandler = (CallbackHandler) cbClass.newInstance();
} catch (java.lang.Exception e) {
- throw new RampartException(
- "WSHandler: cannot create instance of password callback: "
- + cbHandlerClass, e);
+ throw new RampartException("cannotCreatePWCBInstance",
+ new String[]{cbHandlerClass}, e);
}
}
@@ -98,19 +96,18 @@
try {
cbClass = Loader.loadClass(classLoader, cbHandlerClass);
} catch (ClassNotFoundException e) {
- throw new RampartException(
- "Cannot load password callback class: "
- + cbHandlerClass, e);
+ throw new RampartException("cannotLoadPWCBClass",
+ new String[]{cbHandlerClass}, e);
}
try {
cbHandler = (CallbackHandler) cbClass.newInstance();
} catch (java.lang.Exception e) {
- throw new RampartException(
- "Cannot create instance of password callback: "
- + cbHandlerClass, e);
+ throw new RampartException("cannotCreatePWCBInstance",
+ new String[]{cbHandlerClass}, e);
}
} else {
- cbHandler = (CallbackHandler)rmd.getMsgContext().getProperty(WSHandlerConstants.PW_CALLBACK_REF);
+ cbHandler = (CallbackHandler) rmd.getMsgContext().getProperty(
+ WSHandlerConstants.PW_CALLBACK_REF);
}
return cbHandler;
@@ -152,7 +149,7 @@
try {
cbHandler.handle(callbacks);
} catch (Exception e) {
- throw new RampartException("WSHandler: password callback failed", e);
+ throw new RampartException("pwcbFailed", e);
}
return pwCb;
}
@@ -230,7 +227,7 @@
return WSConstants.BST_DIRECT_REFERENCE;
} else {
throw new RampartException(
- "Unknown key reference specifier for X509Token");
+ "unknownKeyRefSpeficier");
}
}
@@ -267,7 +264,9 @@
//Create TokenType element and set the value
OMElement tokenTypeElem = TrustUtil.createTokenTypeElement(
wstVersion, rstTempl);
- String tokenType = ConversationConstants.getWSCNs(conversationVersion) + ConversationConstants.TOKEN_TYPE_SECURITY_CONTEXT_TOKEN;
+ String tokenType = ConversationConstants
+ .getWSCNs(conversationVersion)
+ + ConversationConstants.TOKEN_TYPE_SECURITY_CONTEXT_TOKEN;
tokenTypeElem.setText(tokenType);
return rstTempl;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org