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 he...@apache.org on 2005/03/22 14:41:18 UTC
svn commit: r158603 - in webservices/axis/trunk/java/modules:
core/src/java/org/apache/axis/clientapi/
core/src/java/org/apache/axis/context/
core/src/java/org/apache/axis/description/
core/src/java/org/apache/axis/engine/
core/src/java/org/apache/axis/phaseresolver/
core/src/java/org/apache/axis/providers/
core/src/java/org/apache/axis/transport/
core/src/java/org/apache/axis/util/ core/src/test/org/apache/axis/engine/
core/src/test/org/apache/axis/handlers/addressing/
deployment/src/java/org/apache/axis/deployment/
deployment/src/test/org/apache/axis/deployment/
http/src/java/org/apache/axis/transport/http/
mail/src/java/org/apache/axis/transport/mail/ samples/
samples/src/java/userguide/sample1/
samples/src/test/org/apache/axis/engine/ wsdl/
Author: hemapani
Date: Tue Mar 22 05:41:12 2005
New Revision: 158603
URL: http://svn.apache.org/viewcvs?view=rev&rev=158603
Log:
make the axis2 work on the transports taken from DDs
Removed:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransport.java
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/clientapi/Invoker.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransportIn.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/EngineRegistry.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/Utils.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineTest.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/MessageContextTest.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/server.xml
webservices/axis/trunk/java/modules/deployment/src/test/org/apache/axis/deployment/TransportDeploymentTest.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/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/mail/src/java/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/samples/project.xml
webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/AsynchronousClient.java
webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/SynchronousClient.java
webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/modules/wsdl/project.xml
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=158602&r2=158603
==============================================================================
--- 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 Tue Mar 22 05:41:12 2005
@@ -18,10 +18,14 @@
import java.io.IOException;
import java.io.Writer;
+import javax.xml.namespace.QName;
+
import org.apache.axis.Constants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
@@ -29,7 +33,7 @@
import org.apache.axis.om.OMException;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.util.Utils;
+import org.apache.axis.transport.TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -79,9 +83,35 @@
/**
* Constructor Call
*/
- public Call() {
+ public Call() throws AxisFault {
// TODO look for the Client XML and create an Engine registy
this.registry = new EngineRegistryImpl(new AxisGlobal());
+
+ try {
+ //This is a hack, initialize the transports for the client side
+ AxisTransportOut httpTransportOut = new AxisTransportOut(new QName(Constants.TRANSPORT_HTTP));
+ Class className = Class.forName("org.apache.axis.transport.http.HTTPTransportSender");
+ httpTransportOut.setSender((TransportSender) className.newInstance());
+ registry.addTransportOut(httpTransportOut);
+
+ AxisTransportIn axisTr = new AxisTransportIn(new QName(Constants.TRANSPORT_HTTP));
+ className = Class.forName("org.apache.axis.transport.http.HTTPTransportReceiver");
+ axisTr.setReciver((TransportReceiver) className.newInstance());
+ registry.addTransportIn(axisTr);
+
+ AxisTransportOut mailTransportOut = new AxisTransportOut(new QName(Constants.TRANSPORT_MAIL));
+ className = Class.forName("org.apache.axis.transport.mail.MailTransportSender");
+ mailTransportOut.setSender((TransportSender) className.newInstance());
+ registry.addTransportIn(new AxisTransportIn(new QName(Constants.TRANSPORT_MAIL)));
+ registry.addTransportOut(mailTransportOut);
+ } catch (ClassNotFoundException e) {
+ throw new AxisFault(e.getMessage(),e);
+ } catch (InstantiationException e) {
+ throw new AxisFault(e.getMessage(),e);
+ } catch (IllegalAccessException e) {
+ throw new AxisFault(e.getMessage(),e);
+ }
+
Listenertransport = null;
transport = Constants.TRANSPORT_HTTP;
}
@@ -150,8 +180,12 @@
public void sendAsync(SOAPEnvelope envelope) throws AxisFault {
Writer out = null;
try {
+ AxisTransportIn transportIn = registry.getTransportIn(new QName(transport));
+ AxisTransportOut transportOut = registry.getTransportOut(new QName(transport));
+
final AxisEngine engine = new AxisEngine();
- MessageContext msgctx = new MessageContext(registry, null, null,Utils.createHTTPTransport(registry));
+ MessageContext msgctx = new MessageContext(registry, null, null,transportIn,transportOut);
+ msgctx.setTransportOut(transportOut);
msgctx.setEnvelope(envelope);
msgctx.setTo(targetEPR);
@@ -187,10 +221,13 @@
} else {
MessageContext request = null;
try {
+ AxisTransportIn transportIn = registry.getTransportIn(new QName(transport));
+ AxisTransportOut transportOut = registry.getTransportOut(new QName(transport));
+
final AxisEngine engine = new AxisEngine();
- request = new MessageContext(registry, null, null,Utils.createHTTPTransport(registry));
+ request = new MessageContext(registry, null, null,transportIn,transportOut);
request.setEnvelope(envelope);
-
+ request.setTransportOut(transportOut);
request.setTo(targetEPR);
if (action != null) {
request.setProperty(MessageContext.SOAP_ACTION, action);
@@ -209,7 +246,7 @@
* request.getSessionContext());
*/
request.setServerSide(false);
- TransportReceiver receiver = request.getTransport().getReciever();
+ TransportReceiver receiver = request.getTransportIn().getReciever();
receiver.invoke(request);
if (request.getProperty(MessageContext.TRANSPORT_SUCCEED) != null) {
throw new AxisFault("Sent failed");
@@ -244,20 +281,23 @@
throw new AxisFault("This invocation support only for bi-directional transport");
}
try {
+ AxisTransportIn transportIn = registry.getTransportIn(new QName(transport));
+ AxisTransportOut transportOut = registry.getTransportOut(new QName(transport));
+
AxisEngine engine = new AxisEngine();
- MessageContext msgctx = new MessageContext(registry, null, null,Utils.createHTTPTransport(registry));
+ MessageContext msgctx = new MessageContext(registry, null, null,transportIn,transportOut);
msgctx.setEnvelope(envelope);
-
+
msgctx.setTo(targetEPR);
if (action != null) {
msgctx.setProperty(MessageContext.SOAP_ACTION, action);
}
engine.send(msgctx);
MessageContext response =
- new MessageContext(registry, msgctx.getProperties(), msgctx.getSessionContext(),msgctx.getTransport());
+ new MessageContext(registry, msgctx.getProperties(), msgctx.getSessionContext(),msgctx.getTransportIn(),transportOut);
response.setServerSide(false);
- TransportReceiver receiver = response.getTransport().getReciever();
+ TransportReceiver receiver = response.getTransportIn().getReciever();
receiver.invoke(response);
SOAPEnvelope resenvelope = response.getEnvelope();
@@ -277,10 +317,13 @@
*/
public void sendReceiveAsync(SOAPEnvelope envelope, final Callback callback) throws AxisFault {
try {
+ AxisTransportIn transportIn = registry.getTransportIn(new QName(transport));
+ AxisTransportOut transportOut = registry.getTransportOut(new QName(transport));
+
AxisEngine engine = new AxisEngine();
- final MessageContext msgctx = new MessageContext(registry, null, null,Utils.createHTTPTransport(registry));
+ final MessageContext msgctx = new MessageContext(registry, null, null, transportIn,transportOut);
msgctx.setEnvelope(envelope);
-
+ msgctx.setTransportOut(transportOut);
msgctx.setTo(targetEPR);
if (action != null) {
msgctx.setProperty(MessageContext.SOAP_ACTION, action);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java Tue Mar 22 05:41:12 2005
@@ -73,10 +73,10 @@
callback);
MessageContext resMsgContext =
new MessageContext(registry, reqMsgContext.getProperties(),
- reqMsgContext.getSessionContext(),reqMsgContext.getTransport());
+ reqMsgContext.getSessionContext(),reqMsgContext.getTransportIn(),reqMsgContext.getTransportOut());
resMsgContext.setServerSide(false);
- TransportReceiver receiver = reqMsgContext.getTransport().getReciever();
+ TransportReceiver receiver = reqMsgContext.getTransportIn().getReciever();
receiver.invoke(resMsgContext);
AsyncResult result = new AsyncResult();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/context/MessageContext.java Tue Mar 22 05:41:12 2005
@@ -15,12 +15,18 @@
*/
package org.apache.axis.context;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
import org.apache.axis.addressing.miheaders.RelatesTo;
+import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.ExecutionChain;
@@ -28,10 +34,6 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.wsdl.WSDLService;
-import javax.xml.stream.XMLStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* The palce where all the service specific states are kept.
* All the Global states kept in the <code>EngineRegistry</code> and all the
@@ -80,7 +82,7 @@
*/
public static final String TRANSPORT_SUCCEED = "TRANSPORT_SUCCEED";
- // public static final String REQUEST_URL = "REQUEST_URL";
+
/**
* Field processingFault
@@ -101,8 +103,10 @@
private final ExecutionChain chain;
- private final AxisTransport transport;
-
+ private AxisTransportIn transportIn;
+
+ private AxisTransportOut transportOut;
+
/**
* Field properties
*/
@@ -181,7 +185,7 @@
public MessageContext(EngineRegistry er,
Map initialProperties,
SessionContext sessionContext,
- AxisTransport transport)
+ AxisTransportIn transportIn,AxisTransportOut transportOut)
throws AxisFault {
this.globalContext = new GlobalContext(er);
if (sessionContext == null) {
@@ -195,7 +199,9 @@
properties = initialProperties;
chain = new ExecutionChain();
messageInformationHeaders = new MessageInformationHeadersCollection();
- this.transport = transport;
+ this.transportIn = transportIn;
+ this.transportOut = transportOut;
+
}
/**
@@ -449,19 +455,7 @@
return this.chain;
}
- /**
- * @return
- */
- public AxisTransport getTransport() {
- return transport;
- }
-// /**
-// * @param transport
-// */
-// public void setTransport(AxisTransport transport) {
-// this.transport = transport;
-// }
/**
* @return
@@ -531,4 +525,32 @@
public void setPaused(boolean b) {
paused = b;
}
+ /**
+ * @return
+ */
+ public AxisTransportIn getTransportIn() {
+ return transportIn;
+ }
+
+ /**
+ * @return
+ */
+ public AxisTransportOut getTransportOut() {
+ return transportOut;
+ }
+
+ /**
+ * @param in
+ */
+ public void setTransportIn(AxisTransportIn in) {
+ transportIn = in;
+ }
+
+ /**
+ * @param out
+ */
+ public void setTransportOut(AxisTransportOut out) {
+ transportOut = out;
+ }
+
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransportIn.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransportIn.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransportIn.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/AxisTransportIn.java Tue Mar 22 05:41:12 2005
@@ -53,7 +53,7 @@
protected QName name;
- protected TransportReceiver sender;
+ protected TransportReceiver reciever;
/**
* Constructor AxisTransport
@@ -132,4 +132,18 @@
public void setFaultFlow(Flow faultFlow) {
this.faultFlow = faultFlow;
}
+ /**
+ * @return
+ */
+ public TransportReceiver getReciever() {
+ return reciever;
+ }
+
+ /**
+ * @param receiver
+ */
+ public void setReciver(TransportReceiver receiver) {
+ reciever = receiver;
+ }
+
}
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=158602&r2=158603
==============================================================================
--- 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 Tue Mar 22 05:41:12 2005
@@ -20,7 +20,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.handlers.OpNameFinder;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPBody;
@@ -87,7 +87,7 @@
ExecutionChain chain = context.getExecutionChain();
// Receiving is always a matter of running the transport handlers first
- AxisTransport transport = context.getTransport();
+ AxisTransportIn transport = context.getTransportIn();
if (transport != null) {
log.info("Using the transport" + transport.getName());
chain.addPhases(transport.getPhases(EngineRegistry.INFLOW));
@@ -138,7 +138,7 @@
// create a SOAP envelope with the Fault
MessageContext faultContext = new MessageContext(context.getGlobalContext().getRegistry(),
- context.getProperties(),context.getSessionContext(),context.getTransport());
+ context.getProperties(),context.getSessionContext(),context.getTransportIn(),context.getTransportOut());
faultContext.setProcessingFault(true);
faultContext.setServerSide(true);
SOAPEnvelope envelope =
@@ -194,13 +194,13 @@
chain.addPhases(global.getPhases(flow));
// Receiving is always a matter of running the transport handlers first
- AxisTransport transport = context.getTransport();
+ AxisTransportIn transport = context.getTransportIn();
chain.addPhases(transport.getPhases(flow));
// startet rolling
chain.invoke(context);
- TransportSender sender = transport.getSender();
+ TransportSender sender = context.getTransportOut().getSender();
sender.invoke(context);
} catch (AxisFault error) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistry.java Tue Mar 22 05:41:12 2005
@@ -95,22 +95,6 @@
*/
public void addMdoule(AxisModule module) throws AxisFault;
- /**
- * Method getTransport
- *
- * @param name
- * @return
- * @throws AxisFault
- */
- public AxisTransport getTransport(QName name) throws AxisFault;
-
- /**
- * Method addTransport
- *
- * @param transport
- * @throws AxisFault
- */
- public void addTransport(AxisTransport transport) throws AxisFault;
/**
* Method getTransports
@@ -138,7 +122,7 @@
public AxisTransportIn getTransportIn(QName name) throws AxisFault ;
- public void addTransport(AxisTransportIn transport) throws AxisFault;
+ public void addTransportIn(AxisTransportIn transport) throws AxisFault;
public AxisTransportOut getTransportOut(QName name) throws AxisFault ;
public void addTransportOut(AxisTransportOut transport) throws AxisFault ;
public HashMap getTransportsIn();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/EngineRegistryImpl.java Tue Mar 22 05:41:12 2005
@@ -24,7 +24,6 @@
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
@@ -71,7 +70,7 @@
*
* @param global
*/
- public EngineRegistryImpl(AxisGlobal global) {
+ public EngineRegistryImpl(AxisGlobal global) throws AxisFault {
this.global = global;
phases = new ArrayList();
errornesServices = new Hashtable();
@@ -152,27 +151,7 @@
services.remove(name);
}
- /**
- * Method getTransport
- *
- * @param name
- * @return
- * @throws AxisFault
- */
- public AxisTransport getTransport(QName name) throws AxisFault {
- return (AxisTransport) transports.get(name);
- }
-
- /**
- * Method addTransport
- *
- * @param transport
- * @throws AxisFault
- */
- public synchronized void addTransport(AxisTransport transport)
- throws AxisFault {
- transports.put(transport.getName(), transport);
- }
+
public AxisTransportIn getTransportIn(QName name) throws AxisFault {
@@ -185,7 +164,7 @@
* @param transport
* @throws AxisFault
*/
- public synchronized void addTransport(AxisTransportIn transport)
+ public synchronized void addTransportIn(AxisTransportIn transport)
throws AxisFault {
transportsIn.put(transport.getName(), transport);
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java Tue Mar 22 05:41:12 2005
@@ -382,120 +382,6 @@
}
}
- /**
- * Method buildTransportChain
- *
- * @param trnsport
- * @param chainType
- * @throws PhaseException
- */
- public void buildTransportChain(AxisTransport trnsport, int chainType)
- throws PhaseException {
- try {
- OrderThePhases();
-
- HandlerMetadata[] handlers;
- Class handlerClass = null;
- Handler handler;
- switch (chainType) {
- case 1:
- {
- ArrayList inChain = new ArrayList();
- for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetadata phase =
- (PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
- handlers = phase.getOrderedHandlers();
- for (int j = 0; j < handlers.length; j++) {
- try {
- handlerClass = Class.forName(
- handlers[j].getClassName(), true,
- Thread.currentThread().getContextClassLoader());
- handler =
- (Handler) handlerClass.newInstance();
- handler.init(handlers[j]);
- handlers[j].setHandler(handler);
- axisPhase.addHandler(handlers[j].getHandler());
- } catch (ClassNotFoundException e) {
- throw new PhaseException(e);
- } catch (IllegalAccessException e) {
- throw new PhaseException(e);
- } catch (InstantiationException e) {
- throw new PhaseException(e);
- }
- }
- inChain.add(axisPhase);
- }
- trnsport.setPhases(inChain, EngineRegistry.INFLOW);
- break;
- }
- case 2:
- {
- ArrayList outChain = new ArrayList();
- for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetadata phase =
- (PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
- handlers = phase.getOrderedHandlers();
- for (int j = 0; j < handlers.length; j++) {
- try {
- handlerClass = Class.forName(
- handlers[j].getClassName(), true,
- Thread.currentThread().getContextClassLoader());
- handler =
- (Handler) handlerClass.newInstance();
- handler.init(handlers[j]);
- handlers[j].setHandler(handler);
- axisPhase.addHandler(handlers[j].getHandler());
- } catch (ClassNotFoundException e) {
- throw new PhaseException(e);
- } catch (IllegalAccessException e) {
- throw new PhaseException(e);
- } catch (InstantiationException e) {
- throw new PhaseException(e);
- }
- }
- outChain.add(axisPhase);
- }
- trnsport.setPhases(outChain, EngineRegistry.OUTFLOW);
- break;
- }
- case 3:
- {
- ArrayList faultChain = new ArrayList();
- for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetadata phase =
- (PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
- handlers = phase.getOrderedHandlers();
- for (int j = 0; j < handlers.length; j++) {
- try {
- handlerClass = Class.forName(
- handlers[j].getClassName(), true,
- Thread.currentThread().getContextClassLoader());
- handler =
- (Handler) handlerClass.newInstance();
- handler.init(handlers[j]);
- handlers[j].setHandler(handler);
- axisPhase.addHandler(handlers[j].getHandler());
- } catch (ClassNotFoundException e) {
- throw new PhaseException(e);
- } catch (IllegalAccessException e) {
- throw new PhaseException(e);
- } catch (InstantiationException e) {
- throw new PhaseException(e);
- }
- }
- faultChain.add(axisPhase);
- }
- trnsport.setPhases(faultChain, EngineRegistry.FAULTFLOW);
- break;
- }
- }
- } catch (AxisFault e) {
- throw new PhaseException(e);
- }
- }
/**
* Method buildGlobalChain
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java Tue Mar 22 05:41:12 2005
@@ -156,7 +156,7 @@
SOAPEnvelope envelope = null;
MessageContext msgContext1 = new MessageContext(
msgContext.getGlobalContext().getRegistry(),
- msgContext.getProperties(), msgContext.getSessionContext(),msgContext.getTransport());
+ msgContext.getProperties(), msgContext.getSessionContext(),msgContext.getTransportIn(),msgContext.getTransportOut());
if(WSDLService.STYLE_DOC.equals(msgContext.getMessageStyle())){
parmeter = methodElement;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java Tue Mar 22 05:41:12 2005
@@ -59,50 +59,50 @@
* @throws AxisFault
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- Writer out = null;
- if (msgContext.isProcessingFault()) {
-
- // Means we are processing fault
- if (msgContext.getFaultTo() != null) {
- log.info("Obtain the output stream to send the fault flow to "
- + msgContext.getFaultTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getFaultTo());
+ Writer out = null;
+ if (msgContext.isProcessingFault()) {
+
+ // Means we are processing fault
+ if (msgContext.getFaultTo() != null) {
+ log.info("Obtain the output stream to send the fault flow to "
+ + msgContext.getFaultTo().getAddress());
+ out = obtainWriter(msgContext, msgContext.getFaultTo());
+ } else {
+ log.info(
+ "Obtain the output stream to send the fault flow to ANONYMOUS");
+ out = obtainWriter(msgContext);
+ }
} else {
- log.info(
- "Obtain the output stream to send the fault flow to ANONYMOUS");
- out = obtainWriter(msgContext);
+ if (msgContext.getTo() != null) {
+ log.info("Obtain the output stream to send to To flow to "
+ + msgContext.getTo().getAddress());
+ out = obtainWriter(msgContext, msgContext.getTo());
+ } else if (msgContext.getReplyTo() != null) {
+ log.info("Obtain the output stream to send to ReplyTo flow to "
+ + msgContext.getReplyTo().getAddress());
+ out = obtainWriter(msgContext, msgContext.getTo());
+ } else {
+ log.info(
+ "Obtain the output stream to send the fault flow to ANONYMOUS");
+ out = obtainWriter(msgContext);
+ }
}
- } else {
- if (msgContext.getTo() != null) {
- log.info("Obtain the output stream to send to To flow to "
- + msgContext.getTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getTo());
- } else if (msgContext.getReplyTo() != null) {
- log.info("Obtain the output stream to send to ReplyTo flow to "
- + msgContext.getReplyTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getTo());
- } else {
- log.info(
- "Obtain the output stream to send the fault flow to ANONYMOUS");
- out = obtainWriter(msgContext);
- }
- }
- startSending(msgContext,out);
- SOAPEnvelope envelope = msgContext.getEnvelope();
- if (envelope != null) {
- XMLStreamWriter outputWriter = null;
- try {
- outputWriter =
- XMLOutputFactory.newInstance().createXMLStreamWriter(out);
- envelope.serialize(outputWriter, false);
- outputWriter.flush();
- out.flush();
- } catch (Exception e) {
- throw new AxisFault("Stream error", e);
+ startSending(msgContext,out);
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ if (envelope != null) {
+ XMLStreamWriter outputWriter = null;
+ try {
+ outputWriter =
+ XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+ envelope.serialize(outputWriter, false);
+ outputWriter.flush();
+ out.flush();
+ } catch (Exception e) {
+ throw new AxisFault("Stream error", e);
+ }
}
- }
- finalizeSending(msgContext,out);
- log.info("Send the Response");
+ finalizeSending(msgContext,out);
+ log.info("Send the Response");
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/Utils.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/Utils.java Tue Mar 22 05:41:12 2005
@@ -17,19 +17,14 @@
import java.util.ArrayList;
-import javax.xml.namespace.QName;
-
import org.apache.axis.Constants;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
import org.apache.axis.description.Flow;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Handler;
import org.apache.axis.engine.Phase;
-import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportSender;
public class Utils {
@@ -76,48 +71,6 @@
}
}
- public static AxisTransport createHTTPTransport(EngineRegistry er) throws AxisFault {
- try {
- QName transportName = new QName("http");
- //AxisTransport httpTransport = er.getTransport(transportName);
- AxisTransport httpTransport = null;
- if (httpTransport == null) {
- httpTransport = new AxisTransport(transportName);
- Class className =
- Class.forName("org.apache.axis.transport.http.HTTPTransportSender");
- httpTransport.setSender((TransportSender) className.newInstance());
-
- className = Class.forName("org.apache.axis.transport.http.HTTPTransportReceiver");
- httpTransport.setReciever((TransportReceiver) className.newInstance());
- }
- return httpTransport;
- } catch (ClassNotFoundException e) {
- throw new AxisFault(e.getMessage(), e);
- } catch (InstantiationException e) {
- throw new AxisFault(e.getMessage(), e);
- } catch (IllegalAccessException e) {
- throw new AxisFault(e.getMessage(), e);
- }
- }
- public static AxisTransport createMailTransport(EngineRegistry er) throws AxisFault {
- try {
- QName transportName = new QName("http");
-
- AxisTransport mailTransport = null;
- if (mailTransport == null) {
- mailTransport = new AxisTransport(new QName("http"));
- Class className =
- Class.forName("org.apache.axis.transport.mail.MailTransportSender");
- mailTransport.setSender((TransportSender) className.newInstance());
- }
- return mailTransport;
- } catch (ClassNotFoundException e) {
- throw new AxisFault(e.getMessage(), e);
- } catch (InstantiationException e) {
- throw new AxisFault(e.getMessage(), e);
- } catch (IllegalAccessException e) {
- throw new AxisFault(e.getMessage(), e);
- }
- }
+
}
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EnginePausingTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EnginePausingTest.java Tue Mar 22 05:41:12 2005
@@ -27,7 +27,8 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import org.apache.axis.handlers.AbstractHandler;
@@ -51,9 +52,15 @@
protected void setUp() throws Exception {
engineRegistry = new EngineRegistryImpl(new AxisGlobal());
- AxisTransport transport = new AxisTransport(new QName("null"));
- transport.setSender(new NullTransportSender());
- mc = new MessageContext(engineRegistry, null, null, transport);
+ AxisTransportOut transportOut = new AxisTransportOut(new QName("null"));
+ transportOut.setSender(new NullTransportSender());
+
+ AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
+
+
+
+ mc = new MessageContext(engineRegistry, null, null, transportIn,transportOut);
+ mc.setTransportOut(transportOut);
mc.setServerSide(true);
OMFactory omFac = OMFactory.newInstance();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -149,7 +156,7 @@
new MessageContext(
msgCtx.getGlobalContext().getRegistry(),
msgCtx.getProperties(),
- msgCtx.getSessionContext(),msgCtx.getTransport());
+ msgCtx.getSessionContext(),msgCtx.getTransportIn(),msgCtx.getTransportOut());
newCtx.setEnvelope(msgCtx.getEnvelope());
return newCtx;
}
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineTest.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineTest.java Tue Mar 22 05:41:12 2005
@@ -27,7 +27,8 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import org.apache.axis.handlers.AbstractHandler;
@@ -51,9 +52,13 @@
protected void setUp() throws Exception {
engineRegistry = new EngineRegistryImpl(new AxisGlobal());
- AxisTransport transport = new AxisTransport(new QName("null"));
+ AxisTransportOut transport = new AxisTransportOut(new QName("null"));
transport.setSender(new NullTransportSender());
- mc = new MessageContext(engineRegistry, null, null, transport);
+
+ AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
+
+ mc = new MessageContext(engineRegistry, null, null, transportIn,transport);
+ mc.setTransportOut(transport);
mc.setServerSide(true);
OMFactory omFac = OMFactory.newInstance();
mc.setEnvelope(omFac.getDefaultEnvelope());
@@ -99,7 +104,7 @@
new MessageContext(
msgCtx.getGlobalContext().getRegistry(),
msgCtx.getProperties(),
- msgCtx.getSessionContext(),msgCtx.getTransport());
+ msgCtx.getSessionContext(),msgCtx.getTransportIn(),msgCtx.getTransportOut());
newCtx.setEnvelope(msgCtx.getEnvelope());
return newCtx;
}
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/MessageContextTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/MessageContextTest.java Tue Mar 22 05:41:12 2005
@@ -16,11 +16,10 @@
package org.apache.axis.engine;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.AxisGlobal;
import org.apache.axis.om.OMFactory;
-import org.apache.axis.util.Utils;
public class MessageContextTest extends AbstractTestCase {
public MessageContextTest(String testName) {
@@ -29,7 +28,7 @@
public void testMesssageContext() throws AxisFault {
EngineRegistry er = new EngineRegistryImpl(new AxisGlobal());
- MessageContext msgctx = new MessageContext(er, null,null,null);
+ MessageContext msgctx = new MessageContext(er, null,null,null,null);
msgctx.setEnvelope(OMFactory.newInstance().getDefaultEnvelope());
assertNotNull(msgctx.getEnvelope());
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java Tue Mar 22 05:41:12 2005
@@ -53,7 +53,7 @@
super.setUp();
outHandler = new AddressingOutHandler();
testUtil = new TestUtil();
- msgCtxt = new MessageContext(null, null, null, null);
+ msgCtxt = new MessageContext(null, null, null, null,null);
}
public void testAddToSOAPHeader() throws Exception {
Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java Tue Mar 22 05:41:12 2005
@@ -249,7 +249,7 @@
scheduler.schedule(new SchedulerTask(engine, folderName), new DeploymentIterator());
}
- private EngineRegistry createEngineRegistry() {
+ private EngineRegistry createEngineRegistry() throws AxisFault {
EngineRegistry newEngineRegisty;
server = new AxisGlobal();
Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java Tue Mar 22 05:41:12 2005
@@ -20,6 +20,7 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistryImpl;
import org.apache.axis.phaseresolver.PhaseException;
+import org.apache.axis.transport.TransportReceiver;
import org.apache.axis.transport.TransportSender;
import javax.xml.namespace.QName;
@@ -128,7 +129,7 @@
dpengine.getEngineRegistry().addTransportOut(transportout);
} else if (TRANSPORTRECEIVER.equals(ST)) {
AxisTransportIn transportin = proccessTrasnsportIN();
- dpengine.getEngineRegistry().addTransport(transportin);
+ dpengine.getEngineRegistry().addTransportIn(transportin);
} else if (TYPEMAPPINGST.equals(ST)) {
throw new UnsupportedOperationException("Type Mappings are not allowed in server.xml");
} else if (MODULEST.equals(ST)) {
@@ -162,9 +163,28 @@
AxisTransportIn transportin = null;
String attname = pullparser.getAttributeLocalName(0);
String attvalue = pullparser.getAttributeValue(0);
- if (ATTNAME.equals(attname)) {
- transportin = new AxisTransportIn(new QName(attvalue));
- }
+
+ int attribCount = pullparser.getAttributeCount();
+ for (int i = 0; i < attribCount; i++) {
+ attname = pullparser.getAttributeLocalName(i);
+ attvalue = pullparser.getAttributeValue(i);
+ if (ATTNAME.equals(attname)) {
+ transportin = new AxisTransportIn(new QName(attvalue));
+ } else if (transportin != null && CLASSNAME.equals(attname)) {
+ Class reciever = null;
+ try {
+ reciever = Class.forName(attvalue, true, Thread.currentThread().getContextClassLoader());
+ TransportReceiver trnsrecievr = (TransportReceiver) reciever.newInstance();
+ transportin.setReciver(trnsrecievr);
+ } catch (ClassNotFoundException e) {
+ throw new DeploymentException(e.getMessage());
+ } catch (IllegalAccessException e) {
+ throw new DeploymentException(e.getMessage());
+ } catch (InstantiationException e) {
+ throw new DeploymentException(e.getMessage());
+ }
+ }
+ }
boolean END_TRANSPORTS = false;
String text = ""; // to store the paramater elemnt
try {
Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/server.xml?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/server.xml Tue Mar 22 05:41:12 2005
@@ -3,16 +3,8 @@
<parameter name="hotupdate" locked="xsd:false">true</parameter>
<transportReceiver name="http">
- <inflow>
- <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
- <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
- </inflow>
</transportReceiver>
<transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
- <outflow>
- <handler name="h1" class="org.apache.axis.deployment.SpeakingHandler"/>
- <handler name="h2" class="org.apache.axis.deployment.SpeakingHandler"/>
- </outflow>
</transportSender>
Modified: webservices/axis/trunk/java/modules/deployment/src/test/org/apache/axis/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/test/org/apache/axis/deployment/TransportDeploymentTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/test/org/apache/axis/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/test/org/apache/axis/deployment/TransportDeploymentTest.java Tue Mar 22 05:41:12 2005
@@ -16,15 +16,14 @@
package org.apache.axis.deployment;
-import org.apache.axis.description.AxisTransport;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.phaseresolver.PhaseException;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
public class TransportDeploymentTest extends AbstractTestCase {
/**
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=158602&r2=158603
==============================================================================
--- 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 Tue Mar 22 05:41:12 2005
@@ -39,7 +39,6 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.context.SimpleSessionContext;
-import org.apache.axis.description.AxisTransport;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
@@ -48,7 +47,6 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.util.Utils;
/**
* Class AxisServlet
@@ -152,7 +150,9 @@
}
MessageContext msgContext = new MessageContext(engineRegistry,
null,
- (SessionContext) sessionContext,Utils.createHTTPTransport(engineRegistry));
+ (SessionContext) sessionContext,
+ engineRegistry.getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+ engineRegistry.getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
String filePart = req.getRequestURL().toString();
msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,
@@ -171,8 +171,6 @@
new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
- AxisTransport httpTransport = new AxisTransport(new QName("http"));
- httpTransport.setSender(new HTTPTransportSender());
msgContext.setProperty(MessageContext.TRANSPORT_WRITER,
new BufferedWriter(res.getWriter()));
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=158602&r2=158603
==============================================================================
--- 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 Tue Mar 22 05:41:12 2005
@@ -23,11 +23,14 @@
import java.net.ServerSocket;
import java.net.Socket;
+import javax.xml.namespace.QName;
+
+import org.apache.axis.Constants;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineRegistryFactory;
-import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -130,9 +133,11 @@
new OutputStreamWriter(socket.getOutputStream());
Reader in =
new InputStreamReader(socket.getInputStream());
+ AxisTransportOut transportOut = engineReg.getTransportOut(new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
- new MessageContext(this.engineReg, null, null,Utils.createHTTPTransport(engineReg));
+ new MessageContext(this.engineReg, null, null,engineReg.getTransportIn(new QName(Constants.TRANSPORT_HTTP)),transportOut);
msgContext.setServerSide(true);
+
out.write(HTTPConstants.HTTP);
out.write(HTTPConstants.OK);
out.write("\n\n".toCharArray());
Modified: webservices/axis/trunk/java/modules/mail/src/java/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/mail/src/java/org/apache/axis/transport/mail/MailWorker.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/mail/src/java/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/mail/src/java/org/apache/axis/transport/mail/MailWorker.java Tue Mar 22 05:41:12 2005
@@ -24,9 +24,11 @@
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
@@ -37,7 +39,6 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.smtp.SMTPClient;
@@ -90,7 +91,9 @@
MessageContext msgContext = null;
// create and initialize a message context
try {
- msgContext = new MessageContext(this.reg, null, null, Utils.createHTTPTransport(this.reg));
+ msgContext = new MessageContext(this.reg, null, null,
+ reg.getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+ reg.getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
} catch (AxisFault af) {
log.error("Error occured while creating the message context", af);
Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Tue Mar 22 05:41:12 2005
@@ -53,6 +53,11 @@
<version>${pom.currentVersion}</version>
</dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis2-mail</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<!-- external JARs -->
<dependency>
<groupId>commons-logging</groupId>
Modified: webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/AsynchronousClient.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/AsynchronousClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/AsynchronousClient.java Tue Mar 22 05:41:12 2005
@@ -33,7 +33,7 @@
public class AsynchronousClient {
- public static void main(String[] args) {
+ public static void main(String[] args) throws AxisFault {
if(2 != args.length ){
System.out.println("Usage <Port> ");
Modified: webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/SynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/SynchronousClient.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/SynchronousClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/java/userguide/sample1/SynchronousClient.java Tue Mar 22 05:41:12 2005
@@ -34,7 +34,7 @@
public class SynchronousClient {
- public static void main(String[] args){
+ public static void main(String[] args) throws AxisFault{
if(2 != args.length ){
System.out.println("Usage <Port> ");
Modified: webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/engine/EchoRawXMLTest.java Tue Mar 22 05:41:12 2005
@@ -96,7 +96,7 @@
reqEnv.getBody().addChild(method);
org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call();
- EndpointReference targetEPR = new EndpointReference(AddressingConstants.WSA_TO, "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis/services/EchoXMLService");
+ EndpointReference targetEPR = new EndpointReference(AddressingConstants.WSA_TO, "http://127.0.0.1:" + (UtilServer.TESTING_PORT-1) + "/axis/services/EchoXMLService");
call.setTo(targetEPR);
SOAPEnvelope resEnv = call.sendReceive(reqEnv);
Modified: webservices/axis/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.xml?view=diff&r1=158602&r2=158603
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis/trunk/java/modules/wsdl/project.xml Tue Mar 22 05:41:12 2005
@@ -62,7 +62,7 @@
<dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
- <version>1.2-RC1</version>
+ <version>1.2-RC3</version>
<properties>
<module>true</module>
</properties>