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/05 09:14:30 UTC
svn commit: r168291 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/context/ core/src/org/apache/axis/engine/
core/src/org/apache/axis/handlers/addressing/
core/src/org/apache/axis/receivers/
core/src/org/apache/axis/transport/mail/ core/test/org/apache/axis/engine/
samples/src/interop/doclit/
Author: hemapani
Date: Thu May 5 00:14:29 2005
New Revision: 168291
URL: http://svn.apache.org/viewcvs?rev=168291&view=rev
Log:
remove the Service Context
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/AbstractContext.java Thu May 5 00:14:29 2005
@@ -24,7 +24,7 @@
protected transient final HashMap nonPersistentMap;
protected final HashMap persistentMap;
- private final AbstractContext parent;
+ protected final AbstractContext parent;
protected AbstractContext(AbstractContext parent) {
this.persistentMap = new HashMap();
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=168291&r1=168290&r2=168291&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 Thu May 5 00:14:29 2005
@@ -35,7 +35,7 @@
* Service states kept in the <code>MessageContext</code>. Other runtime
* artifacts does not keep states foward from the execution.
*/
-public class MessageContext {
+public class MessageContext extends AbstractContext {
/**
* Field TRANSPORT_WRITER
*/
@@ -69,11 +69,11 @@
private final ExecutionChain chain;
- private ServiceContext serviceContext;
+ // private ServiceContext serviceContext;
private AxisOperation operationConfig;
- private OperationContext mepContext;
+ private OperationContext operationContext;
private AxisTransportIn transportIn;
@@ -134,7 +134,7 @@
oldMessageContext.getSessionContext(),
oldMessageContext.getTransportIn(),
oldMessageContext.getTransportOut(),
- oldMessageContext.getMepContext());
+ oldMessageContext.getOperationContext());
this.messageInformationHeaders = new MessageInformationHeadersCollection();
MessageInformationHeadersCollection oldMessageInfoHeaders =
@@ -145,8 +145,6 @@
messageInformationHeaders.setRelatesTo(new RelatesTo(oldMessageInfoHeaders.getMessageId()));
this.serverSide = oldMessageContext.isServerSide();
- this.serviceContext = oldMessageContext.getServiceContext();
-
}
/**
@@ -164,7 +162,7 @@
OperationContext mepContext)
throws AxisFault {
this(engineContext, initialProperties, sessionContext, transportIn, transportOut);
- this.mepContext = mepContext;
+ this.operationContext = mepContext;
}
@@ -175,6 +173,7 @@
AxisTransportIn transportIn,
AxisTransportOut transportOut)
throws AxisFault {
+ super(null);
this.engineContext = engineContext;
if (sessionContext == null) {
this.sessionContext = new SimpleSessionContext();
@@ -482,13 +481,6 @@
}
/**
- * @return
- */
- public ServiceContext getServiceContext() {
- return serviceContext;
- }
-
- /**
* @param context
*/
public void setOperationConfig(AxisOperation context) {
@@ -496,24 +488,17 @@
}
/**
- * @param context
- */
- public void setServiceContext(ServiceContext context) {
- serviceContext = context;
- }
-
- /**
* @return
*/
- public OperationContext getMepContext() {
- return mepContext;
+ public OperationContext getOperationContext() {
+ return operationContext;
}
/**
* @param context
*/
public void setMepContext(OperationContext context) {
- mepContext = context;
+ operationContext = context;
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java Thu May 5 00:14:29 2005
@@ -150,4 +150,7 @@
return false;
}
+ public ServiceContext getServiceContext(){
+ return (ServiceContext)super.parent;
+ }
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Thu May 5 00:14:29 2005
@@ -50,46 +50,46 @@
* @throws AxisFault
*/
public void invoke(MessageContext msgctx) throws AxisFault {
- if (msgctx.getServiceContext() == null) {
- EndpointReference toEPR = msgctx.getTo();
- QName serviceName = new QName(toEPR.getAddress());
- AxisService service =
- msgctx.getEngineContext().getEngineConfig().getService(serviceName);
-
- if (service != null) {
- EngineContext engineContext = msgctx.getEngineContext();
- ServiceContext serviceContext = engineContext.getService(service.getName());
- if (serviceContext == null) {
- serviceContext = new ServiceContext(service,engineContext);
- }
- msgctx.setServiceContext(serviceContext);
- // let add the Handlers
- ExecutionChain chain = msgctx.getExecutionChain();
- chain.addPhases(serviceContext.getPhases(EngineConfiguration.INFLOW));
-
- } else {
- throw new AxisFault("No service found under the " + toEPR.getAddress());
- }
-
- }
-
- if (msgctx.getoperationConfig() == null) {
- AxisService service = msgctx.getServiceContext().getServiceConfig();
- String action = (String) msgctx.getWSAAction();
- if (action != null) {
- QName operationName = new QName(action);
- AxisOperation op = service.getOperation(operationName);
- if (op != null) {
- msgctx.setOperationConfig(op);
- } else{
- throw new AxisFault("No Operation named "+ operationName + " Not found" );
- }
- //if no operation found let it go, this is for a handler may be. e.g. Create Sequance in RM
- } else {
- throw new AxisFault("Operation not found, WSA Action is Null");
- }
-
- }
+// if (msgctx.getServiceContext() == null) {
+// EndpointReference toEPR = msgctx.getTo();
+// QName serviceName = new QName(toEPR.getAddress());
+// AxisService service =
+// msgctx.getEngineContext().getEngineConfig().getService(serviceName);
+//
+// if (service != null) {
+// EngineContext engineContext = msgctx.getEngineContext();
+// ServiceContext serviceContext = engineContext.getService(service.getName());
+// if (serviceContext == null) {
+// serviceContext = new ServiceContext(service,engineContext);
+// }
+// msgctx.setServiceContext(serviceContext);
+// // let add the Handlers
+// ExecutionChain chain = msgctx.getExecutionChain();
+// chain.addPhases(serviceContext.getPhases(EngineConfiguration.INFLOW));
+//
+// } else {
+// throw new AxisFault("No service found under the " + toEPR.getAddress());
+// }
+//
+// }
+//
+// if (msgctx.getoperationConfig() == null) {
+// AxisService service = msgctx.getServiceContext().getServiceConfig();
+// String action = (String) msgctx.getWSAAction();
+// if (action != null) {
+// QName operationName = new QName(action);
+// AxisOperation op = service.getOperation(operationName);
+// if (op != null) {
+// msgctx.setOperationConfig(op);
+// } else{
+// throw new AxisFault("No Operation named "+ operationName + " Not found" );
+// }
+// //if no operation found let it go, this is for a handler may be. e.g. Create Sequance in RM
+// } else {
+// throw new AxisFault("Operation not found, WSA Action is Null");
+// }
+//
+// }
}
}
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=168291&r1=168290&r2=168291&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 Thu May 5 00:14:29 2005
@@ -61,13 +61,13 @@
*/
public void send(MessageContext context) throws AxisFault {
try {
- if(context.getMepContext() == null){
+ if(context.getOperationContext() == null){
throw new AxisFault("Out flow must have a MEPContext set on the MessageContext");
}
ExecutionChain chain = context.getExecutionChain();
- ServiceContext serviceContext = context.getServiceContext();
+ ServiceContext serviceContext = context.getOperationContext().getServiceContext();;
/*
* There is a two cases, at the server side(response) / client side
@@ -211,7 +211,7 @@
context.getProperties(),
context.getSessionContext(),
context.getTransportIn(),
- context.getTransportOut(),context.getMepContext());
+ context.getTransportOut(),context.getOperationContext());
faultContext.setProcessingFault(true);
faultContext.setServerSide(true);
SOAPEnvelope envelope =
@@ -225,7 +225,7 @@
ExecutionChain chain = faultContext.getExecutionChain();
- ServiceContext serviceContext = context.getServiceContext();
+ ServiceContext serviceContext = context.getOperationContext().getServiceContext();
if (serviceContext != null) {
chain.addPhases(
serviceContext.getPhases(
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java Thu May 5 00:14:29 2005
@@ -54,50 +54,52 @@
final String URI_ID_STRING = "/services";
if (msgctx.isServerSide()) {
- EndpointReference toEPR = msgctx.getTo();
- String filePart = toEPR.getAddress();
-
- int index = filePart.lastIndexOf(URI_ID_STRING);
- String serviceStr = null;
- if (index > 0) {
- serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
-
- EngineContext engineContext = msgctx.getEngineContext();
-
- QName serviceName = null;
- QName operatoinName = null;
-
- if ((index = serviceStr.indexOf('/')) > 0) {
- serviceName = new QName(serviceStr.substring(0, index));
- operatoinName = new QName(serviceStr.substring(index + 1));
- } else {
- serviceName = new QName(serviceStr);
- }
-
- ServiceContext serviceContext = engineContext.getService(serviceName);
- if (serviceContext == null) {
- EngineConfiguration registry = msgctx.getEngineContext().getEngineConfig();
- service = registry.getService(serviceName);
- if (service != null) {
- serviceContext = new ServiceContext(service,engineContext);
- }
- }
- if (serviceContext != null) {
- if (operatoinName != null) {
- AxisOperation axisOp =
- serviceContext.getServiceConfig().getOperation(operatoinName);
- if(axisOp != null){
- msgctx.setOperationConfig(axisOp);
- }
- //if no operation found let it go, this is for a handler may be. e.g. Create Sequance in RM
- }
-
- msgctx.setServiceContext(serviceContext);
- }
+// EndpointReference toEPR = msgctx.getTo();
+// String filePart = toEPR.getAddress();
+//
+// int index = filePart.lastIndexOf(URI_ID_STRING);
+// String serviceStr = null;
+// if (index > 0) {
+// serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
+//
+// EngineContext engineContext = msgctx.getEngineContext();
+//
+// QName serviceName = null;
+// QName operatoinName = null;
+//
+// if ((index = serviceStr.indexOf('/')) > 0) {
+// serviceName = new QName(serviceStr.substring(0, index));
+// operatoinName = new QName(serviceStr.substring(index + 1));
+// } else {
+// serviceName = new QName(serviceStr);
+// }
+//
+// ServiceContext serviceContext = engineContext.getService(serviceName);
+// if (serviceContext == null) {
+// EngineConfiguration registry = msgctx.getEngineContext().getEngineConfig();
+// service = registry.getService(serviceName);
+// if (service != null) {
+// serviceContext = new ServiceContext(service,engineContext);
+// }
+// }
+// if (serviceContext != null) {
+// if (operatoinName != null) {
+// AxisOperation axisOp =
+// serviceContext.getServiceConfig().getOperation(operatoinName);
+// if(axisOp != null){
+// msgctx.setOperationConfig(axisOp);
+// }
+// //if no operation found let it go, this is for a handler may be. e.g. Create Sequance in RM
+// }
+//
+// msgctx.setServiceContext(serviceContext);
+// }
+//
+ throw new UnsupportedOperationException();
}
- } else {
- // TODO client side service Dispatch ,, What this really mean?
- }
+// } else {
+// // TODO client side service Dispatch ,, What this really mean?
+// }
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java Thu May 5 00:14:29 2005
@@ -43,7 +43,7 @@
msgContext.setMepContext(axisOp.findMEPContext(msgContext,msgContext.isServerSide()));
}
- ServiceContext serviceContext = msgContext.getServiceContext();
+ ServiceContext serviceContext = msgContext.getOperationContext().getServiceContext();
if (serviceContext != null) {
// let add the Handlers
ExecutionChain chain = msgContext.getExecutionChain();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java Thu May 5 00:14:29 2005
@@ -60,7 +60,7 @@
return;
}
- MessageContext lastInMessageContext = msgContext.getMepContext().getLastInMessageContext();
+ MessageContext lastInMessageContext = msgContext.getOperationContext().getLastInMessageContext();
MessageInformationHeadersCollection messageInformationHeaders =
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java Thu May 5 00:14:29 2005
@@ -39,7 +39,7 @@
*/
protected Object makeNewServiceObject(MessageContext msgContext) throws AxisFault {
try {
- AxisService service = msgContext.getServiceContext().getServiceConfig();
+ AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
ClassLoader classLoader = service.getClassLoader();
Parameter implInfoParam = service.getParameter(SERVICE_CLASS);
if(implInfoParam != null){
@@ -62,7 +62,7 @@
* @throws AxisFault
*/
protected Object getTheImplementationObject(MessageContext msgContext) throws AxisFault {
- AxisService service = msgContext.getServiceContext().getServiceConfig();
+ AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
Parameter scopeParam = service.getParameter(SCOPE);
String scope = Constants.MESSAGE_SCOPE;
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=168291&r1=168290&r2=168291&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 Thu May 5 00:14:29 2005
@@ -110,10 +110,7 @@
// prepare request (do as much as possible while waiting for the
// next connection).
- try {
- msgContext.setServiceContext(null);
- } catch (Exception e) {
- }
+
//msgContext.setResponseMessage(null);
//msgContext.reset();
// msgContext.setTransport(new AxisTransport(transportName)); There is
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=168291&r1=168290&r2=168291&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 Thu May 5 00:14:29 2005
@@ -87,14 +87,15 @@
public void testServerSend() throws Exception {
AxisEngine engine = new AxisEngine();
mc.setServerSide(true);
- mc.setServiceContext(new ServiceContext(service, engineContext));
+ fail();
+ //TODO mc.setServiceContext(new ServiceContext(service, engineContext));
engine.send(mc);
}
public void testClientSend() throws Exception {
AxisEngine engine = new AxisEngine();
- mc.setServerSide(false);
- mc.setServiceContext(new ServiceContext(service,engineContext));
+ mc.setServerSide(false); fail();
+ //TODO mc.setServiceContext(new ServiceContext(service,engineContext));
engine.send(mc);
}
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java?rev=168291&r1=168290&r2=168291&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java Thu May 5 00:14:29 2005
@@ -79,7 +79,7 @@
public MessageContext invokeBusinessLogic(MessageContext msgContext) throws AxisFault{
try {
- if (WSDLService.STYLE_DOC.equals(msgContext.getMessageStyle())) {
+ if (WSDLService.STYLE_DOC.equals(msgContext.getoperationConfig().getStyle())) {
SOAPBody body = msgContext.getEnvelope().getBody();
XMLStreamReader xpp = body.getXMLStreamReader();
@@ -110,7 +110,7 @@
}
- AxisService service = msgContext.getServiceContext().getServiceConfig();
+ AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
if (operationName != null) {
AxisOperation op = service.getOperation(operationName);
if (op != null) {