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 he...@apache.org on 2005/03/10 12:07:53 UTC
svn commit: r156940 - in webservices/axis/trunk/java/modules:
core/src/java/org/apache/axis/clientapi/
core/src/java/org/apache/axis/engine/
http/src/java/org/apache/axis/transport/http/
Author: hemapani
Date: Thu Mar 10 03:07:46 2005
New Revision: 156940
URL: http://svn.apache.org/viewcvs?view=rev&rev=156940
Log:
fix acroding to the comment given by Venket
Modified:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java
webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java Thu Mar 10 03:07:46 2005
@@ -153,7 +153,7 @@
public void sendAsync(SOAPEnvelope envelope) throws AxisFault {
Writer out = null;
try {
- final AxisEngine engine = new AxisEngine(registry);
+ final AxisEngine engine = new AxisEngine();
MessageContext msgctx = new MessageContext(registry, null, null);
msgctx.setEnvelope(envelope);
msgctx.setTo(targetEPR);
@@ -192,7 +192,7 @@
} else {
MessageContext request = null;
try {
- final AxisEngine engine = new AxisEngine(registry);
+ final AxisEngine engine = new AxisEngine();
request = new MessageContext(registry, null, null);
request.setEnvelope(envelope);
request.setProperty(MessageContext.TRANSPORT_TYPE, transport);
@@ -254,7 +254,7 @@
"This invocation support only for bi-directional transport");
}
try {
- AxisEngine engine = new AxisEngine(registry);
+ AxisEngine engine = new AxisEngine();
MessageContext msgctx = new MessageContext(registry, null, null);
msgctx.setEnvelope(envelope);
msgctx.setProperty(MessageContext.TRANSPORT_TYPE, transport);
@@ -290,7 +290,7 @@
public void sendReceiveAsync(SOAPEnvelope envelope, final Callback callback)
throws AxisFault {
try {
- AxisEngine engine = new AxisEngine(registry);
+ AxisEngine engine = new AxisEngine();
final MessageContext msgctx = new MessageContext(registry, null,
null);
msgctx.setEnvelope(envelope);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/AxisEngine.java Thu Mar 10 03:07:46 2005
@@ -38,19 +38,14 @@
*/
private Log log = LogFactory.getLog(getClass());
- /**
- * Field registry
- */
- private final EngineRegistry registry;
/**
* Constructor AxisEngine
*
* @param registry
*/
- public AxisEngine(EngineRegistry registry) {
+ public AxisEngine() {
log.info("Axis Engine Started");
- this.registry = registry;
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ExecutionChain.java Thu Mar 10 03:07:46 2005
@@ -102,8 +102,10 @@
Phase phase = (Phase) executionList.get(i);
if (phase != null) {
log.info("Invoke the Phase " + phase.getPhaseName());
- executionStack.push(phase);
phase.invoke(msgctx);
+ //This line should be after the invoke as if the invocation failed this phases is takn care of and
+ //no need to revoke agien
+ executionStack.push(phase);
}
}
} catch (Exception e) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java Thu Mar 10 03:07:46 2005
@@ -116,8 +116,10 @@
if (handler != null) {
log.info("Invoke the Handler " + handler.getName()
+ "with in the Phase " + phaseName);
- executionStack.push(handler);
handler.invoke(msgctx);
+ //This line should be after the invoke as if the invocation failed this handlers is takn care of and
+ //no need to revoke agien
+ executionStack.push(handler);
}
}
} catch (Exception e) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java Thu Mar 10 03:07:46 2005
@@ -28,8 +28,7 @@
* @throws AxisFault
*/
public void send(MessageContext msgCtx) throws AxisFault {
- AxisEngine engine =
- new AxisEngine(msgCtx.getGlobalContext().getRegistry());
+ AxisEngine engine = new AxisEngine();
engine.send(msgCtx);
}
}
Modified: webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/AxisServlet.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/AxisServlet.java Thu Mar 10 03:07:46 2005
@@ -15,6 +15,24 @@
*/
package org.apache.axis.transport.http;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
@@ -30,23 +48,6 @@
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-
/**
* Class AxisServlet
*/
@@ -139,7 +140,7 @@
throws ServletException, IOException {
try {
res.setContentType("text/xml; charset=utf-8");
- AxisEngine engine = new AxisEngine(engineRegistry);
+ AxisEngine engine = new AxisEngine();
Object sessionContext = req.getSession().getAttribute(
Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null) {
Modified: webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java Thu Mar 10 03:07:46 2005
@@ -15,6 +15,14 @@
*/
package org.apache.axis.transport.http;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
@@ -26,13 +34,6 @@
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis.transport.TransportReceiver;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Class HTTPTransportReceiver
*/
@@ -115,8 +116,7 @@
// TODO take care of other HTTP Headers
}
- AxisEngine axisEngine =
- new AxisEngine(msgContext.getGlobalContext().getRegistry());
+ AxisEngine axisEngine = new AxisEngine();
try {
XMLStreamReader xmlreader =
XMLInputFactory.newInstance().createXMLStreamReader(in);
Modified: webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportSender.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/HTTPTransportSender.java Thu Mar 10 03:07:46 2005
@@ -15,14 +15,12 @@
*/
package org.apache.axis.transport.http;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.BufferedWriter;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.Socket;
@@ -33,8 +31,6 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.AbstractTransportSender;
-
-import javax.xml.stream.XMLOutputFactory;
/**
* Class HTTPTransportSender
Modified: webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java?view=diff&r1=156939&r2=156940
==============================================================================
--- webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/http/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java Thu Mar 10 03:07:46 2005
@@ -15,14 +15,6 @@
*/
package org.apache.axis.transport.http;
-import org.apache.axis.Constants;
-import org.apache.axis.context.MessageContext;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
-import org.apache.axis.engine.EngineRegistryFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
@@ -30,6 +22,14 @@
import java.io.Writer;
import java.net.ServerSocket;
import java.net.Socket;
+
+import org.apache.axis.Constants;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* This is a simple implementation of an HTTP server for processing