You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/05/05 11:35:52 UTC
cvs commit: ws-fx/wss4j/src/org/apache/ws/axis/security WSDoAllReceiver.java WSDoAllSender.java
dims 2004/05/05 02:35:52
Modified: wss4j/src/org/apache/ws/axis/security WSDoAllReceiver.java
WSDoAllSender.java
Log:
Fix Receiver as well.
Revision Changes Path
1.10 +6 -7 ws-fx/wss4j/src/org/apache/ws/axis/security/WSDoAllReceiver.java
Index: WSDoAllReceiver.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/WSDoAllReceiver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSDoAllReceiver.java 24 Mar 2004 19:22:48 -0000 1.9
+++ WSDoAllReceiver.java 5 May 2004 09:35:51 -0000 1.10
@@ -30,14 +30,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.axis.security.util.AxisUtil;
-import org.apache.ws.security.WSConstants;
import org.apache.ws.security.SOAPConstants;
+import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -69,7 +69,7 @@
* Axis calls invoke to handle a message.
* <p/>
*
- * @param msgContext message context.
+ * @param mc message context.
* @throws AxisFault
*/
public void invoke(MessageContext mc) throws AxisFault {
@@ -177,12 +177,11 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLUtils.outputDOM(doc, os, true);
- String osStr = os.toString();
+ sPart.setCurrentMessage(os.toByteArray(), SOAPPart.FORM_BYTES);
if (doDebug) {
- log.debug("Processed received SOAP request");
+ log.debug("Processed received SOAP request");
log.debug(org.apache.axis.utils.XMLUtils.PrettyDocumentToString(doc));
}
- sPart.setCurrentMessage(osStr, SOAPPart.FORM_STRING);
/*
* After setting the new current message, probably modified because
1.13 +1 -3 ws-fx/wss4j/src/org/apache/ws/axis/security/WSDoAllSender.java
Index: WSDoAllSender.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/WSDoAllSender.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WSDoAllSender.java 5 May 2004 09:32:20 -0000 1.12
+++ WSDoAllSender.java 5 May 2004 09:35:52 -0000 1.13
@@ -67,8 +67,6 @@
private MessageContext msgContext = null;
- private int securityAction = WSConstants.NO_SECURITY;
-
private boolean noSerialization = false;
private SOAPConstants soapConstants = null;
@@ -110,7 +108,7 @@
* Axis calls invoke to handle a message.
* <p/>
*
- * @param msgContext message context.
+ * @param mc message context.
* @throws AxisFault
*/
public void invoke(MessageContext mc) throws AxisFault {