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 az...@apache.org on 2006/09/14 13:04:37 UTC
svn commit: r443315 [2/2] - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/rahas/ rahas/src/org/apache/rahas/
rahas/src/org/apache/rahas/client/ rahas/src/org/apache/rahas/impl/
security/src/org/apache/rampart/conversation/ secur...
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=443315&r1=443314&r2=443315
==============================================================================
--- 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 Thu Sep 14 04:04:35 2006
@@ -54,7 +54,6 @@
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.xml.namespace.QName;
-
import java.security.NoSuchAlgorithmException;
import java.util.Properties;
import java.util.Vector;
@@ -71,7 +70,7 @@
CallbackHandler cbHandler = null;
if (cbHandlerClass != null) {
- Class cbClass = null;
+ Class cbClass;
try {
cbClass = Loader.loadClass(classLoader, cbHandlerClass);
} catch (ClassNotFoundException e) {
@@ -96,10 +95,9 @@
log.debug("loading class : " + cbHandlerClass);
- CallbackHandler cbHandler = null;
-
+ CallbackHandler cbHandler;
if (cbHandlerClass != null) {
- Class cbClass = null;
+ Class cbClass;
try {
cbClass = Loader.loadClass(classLoader, cbHandlerClass);
} catch (ClassNotFoundException e) {
@@ -132,7 +130,7 @@
int doAction)
throws RampartException {
- WSPasswordCallback pwCb = null;
+ WSPasswordCallback pwCb;
int reason = 0;
switch (doAction) {
@@ -364,7 +362,6 @@
* @param rmd
* @param issuedToken
* @return
- * @throws TrustException
* @throws RampartException
*/
public static String getIssuedToken(RampartMessageData rmd,
@@ -429,17 +426,11 @@
String servceEprAddress = rmd.getMsgContext()
.getOptions().getTo().getAddress();
- // Request type
- String reqType = TrustUtil.getWSTNamespace(rmd
- .getWstVersion())
- + RahasConstants.REQ_TYPE_ISSUE;
-
//Make the request
org.apache.rahas.Token rst =
client.requestSecurityToken(servicePolicy,
issuerEpr,
issuerPolicy,
- reqType,
servceEprAddress);
//Add the token to token storage
@@ -456,7 +447,7 @@
}
public static String addWsuIdToElement(OMElement elem) {
- String id = null;
+ String id;
OMAttribute idAttr = elem.getAttribute(new QName(WSConstants.WSU_NS, "Id"));
if(idAttr != null) {
id = idAttr.getAttributeValue();
@@ -514,7 +505,7 @@
}
public static KeyGenerator getEncryptionKeyGenerator(String symEncrAlgo) throws WSSecurityException {
- KeyGenerator keyGen = null;
+ KeyGenerator keyGen;
try {
/*
* Assume AES as default, so initialize it
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org