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 07:42:25 UTC
svn commit: r168277 - in /webservices/axis/trunk/java/modules/core:
src/org/apache/axis/clientapi/ src/org/apache/axis/context/
test/org/apache/axis/engine/ test/org/apache/axis/handlers/addressing/
Author: hemapani
Date: Wed May 4 22:42:25 2005
New Revision: 168277
URL: http://svn.apache.org/viewcvs?rev=168277&view=rev
Log:
refactor to remove the BasicOperationContext.java
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.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/handlers/addressing/AddressingOutHandlerTest.java
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=168277&r1=168276&r2=168277&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 4 22:42:25 2005
@@ -9,9 +9,9 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
-import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisOperation;
@@ -26,6 +26,7 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.transport.TransportReceiver;
import org.apache.axis.transport.TransportSender;
+import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLDescription;
/**
@@ -195,7 +196,7 @@
null,
transportIn,
transportOut,
- new BasicOperationContext(axisOperation, null));
+ OperationContextFactory.createMEP(WSDLConstants.MEP_URI_IN_OUT,false,axisOperation, null));
msgctx.setEnvelope(env);
msgctx.setMessageInformationHeaders(messageInfoHeaders);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java?rev=168277&r1=168276&r2=168277&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContextFactory.java Wed May 4 22:42:25 2005
@@ -25,7 +25,7 @@
public static OperationContext createMEP(String mepURI,boolean serverSide,AxisOperation axisOp,ServiceContext serviceContext) throws AxisFault{
if(MEP_URI_IN_ONLY.equals(mepURI) || MEP_URI_IN_OUT.equals(mepURI)){
- return new BasicOperationContext(axisOp,serviceContext);
+ return new OperationContext(axisOp,serviceContext);
}else{
throw new AxisFault("Cannot handle the MEP "
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=168277&r1=168276&r2=168277&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 4 22:42:25 2005
@@ -22,9 +22,9 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisOperation;
@@ -34,6 +34,7 @@
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.SOAPFactory;
+import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLService;
public class EnginePausingTest extends AbstractEngineTest {
@@ -59,7 +60,7 @@
AxisOperation axisOp = new AxisOperation(operationName);
- mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicOperationContext(axisOp,null));
+ mc = new MessageContext(engineContext, null, null, transportIn,transportOut,OperationContextFactory.createMEP(WSDLConstants.MEP_URI_IN_OUT,false,axisOp,null));
mc.setTransportOut(transportOut);
mc.setServerSide(true);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
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=168277&r1=168276&r2=168277&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 4 22:42:25 2005
@@ -22,9 +22,9 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisOperation;
@@ -33,6 +33,7 @@
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.SOAPFactory;
+import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLService;
public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
@@ -67,7 +68,7 @@
null,
transportIn,
transport,
- new BasicOperationContext(axisOp, null));
+ OperationContextFactory.createMEP(WSDLConstants.MEP_URI_IN_OUT,false,axisOp, null));
mc.setTransportOut(transport);
mc.setServerSide(true);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
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=168277&r1=168276&r2=168277&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 4 22:42:25 2005
@@ -13,19 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis.engine;
-import org.apache.axis.AbstractTestCase;
+package org.apache.axis.engine;
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.BasicOperationContext;
+import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.SOAPFactory;
import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.SOAPFactory;
+import org.apache.wsdl.WSDLConstants;
public class MessageContextTest extends AbstractTestCase {
public MessageContextTest(String testName) {
@@ -35,7 +33,14 @@
public void testMesssageContext() throws AxisFault {
EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
EngineContext engineContext = new EngineContext(er);
- MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new BasicOperationContext(null,null));
+ MessageContext msgctx =
+ new MessageContext(
+ engineContext,
+ null,
+ null,
+ null,
+ null,
+ OperationContextFactory.createMEP(WSDLConstants.MEP_URI_IN_OUT, false, null, null));
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?rev=168277&r1=168276&r2=168277&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java Wed May 4 22:42:25 2005
@@ -7,15 +7,14 @@
import org.apache.axis.addressing.AnyContentType;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.ServiceName;
-import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContextFactory;
import org.apache.axis.handlers.util.TestUtil;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFactory;
import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis.om.impl.llom.util.XMLComparator;
+import org.apache.wsdl.WSDLConstants;
/**
* Copyright 2001-2004 The Apache Software Foundation.
@@ -49,7 +48,7 @@
super.setUp();
outHandler = new AddressingOutHandler();
testUtil = new TestUtil();
- msgCtxt = new MessageContext(null, null, null, null,null,new BasicOperationContext(null,null));
+ msgCtxt = new MessageContext(null, null, null, null,null,OperationContextFactory.createMEP(WSDLConstants.MEP_URI_IN_OUT,false,null,null));
}
public void testAddToSOAPHeader() throws Exception {