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/05/25 15:35:36 UTC
svn commit: r178437 - in /webservices/axis/trunk/java/modules:
addressing/test/org/apache/axis/handlers/addressing/
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/deployment/ core/src/org/apache/axis/engine/
core/src/org/apache/axis/receivers/ core/src/org/apache/axis/transport/
core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/
core/src/org/apache/axis/transport/tcp/ core/test/org/apache/axis/context/
core/test/org/apache/axis/engine/ core/test/org/apache/axis/phaserule/
samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
Author: hemapani
Date: Wed May 25 06:35:35 2005
New Revision: 178437
URL: http://svn.apache.org/viewcvs?rev=178437&view=rev
Log:
clean up the client side tranports
Modified:
webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/client.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportListener.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/ContextHireachyTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/OperationContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeAfterTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeWithNoFirstHandlerTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstRulesTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseLastRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaselastTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseFirstTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseLastTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleHandlers.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/SingleHandlerPhaseTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java Wed May 25 06:35:35 2005
@@ -4,17 +4,18 @@
import junit.framework.TestCase;
-import org.apache.axis.addressing.*;
+import org.apache.axis.addressing.AddressingConstants;
+import org.apache.axis.addressing.AnyContentType;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.addressing.MessageInformationHeadersCollection;
+import org.apache.axis.addressing.ServiceName;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.util.XMLComparator;
import org.apache.axis.soap.SOAPEnvelope;
import org.apache.axis.soap.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.description.ServiceDescription;
-import org.apache.wsdl.WSDLConstants;
/**
* Copyright 2001-2004 The Apache Software Foundation.
@@ -108,7 +109,8 @@
RelatesTo relatesTo = new RelatesTo("http://www.relatesTo.org/service/", "TestRelation");
mIHeaders.setRelatesTo(relatesTo);
- msgCtxt = new MessageContext(null, mIHeaders);
+ msgCtxt = new MessageContext(null);
+ msgCtxt.setMessageInformationHeaders(mIHeaders);
msgCtxt.setEnvelope(OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope());
outHandler.invoke(msgCtxt);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Wed May 25 06:35:35 2005
@@ -36,7 +36,7 @@
*/
public class Call extends InOutMEPClient {
private HashMap properties;
-
+
/**
* this is a convenience Class, here the Call will assume a Annoynmous Service.
* @throws AxisFault
@@ -98,16 +98,19 @@
super.invokeNonBlocking(axisConfig, msgctx, callback);
}
-
-
/**
* Assume the values for the ConfigurationContext and ServiceContext to make the NON WSDL cases simple.
* @return ServiceContext that has a ConfigurationContext set in and has assumed values.
* @throws AxisFault
*/
private static ServiceContext assumeServiceContext() throws AxisFault {
- ConfigurationContextFactory efac = new ConfigurationContextFactory();
- ConfigurationContext sysContext = efac.buildClientEngineContext(null);
+ ConfigurationContext sysContext = null;
+ if (ListenerManager.configurationContext == null) {
+ ConfigurationContextFactory efac = new ConfigurationContextFactory();
+ sysContext = efac.buildClientEngineContext(null);
+ }else{
+ sysContext = ListenerManager.configurationContext;
+ }
//create new service
QName assumedServiceName = new QName("AnonnoymousService");
@@ -131,6 +134,6 @@
* @return
*/
public void set(String key, Object value) {
- serviceContext.getEngineContext().setProperty(key,value);
+ serviceContext.getEngineContext().setProperty(key, value);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java Wed May 25 06:35:35 2005
@@ -26,7 +26,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.OperationDescription;
-import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
@@ -36,7 +36,7 @@
public class InOnlyMEPClient extends MEPClient {
protected MessageInformationHeadersCollection messageInformationHeaders;
- protected String senderTransport;
+ protected TransportOutDescription senderTransport;
public InOnlyMEPClient(ServiceContext service) {
@@ -53,9 +53,7 @@
senderTransport = inferTransport(messageInformationHeaders.getTo());
}
- TransportInDescription transportIn =
- syscontext.getAxisConfiguration().getTransportIn(new QName(senderTransport));
- msgctx.setTransportIn(transportIn);
+ msgctx.setTransportOut(senderTransport);
ConfigurationContext sysContext = serviceContext.getEngineContext();
AxisConfiguration registry = sysContext.getAxisConfiguration();
@@ -66,11 +64,10 @@
engine.send(msgctx);
MessageContext response =
- new MessageContext(
+ new MessageContext(msgctx.getSystemContext(),
msgctx.getSessionContext(),
msgctx.getTransportIn(),
- msgctx.getTransportOut(),
- msgctx.getSystemContext());
+ msgctx.getTransportOut());
response.setProperty(
MessageContext.TRANSPORT_READER,
msgctx.getProperty(MessageContext.TRANSPORT_READER));
@@ -139,5 +136,7 @@
public void engageModule(QName name) throws AxisFault{
serviceContext.getEngineContext().getAxisConfiguration().engageModule(name);
}
+
+
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java Wed May 25 06:35:35 2005
@@ -42,6 +42,7 @@
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.soap.SOAPEnvelope;
import org.apache.axis.soap.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.transport.TransportListener;
import org.apache.axis.transport.http.HTTPTransportReceiver;
import org.apache.wsdl.WSDLConstants;
@@ -51,11 +52,12 @@
* MessageContext and the more convients API is provided by the Call
*/
public class InOutMEPClient extends MEPClient {
+ protected TransportListener listener;
/**
* transport that should be used for sending and reciving the message
*/
- protected String senderTransport;
- protected String listenerTransport = Constants.TRANSPORT_HTTP;
+ protected TransportOutDescription senderTransport;
+ protected TransportInDescription listenerTransport;
/**
* Should the two SOAPMessage are sent over same channel over seperate channels.
@@ -131,7 +133,7 @@
}
if (callback.envelope != null) {
MessageContext resMsgctx =
- new MessageContext(serviceContext.getEngineContext(), null, null, null, null);
+ new MessageContext(serviceContext.getEngineContext());
resMsgctx.setEnvelope(callback.envelope);
return resMsgctx;
} else {
@@ -187,11 +189,10 @@
axisop.setMessageReciever(callbackReceiver);
callbackReceiver.addCallback(messageID, callback);
msgctx.setReplyTo(
- ListenerManager.replyToEPR(
+ ListenerManager.replyToEPR(
serviceContext.getServiceConfig().getName().getLocalPart()
+ "/"
- + axisop.getName().getLocalPart(),
- listenerTransport));
+ + axisop.getName().getLocalPart(),listenerTransport.getName().getLocalPart()));
msgctx.setOperationContext(
axisop.findOperationContext(msgctx, serviceContext, false));
msgctx.setServiceContext(serviceContext);
@@ -305,8 +306,6 @@
String listenerTransport,
boolean useSeparateListener)
throws AxisFault {
- this.senderTransport = senderTransport;
- this.listenerTransport = listenerTransport;
if (useSeparateListener
|| (senderTransport.equals(listenerTransport)
@@ -318,7 +317,13 @@
throw new AxisFault("useSeparateListener = false is only supports by the htpp transport set as the sender and receiver");
}
+ this.senderTransport = serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(new QName(senderTransport));
+ this.listenerTransport = serviceContext.getEngineContext().getAxisConfiguration().getTransportIn(new QName(listenerTransport));
+
if (useSeparateListener == true) {
+// listener = this.listenerTransport.getReciever();
+// listener.init(serviceContext.getEngineContext(),this.listenerTransport);
+// listener.start();
ListenerManager.makeSureStarted(listenerTransport, serviceContext.getEngineContext());
}
}
@@ -357,30 +362,15 @@
senderTransport = inferTransport(to);
}
if (listenerTransport == null) {
- listenerTransport = senderTransport;
+ listenerTransport = serviceContext.getEngineContext().getAxisConfiguration().getTransportIn(
+ senderTransport.getName());
}
if (msgctx.getTransportIn() == null) {
- final TransportInDescription transportIn =
- serviceContext.getEngineContext().getAxisConfiguration().getTransportIn(
- new QName(senderTransport));
- if (transportIn != null) {
- msgctx.setTransportIn(transportIn);
- } else {
- throw new AxisFault("Unknown transport " + listenerTransport);
- }
-
+ msgctx.setTransportIn(listenerTransport);
}
if (msgctx.getTransportOut() == null) {
- final TransportOutDescription transportOut =
- serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(
- new QName(listenerTransport));
- if (transportOut != null) {
- msgctx.setTransportOut(transportOut);
- } else {
- throw new AxisFault("Unknown transport " + senderTransport);
- }
-
+ msgctx.setTransportOut(senderTransport);
}
}
@@ -402,5 +392,12 @@
public void engageModule(QName moduleName) throws AxisFault {
serviceContext.getEngineContext().getAxisConfiguration().engageModule(moduleName);
}
+
+ public void close() throws AxisFault{
+// if(listener != null){
+// listener.stop();
+// }
+ ListenerManager.stop(listenerTransport.getName().getLocalPart());
+ }
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java Wed May 25 06:35:35 2005
@@ -19,59 +19,89 @@
import java.io.IOException;
import java.net.ServerSocket;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
-import org.apache.axis.Constants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.TransportInDescription;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.TransportListener;
-import org.apache.axis.transport.http.SimpleHTTPServer;
-import org.apache.axis.transport.tcp.TCPServer;
public class ListenerManager {
- public static TransportListener httpListener;
- public static TransportListener tcpListener;
- public static TransportListener mailListener;
- public static TransportListener jmsListener;
+ public static int port = 6059;
+ public static HashMap listeners = new HashMap();
public static ConfigurationContext configurationContext;
public static final void makeSureStarted(
String transport,
ConfigurationContext configurationContext)
throws AxisFault {
- try {
- ListenerManager.configurationContext = configurationContext;
- if (Constants.TRANSPORT_HTTP.equals(transport) && httpListener == null) {
- httpListener = new SimpleHTTPServer(configurationContext, new ServerSocket(6060));
- httpListener.start();
- } else if (Constants.TRANSPORT_JMS.equals(transport) && jmsListener == null) {
- throw new UnsupportedOperationException();
- } else if (Constants.TRANSPORT_MAIL.equals(transport) && mailListener == null) {
- throw new UnsupportedOperationException();
- } else if (Constants.TRANSPORT_TCP.equals(transport) && tcpListener == null) {
- tcpListener = new TCPServer(7070, configurationContext);
+ if (ListenerManager.configurationContext != null && configurationContext != ListenerManager.configurationContext) {
+ throw new AxisFault("Only One ConfigurationContext Instance we support at the Client Side");
+ }
+
+ ListenerManager.configurationContext = configurationContext;
+ TransportListnerState tsState = (TransportListnerState) listeners.get(transport);
+ if (tsState == null) {
+ TransportInDescription tranportIn =
+ configurationContext.getAxisConfiguration().getTransportIn(new QName(transport));
+ TransportListener listener = tranportIn.getReciever();
+ listener.init(configurationContext, tranportIn);
+ listener.start();
+ tsState = new TransportListnerState(listener);
+ listeners.put(transport,tsState);
+ }
+ tsState.waitingCalls++;
+ }
+
+ public static final void stop(String transport) throws AxisFault {
+ TransportListnerState tsState = (TransportListnerState) listeners.get(transport);
+ if (tsState != null) {
+ tsState.waitingCalls--;
+ if (tsState.waitingCalls == 0) {
+ tsState.listener.stop();
}
- } catch (IOException e) {
- throw new AxisFault(e);
}
}
- public static EndpointReference replyToEPR(String serviceName, String transport) throws AxisFault {
- ListenerManager.configurationContext = configurationContext;
- if (Constants.TRANSPORT_HTTP.equals(transport) && httpListener != null) {
- return httpListener.replyToEPR(serviceName);
- } else if (Constants.TRANSPORT_JMS.equals(transport) && jmsListener != null) {
- return jmsListener.replyToEPR(serviceName);
- } else if (Constants.TRANSPORT_MAIL.equals(transport) && mailListener != null) {
- return mailListener.replyToEPR(serviceName);
- } else if (Constants.TRANSPORT_TCP.equals(transport) && tcpListener != null) {
- return tcpListener.replyToEPR(serviceName);
- }
- throw new AxisFault(
- "Calling method before starting the with makeSureStarted(..) Listener transport = "
- + transport);
+ public static EndpointReference replyToEPR(String serviceName, String transport)
+ throws AxisFault {
+ TransportListnerState tsState = (TransportListnerState) listeners.get(transport);
+ if (tsState != null) {
+ return tsState.listener.replyToEPR(serviceName);
+ } else {
+ throw new AxisFault(
+ "Calling method before starting the with makeSureStarted(..) Listener transport = "
+ + transport);
+
+ }
+
+ }
+
+ public int getPort() {
+ port++;
+ return port;
+ }
+ public static class TransportListnerState {
+ public TransportListnerState(TransportListener listener) {
+ this.listener = listener;
+ }
+ public int waitingCalls = 0;
+ public TransportListener listener;
+ }
+
+ public static ServerSocket openSocket(int port) throws AxisFault {
+ for (int i = 0; i < 5; i++) {
+ try {
+ return new ServerSocket(port + i);
+ } catch (IOException e) {
+ }
+ }
+ throw new AxisFault("failed to open the scoket");
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java Wed May 25 06:35:35 2005
@@ -17,10 +17,14 @@
*/
package org.apache.axis.clientapi;
+import javax.xml.namespace.QName;
+
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.OMElement;
@@ -59,7 +63,7 @@
protected MessageContext prepareTheSystem(OMElement toSend) throws AxisFault {
MessageContext msgctx =
- new MessageContext(null, null, null, serviceContext.getEngineContext());
+ new MessageContext(serviceContext.getEngineContext());
SOAPEnvelope envelope = null;
SOAPFactory omfac = OMAbstractFactory.getSOAP11Factory();
@@ -69,7 +73,7 @@
return msgctx;
}
- public String inferTransport(EndpointReference epr) {
+ public TransportOutDescription inferTransport(EndpointReference epr) throws AxisFault {
String transport = null;
if (epr != null) {
String toURL = epr.getAddress();
@@ -78,7 +82,9 @@
transport = toURL.substring(0, index);
}
}
- return transport;
+ return serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(
+ new QName(transport));
+
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java Wed May 25 06:35:35 2005
@@ -104,7 +104,7 @@
* get the message context
*/
protected MessageContext getMessageContext() throws AxisFault {
- return new MessageContext(null,null,null,_configurationContext);
+ return new MessageContext(_configurationContext);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java Wed May 25 06:35:35 2005
@@ -24,6 +24,7 @@
import org.apache.axis.Constants;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.TransportInDescription;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
@@ -33,7 +34,7 @@
public class TwoChannelBasedSender {
- public static MessageContext send(MessageContext msgctx,String listenerTransport) throws AxisFault{
+ public static MessageContext send(MessageContext msgctx,TransportInDescription transportIn) throws AxisFault{
AxisEngine engine = new AxisEngine(msgctx.getSystemContext());
@@ -41,11 +42,10 @@
engine.send(msgctx);
MessageContext response =
- new MessageContext(
+ new MessageContext(msgctx.getSystemContext(),
msgctx.getSessionContext(),
msgctx.getTransportIn(),
- msgctx.getTransportOut(),
- msgctx.getSystemContext());
+ msgctx.getTransportOut());
response.setProperty(
MessageContext.TRANSPORT_READER,
msgctx.getProperty(MessageContext.TRANSPORT_READER));
@@ -57,11 +57,11 @@
SOAPEnvelope resenvelope = null;
try {
//TODO Fix this we support only the HTTP Sync cases, so we hardcode this
- if (Constants.TRANSPORT_HTTP.equals(listenerTransport)) {
+ if (Constants.TRANSPORT_HTTP.equals(transportIn.getName().getLocalPart())) {
HTTPTransportReceiver receiver = new HTTPTransportReceiver();
resenvelope =
receiver.checkForMessage(response,msgctx.getSystemContext());
- } else if (Constants.TRANSPORT_TCP.equals(listenerTransport)) {
+ } else if (Constants.TRANSPORT_TCP.equals(transportIn.getName().getLocalPart())) {
Reader in = (Reader) response.getProperty(MessageContext.TRANSPORT_READER);
if(in != null){
XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Wed May 25 06:35:35 2005
@@ -115,43 +115,23 @@
public boolean outPutWritten = false;
private String serviceInstanceID;
-
- /**
- * @param configurationContext
- * @param sessionContext
- * @param transportIn
- * @param transportOut
- * @param mepContext
- * @throws AxisFault
- */
- public MessageContext(
- ConfigurationContext engineContext,
- MessageInformationHeadersCollection addressingHeaders)
- throws AxisFault {
- super(null);
- this.messageInformationHeaders = addressingHeaders;
- this.configurationContext = engineContext;
- sessionContext = null;
- }
-
+
/**
- * @param configurationContext
- * @param sessionContext
- * @param transportIn
- * @param transportOut
- * @param mepContext
+ * Conveniance Method, but before call engine.send() or engine.receive() one must send transport in/out
+ * @param engineContext
* @throws AxisFault
*/
+
+ public MessageContext(ConfigurationContext engineContext) throws AxisFault {
+ this(engineContext, null, null, null);
+ }
+
public MessageContext(
ConfigurationContext engineContext,
- SessionContext sessionContext,
TransportInDescription transportIn,
- TransportOutDescription transportOut,
- OperationContext mepContext)
+ TransportOutDescription transportOut)
throws AxisFault {
- this(sessionContext, transportIn, transportOut, engineContext);
- this.operationContext = mepContext;
-
+ this(engineContext, null, transportIn, transportOut);
}
/**
@@ -163,10 +143,10 @@
*/
public MessageContext(
+ ConfigurationContext engineContext,
SessionContext sessionContext,
TransportInDescription transportIn,
- TransportOutDescription transportOut,
- ConfigurationContext engineContext)
+ TransportOutDescription transportOut)
throws AxisFault {
super(null);
@@ -514,9 +494,7 @@
//The context hirachy might not have constructed fully, the check should
//look for the disconnected grandparents
- if (obj == null
- && operationContext == null
- && serviceContext != null) {
+ if (obj == null && operationContext == null && serviceContext != null) {
obj = serviceContext.getProperty(key, persistent);
}
if (obj == null && operationContext == null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/client.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/client.xml?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/client.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/client.xml Wed May 25 06:35:35 2005
@@ -3,11 +3,17 @@
<parameter name="hotupdate" locked="xsd:false">true</parameter>
<messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
- <transportReceiver name="http" >
+
+ <transportReceiver name="http" class="org.apache.axis.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
</transportReceiver>
+
<transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
</transportSender>
- <transportReceiver name="tcp"/>
+
+ <transportReceiver name="tcp" class="org.apache.axis.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
<transportSender name="tcp" class="org.apache.axis.transport.tcp.TCPTransportSender"/>
</client>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Wed May 25 06:35:35 2005
@@ -4,11 +4,17 @@
<messageReceiver mep="INOUT" class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
- <transportReceiver name="http">
+ <transportReceiver name="http" class="org.apache.axis.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
</transportReceiver>
+
<transportSender name="http" class="org.apache.axis.transport.http.HTTPTransportSender">
</transportSender>
- <transportReceiver name="tcp"/>
+
+ <transportReceiver name="tcp" class="org.apache.axis.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="xsd:false">6060</parameter>
+ </transportReceiver>
+
<transportSender name="tcp" class="org.apache.axis.transport.tcp.TCPTransportSender"/>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Wed May 25 06:35:35 2005
@@ -129,11 +129,10 @@
// create a SOAP envelope with the Fault
MessageContext faultContext =
- new MessageContext(
+ new MessageContext(engineContext,
context.getSessionContext(),
context.getTransportIn(),
- context.getTransportOut(),
- engineContext);
+ context.getTransportOut());
if(context.getFaultTo() != null){
faultContext.setFaultTo(context.getFaultTo());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java Wed May 25 06:35:35 2005
@@ -34,11 +34,10 @@
public final void recieve(MessageContext messgeCtx) throws AxisFault {
MessageContext newmsgCtx =
- new MessageContext(
+ new MessageContext(messgeCtx.getSystemContext(),
messgeCtx.getSessionContext(),
messgeCtx.getTransportIn(),
- messgeCtx.getTransportOut(),
- messgeCtx.getSystemContext());
+ messgeCtx.getTransportOut());
newmsgCtx.setMessageInformationHeaders(new MessageInformationHeadersCollection());
MessageInformationHeadersCollection oldMessageInfoHeaders =
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportListener.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportListener.java Wed May 25 06:35:35 2005
@@ -15,15 +15,21 @@
*/
package org.apache.axis.transport;
-
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.description.TransportInDescription;
import org.apache.axis.engine.AxisFault;
/**
* Class TransportListener
*/
-public abstract class TransportListener{
- public abstract void start()throws AxisFault;
- public abstract void stop()throws AxisFault;
- public abstract EndpointReference replyToEPR(String serviceName)throws AxisFault ;
+public abstract class TransportListener {
+ public static final String PARAM_PORT = "port";
+
+ public abstract void init(ConfigurationContext axisConf, TransportInDescription transprtIn)
+ throws AxisFault;
+ public abstract void start() throws AxisFault;
+ public abstract void stop() throws AxisFault;
+ public abstract EndpointReference replyToEPR(String serviceName) throws AxisFault;
+
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Wed May 25 06:35:35 2005
@@ -40,8 +40,6 @@
import org.apache.axis.context.ConfigurationContextFactory;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
-import org.apache.axis.description.Parameter;
-import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
@@ -155,13 +153,12 @@
sessionContext);
}
MessageContext msgContext =
- new MessageContext(
+ new MessageContext(engineContext,
(SessionContext) sessionContext,
engineContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
engineContext.getAxisConfiguration().getTransportOut(
- new QName(Constants.TRANSPORT_HTTP)),
- engineContext);
+ new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
String filePart = req.getRequestURL().toString();
msgContext.setTo(
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Wed May 25 06:35:35 2005
@@ -28,9 +28,12 @@
import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.clientapi.ListenerManager;
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.ConfigurationContextFactory;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.TransportInDescription;
import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
@@ -47,7 +50,7 @@
* not use multiple instances of this class in the same JVM/classloader unless
* you want bad things to happen at shutdown.
*/
-public class SimpleHTTPServer extends TransportListener implements Runnable{
+public class SimpleHTTPServer extends TransportListener implements Runnable {
/**
* Field log
*/
@@ -74,6 +77,9 @@
*/
private boolean stopped = false;
+ public SimpleHTTPServer() {
+ }
+
/**
* Constructor SimpleHTTPServer
*
@@ -93,7 +99,7 @@
public SimpleHTTPServer(String dir, ServerSocket serverSoc) throws AxisFault {
try {
this.serverSocket = serverSoc;
- // Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
+ // Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
ConfigurationContextFactory erfac = new ConfigurationContextFactory();
this.configurationContext = erfac.buildEngineContext(dir);
Thread.sleep(2000);
@@ -140,11 +146,10 @@
new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
new MessageContext(
- null,
+ configurationContext,
configurationContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
- transportOut,
- configurationContext);
+ transportOut);
msgContext.setServerSide(true);
// We do not have any Addressing Headers to put
@@ -152,8 +157,9 @@
msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
HTTPTransportReceiver reciver = new HTTPTransportReceiver();
- msgContext.setEnvelope(reciver.checkForMessage(msgContext, configurationContext));
-
+ msgContext.setEnvelope(
+ reciver.checkForMessage(msgContext, configurationContext));
+
AxisEngine engine = new AxisEngine(configurationContext);
engine.receive(msgContext);
@@ -292,6 +298,15 @@
return new EndpointReference(
AddressingConstants.WSA_REPLY_TO,
"http://127.0.0.1:" + (serverSocket.getLocalPort()) + "/axis/services/" + serviceName);
+ }
+
+ public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault {
+ this.configurationContext = axisConf;
+ Parameter param = transprtIn.getParameter(PARAM_PORT);
+ if(param!= null){
+ int port = Integer.parseInt((String)param.getValue());
+ serverSocket = ListenerManager.openSocket(port);
+ }
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Wed May 25 06:35:35 2005
@@ -76,10 +76,9 @@
try {
msgContext =
new MessageContext(
- null,
+ reg,
reg.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL)),
- reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)),
- reg);
+ reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)));
msgContext.setServerSide(true);
msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java Wed May 25 06:35:35 2005
@@ -30,10 +30,13 @@
import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.clientapi.ListenerManager;
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.ConfigurationContextFactory;
import org.apache.axis.context.MessageContext;
import org.apache.axis.deployment.DeploymentException;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.TransportInDescription;
import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
@@ -82,7 +85,7 @@
while (started) {
Socket socket = null;
try {
-
+
try {
socket = serversocket.accept();
} catch (java.io.InterruptedIOException iie) {
@@ -90,7 +93,7 @@
log.debug(e);
break;
}
-
+
Writer out = new OutputStreamWriter(socket.getOutputStream());
Reader in = new InputStreamReader(socket.getInputStream());
TransportOutDescription transportOut =
@@ -98,18 +101,18 @@
new QName(Constants.TRANSPORT_TCP));
MessageContext msgContext =
new MessageContext(
- null,
+ configContext,
configContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_TCP)),
- transportOut,
- configContext);
+ transportOut);
msgContext.setServerSide(true);
msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
-
+
AxisEngine engine = new AxisEngine(configContext);
try {
- XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
+ XMLStreamReader xmlreader =
+ XMLInputFactory.newInstance().createXMLStreamReader(in);
StAXBuilder builder = new StAXSOAPModelBuilder(xmlreader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
} catch (Exception e) {
@@ -119,21 +122,21 @@
} catch (Throwable e) {
log.error(e);
e.printStackTrace();
- } finally{
- try {
- if(socket != null){
- socket.close();
- if(!started){
- serversocket.close();
- }
- }
+ } finally {
+ try {
+ if (socket != null) {
+ socket.close();
+ if (!started) {
+ serversocket.close();
+ }
+ }
} catch (IOException e1) {
- log.error(e1);
+ log.error(e1);
}
}
}
-
+
}
public synchronized void start() {
@@ -147,8 +150,8 @@
*/
public EndpointReference replyToEPR(String serviceName) throws AxisFault {
return new EndpointReference(
- AddressingConstants.WSA_REPLY_TO,
- "http://127.0.0.1:" + (serversocket.getLocalPort()) + "/axis/services/" + serviceName);
+ AddressingConstants.WSA_REPLY_TO,
+ "http://127.0.0.1:" + (serversocket.getLocalPort()) + "/axis/services/" + serviceName);
}
/* (non-Javadoc)
@@ -156,11 +159,22 @@
*/
public void stop() throws AxisFault {
try {
- this.serversocket.close();
+ this.serversocket.close();
started = false;
} catch (IOException e) {
throw new AxisFault(e);
}
+ }
+
+ public void init(ConfigurationContext axisConf, TransportInDescription transprtIn)
+ throws AxisFault {
+ this.configContext = axisConf;
+ Parameter param = transprtIn.getParameter(PARAM_PORT);
+ if (param != null) {
+ int port = Integer.parseInt((String) param.getValue());
+ serversocket = ListenerManager.openSocket(port);
+ }
+
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/ContextHireachyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/ContextHireachyTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/ContextHireachyTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/ContextHireachyTest.java Wed May 25 06:35:35 2005
@@ -56,7 +56,7 @@
configurationContext.createServiceContext(
serviceDescription.getName());
MessageContext msgctx =
- new MessageContext(null, null, null, configurationContext);
+ new MessageContext(configurationContext);
OperationContext opContext =
operationDescription.findOperationContext(
msgctx,
@@ -91,7 +91,7 @@
new ConfigurationContext(axisConfiguration);
MessageContext msgctx =
- new MessageContext(null, null, null, configurationContext);
+ new MessageContext(configurationContext);
//test the complte Hisracy built
assertEquals(msgctx.getParent(), null);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/OperationContextTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/OperationContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/OperationContextTest.java Wed May 25 06:35:35 2005
@@ -56,7 +56,7 @@
public MessageContext getBasicMessageContext() throws AxisFault{
- return new MessageContext(null,new TransportInDescription(new QName("axis")), new TransportOutDescription(new QName("axis")),engineCtx);
+ return new MessageContext(engineCtx,new TransportInDescription(new QName("axis")), new TransportOutDescription(new QName("axis")));
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java Wed May 25 06:35:35 2005
@@ -73,7 +73,7 @@
});
service.addOperation(axisOp);
- mc = new MessageContext(null, transportIn, transportOut, engineContext);
+ mc = new MessageContext(engineContext, transportIn, transportOut);
mc.setTransportOut(transportOut);
mc.setServerSide(true);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java Wed May 25 06:35:35 2005
@@ -79,10 +79,10 @@
mc =
new MessageContext(engineContext,
- null,
transportIn,
- transport,
- OperationContextFactory.createMEPContext(WSDLConstants.MEP_CONSTANT_IN_OUT, false, axisOp, serviceContext));
+ transport);
+
+ mc.setOperationContext(OperationContextFactory.createMEPContext(WSDLConstants.MEP_CONSTANT_IN_OUT, false, axisOp, serviceContext));
mc.setTransportOut(transport);
mc.setProperty(MessageContext.TRANSPORT_WRITER, new OutputStreamWriter(System.out));
mc.setServerSide(true);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java Wed May 25 06:35:35 2005
@@ -35,7 +35,7 @@
ConfigurationContext engineContext = new ConfigurationContext(er);
- MessageContext msgctx = new MessageContext(null, null, null, engineContext);
+ MessageContext msgctx = new MessageContext(engineContext);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeAfterTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeAfterTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeAfterTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeAfterTest.java Wed May 25 06:35:35 2005
@@ -1,7 +1,11 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
+
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
@@ -12,9 +16,6 @@
import org.apache.axis.engine.Phase;
import org.apache.axis.phaseresolver.PhaseHolder;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -48,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeTest.java Wed May 25 06:35:35 2005
@@ -1,19 +1,20 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.context.MessageContext;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -47,8 +48,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeWithNoFirstHandlerTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/BeforeWithNoFirstHandlerTest.java Wed May 25 06:35:35 2005
@@ -1,19 +1,20 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.context.MessageContext;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -46,8 +47,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstRulesTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstRulesTest.java Wed May 25 06:35:35 2005
@@ -1,19 +1,20 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.context.MessageContext;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -48,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseFirstTest.java Wed May 25 06:35:35 2005
@@ -1,21 +1,21 @@
package org.apache.axis.phaserule;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
-import org.apache.axis.description.HandlerDescription;
-import org.apache.axis.description.PhaseRule;
+import java.util.ArrayList;
import javax.xml.namespace.QName;
-import java.util.ArrayList;
import junit.framework.TestCase;
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.HandlerDescription;
+import org.apache.axis.description.PhaseRule;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -49,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseLastRuleTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseLastRuleTest.java Wed May 25 06:35:35 2005
@@ -1,21 +1,20 @@
package org.apache.axis.phaserule;
-import junit.framework.TestCase;
-
import java.util.ArrayList;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.context.MessageContext;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -50,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java Wed May 25 06:35:35 2005
@@ -1,15 +1,16 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.phaseresolver.PhaseHolder;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaselastTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaselastTest.java Wed May 25 06:35:35 2005
@@ -1,21 +1,20 @@
package org.apache.axis.phaserule;
-import junit.framework.TestCase;
-
import java.util.ArrayList;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.context.MessageContext;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -50,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseFirstTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseFirstTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseFirstTest.java Wed May 25 06:35:35 2005
@@ -1,7 +1,11 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
+
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
@@ -12,9 +16,6 @@
import org.apache.axis.engine.Phase;
import org.apache.axis.phaseresolver.PhaseHolder;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -47,8 +48,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseLastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseLastTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseLastTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseLastTest.java Wed May 25 06:35:35 2005
@@ -1,19 +1,20 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Handler;
-import org.apache.axis.context.MessageContext;
+
import org.apache.axis.context.ConfigurationContext;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.phaseresolver.PhaseHolder;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -47,8 +48,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleHandlers.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleHandlers.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleHandlers.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleHandlers.java Wed May 25 06:35:35 2005
@@ -1,13 +1,13 @@
package org.apache.axis.phaserule;
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java Wed May 25 06:35:35 2005
@@ -1,15 +1,16 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.phaseresolver.PhaseHolder;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.phaseresolver.PhaseHolder;
/**
* Created by IntelliJ IDEA.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java Wed May 25 06:35:35 2005
@@ -1,15 +1,16 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.phaseresolver.PhaseHolder;
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.phaseresolver.PhaseHolder;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/SingleHandlerPhaseTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/SingleHandlerPhaseTest.java Wed May 25 06:35:35 2005
@@ -1,7 +1,11 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
+
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerDescription;
@@ -12,9 +16,6 @@
import org.apache.axis.engine.Phase;
import org.apache.axis.phaseresolver.PhaseHolder;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -48,8 +49,7 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()),
- new MessageInformationHeadersCollection());
+ MessageContext msg = new MessageContext(new ConfigurationContext(new AxisConfigurationImpl()));
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java Wed May 25 06:35:35 2005
@@ -126,5 +126,7 @@
result.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
}
+
+
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java Wed May 25 06:35:35 2005
@@ -122,39 +122,40 @@
org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call(serviceContext);
// call.engageModule(new QName(Constants.MODULE_ADDRESSING));
- call.setTo(targetEPR);
- call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, true);
- Callback callback = new Callback() {
- public void onComplete(AsyncResult result) {
- try {
- result.getResponseEnvelope().serialize(
- XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
- } catch (XMLStreamException e) {
- reportError(e);
- } finally {
- finish = true;
+ try {
+ call.setTo(targetEPR);
+ call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, true);
+ Callback callback = new Callback() {
+ public void onComplete(AsyncResult result) {
+ try {
+ result.getResponseEnvelope().serialize(
+ XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
+ } catch (XMLStreamException e) {
+ reportError(e);
+ } finally {
+ finish = true;
+ }
}
- }
- public void reportError(Exception e) {
- e.printStackTrace();
- finish = true;
- }
- };
+ public void reportError(Exception e) {
+ e.printStackTrace();
+ finish = true;
+ }
+ };
- call.invokeNonBlocking(operationName.getLocalPart(), method, callback);
- int index = 0;
- while (!finish) {
- Thread.sleep(1000);
- index++;
- if (index > 10) {
- throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ call.invokeNonBlocking(operationName.getLocalPart(), method, callback);
+ int index = 0;
+ while (!finish) {
+ Thread.sleep(1000);
+ index++;
+ if (index > 10) {
+ throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ }
}
+ log.info("send the reqest");
+ } finally {
+ call.close();
}
- log.info("send the reqest");
-
}
-
-
-}
+ }
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=178437&r1=178436&r2=178437&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Wed May 25 06:35:35 2005
@@ -29,7 +29,6 @@
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.description.ModuleDescription;
import org.apache.axis.description.ServiceDescription;
-import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.http.SimpleHTTPServer;
import org.apache.axis.util.Utils;
@@ -40,7 +39,7 @@
public static final int TESTING_PORT = 5555;
public static final String FAILURE_MESSAGE = "Intentional Faliure";
public static final String TESTING_REPOSITORY = "target/test-resources/samples";
- //public static final String TESTING_REPOSITORY = "modules/samples/target/test-resources/samples";
+ // public static final String TESTING_REPOSITORY = "modules/samples/target/test-resources/samples";
public static synchronized void deployService(ServiceDescription service) throws AxisFault {
reciver.getSystemContext().getAxisConfiguration().addService(service);