You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/11/19 05:50:24 UTC
svn commit: r476707 - in
/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart:
RampartMessageData.java handler/RampartReceiver.java
handler/WSDoAllReceiver.java handler/WSDoAllSender.java
Author: ruchithf
Date: Sat Nov 18 20:50:23 2006
New Revision: 476707
URL: http://svn.apache.org/viewvc?view=rev&rev=476707
Log:
Fix for AXIS2-1570: We are not setting the sys property anymore
Modified:
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartMessageData.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartMessageData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartMessageData.java?view=diff&rev=476707&r1=476706&r2=476707
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartMessageData.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/RampartMessageData.java Sat Nov 18 20:50:23 2006
@@ -17,7 +17,6 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -131,8 +130,6 @@
private ClassLoader customClassLoader;
public RampartMessageData(MessageContext msgCtx, boolean sender) throws RampartException {
-
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
this.msgContext = msgCtx;
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java?view=diff&rev=476707&r1=476706&r2=476707
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/RampartReceiver.java Sat Nov 18 20:50:23 2006
@@ -17,7 +17,6 @@
package org.apache.rampart.handler;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
@@ -79,11 +78,7 @@
} catch (RampartException e) {
e.printStackTrace();
throw new AxisFault(e);
- } finally {
- // Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
- Axis2Util.useDOOM(false);
- }
+ }
if(wsResult == null) {
return InvocationResponse.CONTINUE;
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java?view=diff&rev=476707&r1=476706&r2=476707
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java Sat Nov 18 20:50:23 2006
@@ -18,7 +18,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -75,15 +74,6 @@
boolean disableDoom = disableDoomValue != null
&& Constants.VALUE_TRUE.equalsIgnoreCase(disableDoomValue);
- if (!disableDoom) {
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation
- * is required.
- */
- // Set the DOM impl to DOOM
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
- }
RequestData reqData = new RequestData();
try {
@@ -112,15 +102,6 @@
reqData = null;
}
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation
- * is required.
- */
- // Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
-
- Axis2Util.useDOOM(false);
if (doDebug) {
log.debug("WSDoAllReceiver: exit invoke()");
}
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java?view=diff&rev=476707&r1=476706&r2=476707
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java Sat Nov 18 20:50:23 2006
@@ -17,7 +17,6 @@
package org.apache.rampart.handler;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -73,14 +72,6 @@
String disableDoomValue = (String)msgContext.getProperty(WSSHandlerConstants.DISABLE_DOOM);
boolean disableDoom = disableDoomValue != null && Constants.VALUE_TRUE.equalsIgnoreCase(disableDoomValue);
- if(!disableDoom) {
- /*
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation is required.
- */
- // Set the DOM impl to DOOM
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
- }
RequestData reqData = new RequestData();
try {
Parameter param = ConversationConfiguration.getParameter(msgContext);
@@ -102,13 +93,6 @@
reqData.clear();
reqData = null;
}
-
- /**
- * Temporary solution until DOOM's DocumentBuilder module is done.
- * Use ThreadLocal to determine whether or not DOOM implementation is required.
- */
- //Reset the document builder factory
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
}
}
@@ -448,4 +432,4 @@
sct.getElement(), false);
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org