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 2005/08/22 13:03:47 UTC
svn commit: r234468 - in /webservices/axis/trunk/java/modules/security/src:
META-INF/module.xml org/apache/axis2/security/WSDoAllSender.java
org/apache/axis2/security/handler/WSDoAllHandler.java
org/apache/axis2/security/util/Axis2Util.java
Author: ruchithf
Date: Mon Aug 22 04:03:17 2005
New Revision: 234468
URL: http://svn.apache.org/viewcvs?rev=234468&view=rev
Log:
WSDoAll* handlers-bug fixes: 1.) Making the documents factory namespace aware and 2.)fixing getOption()
Modified:
webservices/axis/trunk/java/modules/security/src/META-INF/module.xml
webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
Modified: webservices/axis/trunk/java/modules/security/src/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/src/META-INF/module.xml?rev=234468&r1=234467&r2=234468&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/src/META-INF/module.xml (original)
+++ webservices/axis/trunk/java/modules/security/src/META-INF/module.xml Mon Aug 22 04:03:17 2005
@@ -10,4 +10,4 @@
<order phase="MessageOut"/>
</handler>
</outflow>
-</module>
\ No newline at end of file
+</module>
Modified: webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=234468&r1=234467&r2=234468&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Mon Aug 22 04:03:17 2005
@@ -41,6 +41,7 @@
public void invoke(MessageContext msgContext) throws AxisFault {
doDebug = log.isDebugEnabled();
+ doDebug = true;
if (doDebug) {
log.debug("WSDoAllSender: enter invoke()");
}
@@ -74,7 +75,7 @@
getProperty(reqData.getMsgContext(), WSHandlerConstants.ACTOR);
}
reqData.setActor(actor);
-
+
/*
* For every action we need a username, so get this now. The
* username defined in the deployment descriptor takes precedence.
@@ -181,7 +182,6 @@
log.debug("Performing Action: " + actionToDo);
}
- String password = null;
switch (actionToDo) {
case WSConstants.UT:
performUTAction(actionToDo, mu, doc, reqData);
@@ -217,7 +217,6 @@
}
}
-
/*
* If required convert the resulting document into a message first.
* The outputDOM() method performs the necessary c14n call. After
@@ -247,6 +246,7 @@
} catch (WSSecurityException e) {
throw new AxisFault(e.getMessage(), e);
} finally {
+ System.out.println("DONE");
reqData.clear();
reqData = null;
}
Modified: webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java?rev=234468&r1=234467&r2=234468&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java (original)
+++ webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java Mon Aug 22 04:03:17 2005
@@ -116,7 +116,8 @@
public Object getOption(String key) {
- return this.handlerDesc.getParameter(key).getValue();
+ Parameter parameter = this.handlerDesc.getParameter(key);
+ return (parameter== null)?null:parameter.getValue();
}
public Object getProperty(Object msgContext, String key) {
Modified: webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java?rev=234468&r1=234467&r2=234468&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java Mon Aug 22 04:03:17 2005
@@ -59,8 +59,9 @@
ByteArrayInputStream bais = new ByteArrayInputStream(baos
.toByteArray());
- return DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse(bais);
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ return factory.newDocumentBuilder().parse(bais);
} catch (Exception e) {
throw new WSSecurityException(
"Error in converting SOAP Envelope to Document", e);