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/06 04:31:19 UTC
svn commit: r168499 [1/2] - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/description/ 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/util/
core/test/org/apache/axis/context/ core/test/org/apache/axis/deployment/
core/test/org/apache/axis/engine/
core/test/org/apache/axis/handlers/addressing/
core/test/org/apache/axis/handlers/util/ core/test/org/apache/axis/misc/
core/test/org/apache/axis/phaserule/ samples/src/encoding/sample1/
samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/
samples/src/org/apache/axis/testUtils/ samples/src/userguide/sample1/
samples/test/org/apache/axis/clientapi/
samples/test/org/apache/axis/encoding/ samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
samples/test/org/apache/axis/om/builder/
wsdl/src/org/apache/axis/wsdl/databinding/
wsdl/src/org/apache/axis/wsdl/tojava/
wsdl/src/org/apache/axis/wsdl/tojava/xslt/
wsdl/src/org/apache/axis/wsdl/util/ xml/src/org/apache/axis/om/
xml/src/org/apache/axis/om/impl/llom/
xml/src/org/apache/axis/om/impl/llom/builder/
xml/src/org/apache/axis/om/impl/llom/factory/
xml/src/org/apache/axis/om/impl/llom/serialize/
xml/src/org/apache/axis/om/impl/llom/soap11/
xml/src/org/apache/axis/om/impl/llom/soap12/
xml/src/org/apache/axis/om/impl/llom/traverse/
xml/src/org/apache/axis/om/impl/llom/util/ xml/test/org/apache/axis/om/
xml/test/org/apache/axis/om/factory/
xml/test/org/apache/axis/om/impl/builder/
xml/test/org/apache/axis/om/impl/serializer/
xml/test/org/apache/axis/om/impl/streamwrapper/
Author: hemapani
Date: Thu May 5 19:31:16 2005
New Revision: 168499
URL: http://svn.apache.org/viewcvs?rev=168499&view=rev
Log:
few more fixes
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/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/context/ServiceContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.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/AxisFault.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractRobustInMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.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/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.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/mail/SimpleMailListner.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.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/handlers/addressing/AddressingInHandlerTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/misc/MiscTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/SimpleCsharpTypeMapper.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/SimpleJavaTypeMapper.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CodeGenConfiguration.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/xslt/CSharpEmitter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/xslt/ClassWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/xslt/InterfaceWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/xslt/JavaEmitter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/xslt/MultiLanguageClientEmitter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMAbstractFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMElement.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/SOAPFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/SOAPFault.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMAttributeImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMNavigator.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMNodeImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMSerializerUtil.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMStAXWrapper.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMTextImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamWriterToContentHandlerConverter.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap12/SOAP12Factory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenIterator.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenQNameIterator.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/util/XMLComparator.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -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.axis.util.Utils;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLDescription;
@@ -121,10 +122,7 @@
registry.getTransportOut(new QName(senderTransport));
final MessageContext msgctx =
- new MessageContext(
- engineContext,
- properties,
- null,
+ new MessageContext(null,
transportIn,
transportOut);
@@ -151,11 +149,11 @@
Runnable newThread = new Runnable() {
public void run() {
try {
- MessageContext response = new MessageContext(msgctx);
+ MessageContext response = Utils.copyMessageContext(msgctx);
response.setServerSide(false);
TransportReceiver receiver = response.getTransportIn().getReciever();
- receiver.invoke(response);
+ receiver.invoke(response,engineContext);
SOAPEnvelope resenvelope = response.getEnvelope();
AsyncResult asyncResult = new AsyncResult();
asyncResult.setResult(resenvelope);
@@ -202,11 +200,11 @@
sender.send(msgctx);
- MessageContext response = new MessageContext(msgctx);
+ MessageContext response = Utils.copyMessageContext(msgctx);
response.setServerSide(false);
TransportReceiver receiver = response.getTransportIn().getReciever();
- receiver.invoke(response);
+ receiver.invoke(response,engineContext);
SOAPEnvelope resenvelope = response.getEnvelope();
// TODO if the resenvelope is a SOAPFault then throw an exception
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -40,7 +40,7 @@
* @param value
* @param persistent
*/
- public void put(Object key, Object value, boolean persistent) {
+ public void setProperty(Object key, Object value, boolean persistent) {
if (persistent) {
persistentMap.put(key, value);
} else {
@@ -54,8 +54,8 @@
* @param key
* @param value
*/
- public void put(Object key, Object value) {
- this.put(key, value, false);
+ public void setProperty(Object key, Object value) {
+ this.setProperty(key, value, false);
}
/**
* Retrieve an object. Default search is done in the non persistent
@@ -63,8 +63,8 @@
* @param key
* @return
*/
- public Object get(Object key) {
- return this.get(key, false);
+ public Object getProperty(Object key) {
+ return this.getProperty(key, false);
}
/**
@@ -73,7 +73,7 @@
* @param persistent
* @return
*/
- public Object get(Object key, boolean persistent) {
+ public Object getProperty(Object key, boolean persistent) {
Object obj;
if (persistent) {
obj = persistentMap.get(key);
@@ -82,7 +82,7 @@
return nonPersistentMap.get(key);
}
if (obj == null && parent != null) {
- obj = parent.get(key, persistent);
+ obj = parent.getProperty(key, persistent);
}
return obj;
}
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -15,13 +15,11 @@
*/
package org.apache.axis.context;
-import java.util.HashMap;
import java.util.Map;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.MessageInformationHeadersCollection;
import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
@@ -64,14 +62,8 @@
private MessageInformationHeadersCollection messageInformationHeaders;
- private EngineContext engineContext;
-
private final ExecutionChain chain;
- // private ServiceContext serviceContext;
-
- private AxisOperation operationConfig;
-
private OperationContext operationContext;
private AxisTransportIn transportIn;
@@ -79,11 +71,6 @@
private AxisTransportOut transportOut;
/**
- * Field properties
- */
- private final Map properties;
-
- /**
* Field sessionContext
*/
private final SessionContext sessionContext;
@@ -126,26 +113,6 @@
public boolean outPutWritten = false;
- public MessageContext(MessageContext oldMessageContext) throws AxisFault {
- this(
- oldMessageContext.getEngineContext(),
- oldMessageContext.getProperties(),
- oldMessageContext.getSessionContext(),
- oldMessageContext.getTransportIn(),
- oldMessageContext.getTransportOut(),
- oldMessageContext.getOperationContext());
-
- this.messageInformationHeaders = new MessageInformationHeadersCollection();
- MessageInformationHeadersCollection oldMessageInfoHeaders =
- oldMessageContext.getMessageInformationHeaders();
- messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
- messageInformationHeaders.setFaultTo(oldMessageInfoHeaders.getFaultTo());
- messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
- messageInformationHeaders.setRelatesTo(new RelatesTo(oldMessageInfoHeaders.getMessageId()));
-
- this.serverSide = oldMessageContext.isServerSide();
- }
-
/**
* @param er registry
* @param initialProperties of the message context, should be null if no properties
@@ -160,29 +127,23 @@
AxisTransportOut transportOut,
OperationContext mepContext)
throws AxisFault {
- this(engineContext, initialProperties, sessionContext, transportIn, transportOut);
+ this(sessionContext, transportIn, transportOut);
this.operationContext = mepContext;
}
public MessageContext(
- EngineContext engineContext,
- Map initialProperties,
SessionContext sessionContext,
AxisTransportIn transportIn,
AxisTransportOut transportOut)
throws AxisFault {
super(null);
- this.engineContext = engineContext;
+
if (sessionContext == null) {
this.sessionContext = new SimpleSessionContext();
} else {
this.sessionContext = sessionContext;
}
- if (initialProperties == null) {
- initialProperties = new HashMap();
- }
- properties = initialProperties;
chain = new ExecutionChain();
messageInformationHeaders = new MessageInformationHeadersCollection();
this.transportIn = transportIn;
@@ -233,14 +194,6 @@
}
/**
- * @param key
- * @return
- */
- public Object getProperty(Object key) {
- return properties.get(key);
- }
-
- /**
* @return
*/
public RelatesTo getRelatesTo() {
@@ -325,14 +278,6 @@
}
/**
- * @param key
- * @param value
- */
- public void setProperty(Object key, Object value) {
- properties.put(key, value);
- }
-
- /**
* @param reference
*/
public void setRelatesTo(RelatesTo reference) {
@@ -390,13 +335,6 @@
return this.chain;
}
- /**
- * @return
- */
- public Map getProperties() {
- return properties;
- }
-
public void setWSAAction(String actionURI) {
messageInformationHeaders.setAction(actionURI);
}
@@ -461,34 +399,6 @@
/**
* @return
*/
- public EngineContext getEngineContext() {
- return engineContext;
- }
-
- /**
- * @param context
- */
- public void setEngineContext(EngineContext context) {
- engineContext = context;
- }
-
- /**
- * @return
- */
- public AxisOperation getoperationConfig() {
- return operationConfig;
- }
-
- /**
- * @param context
- */
- public void setOperationConfig(AxisOperation context) {
- operationConfig = context;
- }
-
- /**
- * @return
- */
public OperationContext getOperationContext() {
return operationContext;
}
@@ -496,7 +406,7 @@
/**
* @param context
*/
- public void setMepContext(OperationContext context) {
+ public void setOperationContext(OperationContext context) {
operationContext = context;
}
@@ -513,5 +423,5 @@
public void setOutPutWritten(boolean b) {
outPutWritten = b;
}
-
+
}
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -22,8 +22,6 @@
import java.util.List;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.PhasesInclude;
-import org.apache.axis.description.PhasesIncludeImpl;
import org.apache.axis.engine.AxisFault;
import org.apache.wsdl.WSDLConstants;
@@ -73,7 +71,7 @@
}
if (this.isComplete())
- msgContext.getEngineContext().removeMEP(this);
+ ((ServiceContext)parent).getEngineContext().removeMEP(this);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java Thu May 5 19:31:16 2005
@@ -35,4 +35,8 @@
public AxisService getServiceConfig() {
return serviceConfig;
}
+
+ public EngineContext getEngineContext(){
+ return (EngineContext)parent;
+ }
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisService.java Thu May 5 19:31:16 2005
@@ -355,29 +355,6 @@
}
-
-// /**
-// * Method setServiceClass
-// *
-// * @param serviceclass
-// */
-// public void setServiceClass(Class serviceclass) {
-// if (serviceclass != null) {
-// this.setComponentProperty(DescriptionConstants.SERVICE_CLASS,
-// serviceclass);
-// }
-// }
-//
-// /**
-// * Method getServiceClass
-// *
-// * @return
-// */
-// public Class getServiceClass() {
-// return (Class) this.getComponentProperty(
-// DescriptionConstants.SERVICE_CLASS);
-// }
-
/**
* Method getOperations
*
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -17,7 +17,12 @@
import javax.xml.namespace.QName;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.ServiceContext;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.handlers.AbstractHandler;
@@ -34,6 +39,8 @@
/**
* Constructor Dispatcher
*/
+ private EngineContext engineContext;
+
public AddressingBasedDispatcher() {
init(new HandlerMetadata(NAME));
}
@@ -45,14 +52,17 @@
* @throws AxisFault
*/
public void invoke(MessageContext msgctx) throws AxisFault {
-// if (msgctx.getServiceContext() == null) {
+ //TODO FIX this
+ throw new UnsupportedOperationException();
+// if(msgctx.getOperationContext() != null){
+//
+//
// EndpointReference toEPR = msgctx.getTo();
// QName serviceName = new QName(toEPR.getAddress());
// AxisService service =
-// msgctx.getEngineContext().getEngineConfig().getService(serviceName);
+// engineContext.getEngineConfig().getService(serviceName);
//
// if (service != null) {
-// EngineContext engineContext = msgctx.getEngineContext();
// ServiceContext serviceContext = engineContext.getService(service.getName());
// if (serviceContext == null) {
// serviceContext = new ServiceContext(service,engineContext);
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -37,14 +37,16 @@
* Field log
*/
private Log log = LogFactory.getLog(getClass());
+ private EngineContext engineContext;
/**
* Constructor AxisEngine
*
*
*/
- public AxisEngine() {
+ public AxisEngine(EngineContext engineContext) {
log.info("Axis Engine Started");
+ this.engineContext = engineContext;
}
/**
@@ -61,13 +63,13 @@
*/
public void send(MessageContext context) throws AxisFault {
try {
- if(context.getOperationContext() == 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.getOperationContext().getServiceContext();;
+ ServiceContext serviceContext = context.getOperationContext().getServiceContext();
+ ;
/*
* There is a two cases, at the server side(response) / client side
@@ -80,8 +82,8 @@
// what are we suppose to do in the client side
// how the client side handlers are deployed ??? this is a hack and no client side handlers
-// chain.addPhases(serviceContext.getPhases(EngineConfiguration.OUTFLOW));
- // TODO : Fix me Srinath
+ // chain.addPhases(serviceContext.getPhases(EngineConfiguration.OUTFLOW));
+ // TODO : Fix me Srinath
throw new UnsupportedOperationException();
} else {
if (context.isServerSide() && !context.isProcessingFault()) {
@@ -90,9 +92,7 @@
}
// Add the phases that are are at Global scope
- chain.addPhases(
- context.getEngineContext().getPhases(
- EngineConfiguration.OUTFLOW));
+ chain.addPhases(engineContext.getPhases(EngineConfiguration.OUTFLOW));
Phase addressingPhase = new SimplePhase("addressing");
addressingPhase.addHandler(new AddressingOutHandler());
chain.addPhase(addressingPhase);
@@ -132,8 +132,6 @@
log.info("starting the out flow");
- EngineContext engContext = context.getEngineContext();
-
// let us always start with a fresh EC
ExecutionChain chain = context.getExecutionChain();
@@ -141,15 +139,14 @@
AxisTransportIn transport = context.getTransportIn();
if (transport != null) {
log.info("Using the transport" + transport.getName());
- chain.addPhases(
- transport.getPhases(EngineConfiguration.INFLOW));
+ chain.addPhases(transport.getPhases(EngineConfiguration.INFLOW));
}
-
+
Phase addressingPhase = new SimplePhase("addressing");
addressingPhase.addHandler(new AddressingInHandler());
chain.addPhase(addressingPhase);
//add the Global flow
- chain.addPhases(engContext.getPhases(EngineConfiguration.INFLOW));
+ chain.addPhases(engineContext.getPhases(EngineConfiguration.INFLOW));
// create a Dispatch Phase and add it to the Execution Chain
Phase dispatchPhase = chain.getPhase(SimplePhase.DISPATCH_PHASE);
@@ -161,15 +158,13 @@
//This chain is the default Service diaptacher, the users may opt to overide this by
//adding an Handlers to the DispatchPhase.
dispatchPhase.addHandler(new RequestURIBasedDispatcher());
- AddressingBasedDispatcher dispatcher =
- new AddressingBasedDispatcher();
+ AddressingBasedDispatcher dispatcher = new AddressingBasedDispatcher();
dispatchPhase.addHandler(dispatcher);
}
//Service handlers are added to ExecutionChain by this Handler
- ServiceHandlersChainBuilder handlerChainBuilder =
- new ServiceHandlersChainBuilder();
+ ServiceHandlersChainBuilder handlerChainBuilder = new ServiceHandlersChainBuilder();
dispatchPhase.addHandler(handlerChainBuilder);
chain.addPhase(dispatchPhase);
@@ -179,14 +174,14 @@
if (context.isServerSide()) {
// add invoke Phase
MessageReceiver reciver =
- context.getoperationConfig().getMessageReciever();
+ context.getOperationContext().getAxisOperation().getMessageReciever();
reciver.recieve(context);
}
log.info("ending the out flow");
} catch (Throwable e) {
handleFault(context, e);
-
+
}
}
@@ -199,8 +194,7 @@
* @param e
* @throws AxisFault
*/
- public void handleFault(MessageContext context, Throwable e)
- throws AxisFault {
+ public void handleFault(MessageContext context, Throwable e) throws AxisFault {
boolean serverSide = context.isServerSide();
log.error("Error Ocurred", e);
if (serverSide && !context.isProcessingFault()) {
@@ -209,15 +203,13 @@
// create a SOAP envelope with the Fault
MessageContext faultContext =
new MessageContext(
- context.getEngineContext(),
- context.getProperties(),
context.getSessionContext(),
context.getTransportIn(),
- context.getTransportOut(),context.getOperationContext());
+ context.getTransportOut());
+ faultContext.setOperationContext(context.getOperationContext());
faultContext.setProcessingFault(true);
faultContext.setServerSide(true);
- SOAPEnvelope envelope =
- OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ SOAPEnvelope envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
// TODO do we need to set old Headers back?
SOAPBody body = envelope.getBody();
@@ -229,7 +221,7 @@
ServiceContext serviceContext = context.getOperationContext().getServiceContext();
if (serviceContext != null) {
-// chain.addPhases(serviceContext.getPhases(EngineConfiguration.FAULT_IN_FLOW));
+ // chain.addPhases(serviceContext.getPhases(EngineConfiguration.FAULT_IN_FLOW));
// TODO : Fix me Srinath
throw new UnsupportedOperationException();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisFault.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisFault.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisFault.java Thu May 5 19:31:16 2005
@@ -29,22 +29,16 @@
* </ol>
*/
public class AxisFault extends java.rmi.RemoteException {
- /**
- *
- */
- public AxisFault() {
-
- // TODO Auto-generated constructor stub
- }
-
+
+ public AxisFault(Throwable arg1) {
+ super(arg1.getMessage(), arg1);
+ }
/**
* @param arg0
*/
public AxisFault(String arg0) {
super(arg0);
-
- // TODO Auto-generated constructor stub
- }
+ }
/**
* @param arg0
@@ -52,8 +46,6 @@
*/
public AxisFault(String arg0, Throwable arg1) {
super(arg0, arg1);
-
- // TODO Auto-generated constructor stub
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java Thu May 5 19:31:16 2005
@@ -51,7 +51,7 @@
* @throws AxisFault
*/
public void send(MessageContext msgCtx) throws AxisFault {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(msgCtx.getOperationContext().getServiceContext().getEngineContext());
engine.send(msgCtx);
}
}
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -32,9 +32,9 @@
* @see org.apache.axis.engine.Handler#invoke(org.apache.axis.context.MessageContext)
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- if(msgContext.getoperationConfig() != null){
- AxisOperation axisOp = msgContext.getoperationConfig();
- msgContext.setMepContext(axisOp.findMEPContext(msgContext,msgContext.isServerSide()));
+ if(msgContext.getOperationContext() != null){
+ AxisOperation axisOp = msgContext.getOperationContext().getAxisOperation();
+ msgContext.setOperationContext(axisOp.findMEPContext(msgContext,msgContext.isServerSide()));
}
ServiceContext serviceContext = msgContext.getOperationContext().getServiceContext();
@@ -42,9 +42,9 @@
// let add the Handlers
ExecutionChain chain = msgContext.getExecutionChain();
- EngineContext engineContext = msgContext.getEngineContext();
+ EngineContext engineContext = serviceContext.getEngineContext();
- // TODO : Fix me Srinath
+ //TODO : Fix me Srinath
throw new UnsupportedOperationException();
// if( engineContext.getService(serviceContext.getName()) != null){
// engineContext.addService(serviceContext);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutAsyncMessageReceiver.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutAsyncMessageReceiver.java Thu May 5 19:31:16 2005
@@ -35,11 +35,11 @@
final ServerCallback callback = new ServerCallback() {
public void handleResult(MessageContext result)throws AxisFault {
MessageSender sender =
- new MessageSender(messgeCtx.getEngineContext());
+ new MessageSender(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
sender.send(messgeCtx);
}
public void handleFault(AxisFault fault)throws AxisFault{
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
engine.handleFault(messgeCtx,fault);
}
};
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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -29,7 +29,7 @@
public final void recieve(MessageContext messgeCtx) throws AxisFault {
MessageContext resultContext = invokeBusinessLogic(messgeCtx);
- MessageSender sender = new MessageSender(messgeCtx.getEngineContext());
+ MessageSender sender = new MessageSender(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
sender.send(resultContext);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractRobustInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractRobustInMessageReceiver.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractRobustInMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractRobustInMessageReceiver.java Thu May 5 19:31:16 2005
@@ -33,7 +33,7 @@
try {
invokeBusinessLogic(messgeCtx);
} catch (AxisFault e) {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(messgeCtx.getOperationContext().getServiceContext().getEngineContext());
engine.handleFault(messgeCtx,e);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java Thu May 5 19:31:16 2005
@@ -27,6 +27,7 @@
import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLService;
@@ -75,7 +76,7 @@
// find the WebService method
Class ImplClass = obj.getClass();
- AxisOperation op = msgContext.getoperationConfig();
+ AxisOperation op = msgContext.getOperationContext().getAxisOperation();
if (op == null) {
throw new AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
}
@@ -95,8 +96,8 @@
OMElement parmeter = null;
SOAPEnvelope envelope = null;
- MessageContext msgContext1 = new MessageContext(msgContext);
- String style = msgContext.getoperationConfig().getStyle();
+ MessageContext msgContext1 = Utils.copyMessageContext(msgContext);
+ String style = msgContext.getOperationContext().getAxisOperation().getStyle();
if (WSDLService.STYLE_DOC.equals(style)) {
parmeter = methodElement;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java Thu May 5 19:31:16 2005
@@ -15,10 +15,14 @@
*/
package org.apache.axis.transport;
-import org.apache.axis.handlers.AbstractHandler;
+
+import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
/**
* Class TransportReceiver
*/
-public abstract class TransportReceiver extends AbstractHandler {
+public abstract class TransportReceiver{
+ public abstract void invoke(MessageContext msgContext,EngineContext engineContext) 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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -140,7 +140,7 @@
throws ServletException, IOException {
try {
res.setContentType("text/xml; charset=utf-8");
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
Object sessionContext = req.getSession().getAttribute(
Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null) {
@@ -148,9 +148,7 @@
req.getSession().setAttribute(
Constants.SESSION_CONTEXT_PROPERTY, sessionContext);
}
- MessageContext msgContext = new MessageContext(engineContext,
- null,
- (SessionContext) sessionContext,
+ MessageContext msgContext = new MessageContext((SessionContext) sessionContext,
engineContext.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
engineContext.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java Thu May 5 19:31:16 2005
@@ -25,6 +25,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
@@ -88,7 +89,7 @@
* @param msgContext
* @throws AxisFault
*/
- public void invoke(MessageContext msgContext) throws AxisFault {
+ public void invoke(MessageContext msgContext,EngineContext engineContext) throws AxisFault{
Reader in = (Reader) msgContext.getProperty(MessageContext.TRANSPORT_READER);
if (in != null) {
boolean serverSide = msgContext.isServerSide();
@@ -117,7 +118,7 @@
// TODO take care of other HTTP Headers
}
- AxisEngine axisEngine = new AxisEngine();
+ AxisEngine axisEngine = new AxisEngine(engineContext);
try {
XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
StAXBuilder builder = new StAXSOAPModelBuilder(xmlreader);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java Thu May 5 19:31:16 2005
@@ -149,14 +149,13 @@
public void startSendWithOutputStreamFromIncomingConnection(
MessageContext msgContext,
- Writer writer) {
+ Writer writer)throws AxisFault {
try {
writer.write(new String(HTTPConstants.HTTP).toCharArray());
writer.write(new String(HTTPConstants.OK).toCharArray());
writer.write("\n\n".toCharArray());
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new AxisFault(e);
}
}
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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -137,8 +137,6 @@
new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
new MessageContext(
- this.engineReg,
- null,
null,
engineReg.getEngineConfig().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
@@ -150,7 +148,7 @@
msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
HTTPTransportReceiver reciver = new HTTPTransportReceiver();
- reciver.invoke(msgContext);
+ reciver.invoke(msgContext,engineReg);
if (msgContext.getReplyTo() != null
&& !AddressingConstants.EPR_ANONYMOUS_URL.equals(
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -90,7 +90,7 @@
MessageContext msgContext = null;
// create and initialize a message context
try {
- msgContext = new MessageContext(this.reg, null, null,
+ msgContext = new MessageContext(null,
reg.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
reg.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java Thu May 5 19:31:16 2005
@@ -113,7 +113,7 @@
protected static synchronized AxisEngine getAxisEngine() {
if (myAxisEngine == null) {
- myAxisEngine = new AxisEngine();
+ myAxisEngine = new AxisEngine(er);
}
return myAxisEngine;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Thu May 5 19:31:16 2005
@@ -18,7 +18,10 @@
import javax.xml.namespace.QName;
import org.apache.axis.Constants;
+import org.apache.axis.addressing.MessageInformationHeadersCollection;
+import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
@@ -47,16 +50,15 @@
int flowtype)
throws AxisFault {
// TODO : Fix me Deepal
- throw new UnsupportedOperationException();
-// ArrayList faultchain = new ArrayList();
-// SimplePhase p = new SimplePhase(Constants.PHASE_SERVICE);
-// faultchain.add(p);
-// addHandlers(flow, p);
-// serviceContext.setPhases(faultchain, flowtype);
+ throw new UnsupportedOperationException();
+ // ArrayList faultchain = new ArrayList();
+ // SimplePhase p = new SimplePhase(Constants.PHASE_SERVICE);
+ // faultchain.add(p);
+ // addHandlers(flow, p);
+ // serviceContext.setPhases(faultchain, flowtype);
}
- public static void createExecutionChains(ServiceContext serviceContext)
- throws AxisFault {
+ public static void createExecutionChains(ServiceContext serviceContext) throws AxisFault {
AxisService service = serviceContext.getServiceConfig();
addPhasesToServiceFromFlow(
serviceContext,
@@ -78,38 +80,65 @@
public static AxisService createSimpleService(
QName serviceName,
MessageReceiver messageReceiver,
- String className, QName opName) {
+ String className,
+ QName opName) {
AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(
- new ParameterImpl(
- AbstractMessageReceiver.SERVICE_CLASS,
- className));
+ service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
AxisOperation axisOp = new AxisOperation(opName);
axisOp.setMessageReciever(messageReceiver);
service.addOperation(axisOp);
return service;
}
-
- public static ServiceContext createServiceContext(AxisService service,EngineContext engineContext) throws AxisFault{
- ServiceContext serviceContext = new ServiceContext(service,engineContext);
+
+ public static ServiceContext createServiceContext(
+ AxisService service,
+ EngineContext engineContext)
+ throws AxisFault {
+ ServiceContext serviceContext = new ServiceContext(service, engineContext);
createExecutionChains(serviceContext);
return serviceContext;
}
public static AxisService createSimpleService(
- QName serviceName, String className,QName opName) {
- return createSimpleService(serviceName,new RawXMLINOutMessageRecevier(),className,opName);
- }
+ QName serviceName,
+ String className,
+ QName opName) {
+ return createSimpleService(
+ serviceName,
+ new RawXMLINOutMessageRecevier(),
+ className,
+ opName);
+ }
- public static void addHandlers(Flow flow, SimplePhase phase)
- throws AxisFault {
+ public static void addHandlers(Flow flow, SimplePhase phase) throws AxisFault {
if (flow != null) {
int handlerCount = flow.getHandlerCount();
for (int i = 0; i < handlerCount; i++) {
phase.addHandler(flow.getHandler(i).getHandler());
}
}
+ }
+
+ public static MessageContext copyMessageContext(MessageContext oldMessageContext)
+ throws AxisFault {
+ MessageContext messageContext =
+ new MessageContext(
+ oldMessageContext.getSessionContext(),
+ oldMessageContext.getTransportIn(),
+ oldMessageContext.getTransportOut());
+
+ messageContext.setMessageInformationHeaders(new MessageInformationHeadersCollection());
+ MessageInformationHeadersCollection oldMessageInfoHeaders =
+ oldMessageContext.getMessageInformationHeaders();
+ MessageInformationHeadersCollection messageInformationHeaders =
+ new MessageInformationHeadersCollection();
+ messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
+ messageInformationHeaders.setFaultTo(oldMessageInfoHeaders.getFaultTo());
+ messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
+ messageInformationHeaders.setRelatesTo(new RelatesTo(oldMessageInfoHeaders.getMessageId()));
+ return messageContext;
+
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java Thu May 5 19:31:16 2005
@@ -54,7 +54,7 @@
}
public MessageContext getBasicMessageContext() throws AxisFault{
- return new MessageContext(engineCtx ,new HashMap(), new SessionContext() {
+ return new MessageContext( new SessionContext() {
/* (non-Javadoc)
* @see org.apache.axis.context.SessionContext#get(java.lang.Object)
*/
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Thu May 5 19:31:16 2005
@@ -24,8 +24,6 @@
import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.receivers.RawXMLINOutMessageRecevier;
public class BuildERWithDeploymentTest extends AbstractTestCase {
/**
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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -20,8 +20,6 @@
import javax.xml.namespace.QName;
-import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.OperationContextFactory;
@@ -35,12 +33,12 @@
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 {
private QName serviceName = new QName("NullService");
private QName operationName = new QName("DummyOp");
+ private EngineContext engineContext;
public EnginePausingTest() {
}
@@ -56,7 +54,7 @@
AxisTransportIn transportIn = new AxisTransportIn(new QName("null"));
- EngineContext engineContext = new EngineContext(engineRegistry);
+ engineContext = new EngineContext(engineRegistry);
AxisOperation axisOp = new AxisOperation(operationName);
@@ -111,9 +109,7 @@
ServiceContext serviceContext = new ServiceContext(service,engineContext);
engineContext.addService(serviceContext);
- // TODO : Fix me Srinath
- throw new UnsupportedOperationException();
-
+//TODO
// serviceContext.setPhases(phases, EngineConfiguration.INFLOW);
// engineRegistry.addService(service);
// service.setStyle(WSDLService.STYLE_DOC);
@@ -126,7 +122,7 @@
}
public void testReceive() throws Exception {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
engine.receive(mc);
assertEquals(executedHandlers.size(), 15);
for (int i = 0; i < 15; i++) {
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -25,7 +25,6 @@
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;
import org.apache.axis.description.AxisService;
@@ -85,7 +84,7 @@
}
public void testServerSend() throws Exception {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
mc.setServerSide(true);
fail();
//TODO mc.setServiceContext(new ServiceContext(service, engineContext));
@@ -93,20 +92,20 @@
}
public void testClientSend() throws Exception {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
mc.setServerSide(false); fail();
//TODO mc.setServiceContext(new ServiceContext(service,engineContext));
engine.send(mc);
}
public void testServerReceive() throws Exception {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
mc.setServerSide(true);
engine.receive(mc);
}
public void testClientReceive() throws Exception {
- AxisEngine engine = new AxisEngine();
+ AxisEngine engine = new AxisEngine(engineContext);
mc.setServerSide(false);
engine.receive(mc);
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingInHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingInHandlerTest.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingInHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingInHandlerTest.java Thu May 5 19:31:16 2005
@@ -4,7 +4,6 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.SOAPHeader;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java Thu May 5 19:31:16 2005
@@ -6,8 +6,6 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
/**
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/misc/MiscTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/misc/MiscTest.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/misc/MiscTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/misc/MiscTest.java Thu May 5 19:31:16 2005
@@ -47,7 +47,7 @@
Exception e = new InvocationTargetException(new Exception());
assertNotSame(AxisFault.makeFault(e), e);
- e = new AxisFault();
+ e = new AxisFault("");
}
}
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=168499&r1=168498&r2=168499&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 Thu May 5 19:31:16 2005
@@ -1,5 +1,9 @@
package org.apache.axis.phaserule;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.HandlerMetadata;
@@ -8,9 +12,6 @@
import org.apache.axis.engine.EngineConfigurationImpl;
import org.apache.axis.engine.Handler;
import org.apache.axis.phaseresolver.PhaseHolder;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
/**
* Created by IntelliJ IDEA.
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java Thu May 5 19:31:16 2005
@@ -23,13 +23,21 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
import org.apache.axis.testUtils.SimpleTypeEncoder;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
+import org.apache.axis.util.Utils;
+
+import com.sun.corba.se.internal.javax.rmi.CORBA.Util;
public class EchoProvider extends SimpleJavaProvider {
@@ -95,7 +103,7 @@
//find the WebService method
Class ImplClass = obj.getClass();
- AxisOperation op = msgContext.getoperationConfig();
+ AxisOperation op = msgContext.getOperationContext().getAxisOperation();
String methodName = op.getName().getLocalPart();
@@ -160,7 +168,7 @@
"http://axis.apache.org",
"s");
- MessageContext resMessageContext = new MessageContext(msgContext);
+ MessageContext resMessageContext = Utils.copyMessageContext(msgContext);
resMessageContext.setEnvelope(responseEnvelope);
return resMessageContext;
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java Thu May 5 19:31:16 2005
@@ -21,7 +21,13 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java Thu May 5 19:31:16 2005
@@ -21,7 +21,13 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java Thu May 5 19:31:16 2005
@@ -24,7 +24,12 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
@@ -101,7 +106,7 @@
//find the WebService method
Class ImplClass = obj.getClass();
- AxisOperation op = msgContext.getoperationConfig();
+ AxisOperation op = msgContext.getOperationContext().getAxisOperation();
String methodName = op.getName().getLocalPart();
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=168499&r1=168498&r2=168499&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 19:31:16 2005
@@ -27,7 +27,13 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
@@ -79,7 +85,7 @@
public MessageContext invokeBusinessLogic(MessageContext msgContext) throws AxisFault{
try {
- if (WSDLService.STYLE_DOC.equals(msgContext.getoperationConfig().getStyle())) {
+ if (WSDLService.STYLE_DOC.equals(msgContext.getOperationContext().getAxisOperation().getStyle())) {
SOAPBody body = msgContext.getEnvelope().getBody();
XMLStreamReader xpp = body.getXMLStreamReader();
@@ -109,81 +115,85 @@
operationName = new QName(methodName.substring(0, index));
}
-
- AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
- if (operationName != null) {
- AxisOperation op = service.getOperation(operationName);
- if (op != null) {
- msgContext.setOperationConfig(op);
- } else {
- throw new AxisFault("Operation not found " + operationName);
- }
- } else {
- throw new AxisFault(
- "Operation Name not specifed the request String is " + methodName);
- }
-
- //get the implementation class for the Web Service
- Object obj = getTheImplementationObject(msgContext);
-
- //find the WebService method
- Class ImplClass = obj.getClass();
- AxisOperation op = msgContext.getoperationConfig();
- methodName = op.getName().getLocalPart();
-
- Method[] methods = ImplClass.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getName().equals(methodName)) {
- this.method = methods[i];
- break;
- }
- }
- //deserialize (XML-> java)
- Object[] parms = deserializeParameters(msgContext, method, xpp);
- //invoke the WebService
-
- WSDLInteropTestDocLitPortType benchmark = (WSDLInteropTestDocLitPortType) obj;
- Object result = null;
- OMElement returnelement = null;
- SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
- OMNamespace ns = fac.createOMNamespace("http://soapinterop.org/xsd", "doclitTypes");
-
- if ("echoVoid".equals(methodName)) {
- benchmark.echoVoid();
- returnelement = fac.createOMElement("echoVoidReturn", ns);
- } else if ("echoString".equals(methodName)) {
- result = benchmark.echoString((String) parms[0]);
- returnelement = fac.createOMElement("echoStringReturn", ns);
- } else if ("echoStringArray".equals(methodName)) {
- result = benchmark.echoStringArray((String[]) parms[0]);
- returnelement = fac.createOMElement("echoStringArrayReturn", ns);
- } else if ("echoStruct".equals(methodName)) {
- result = benchmark.echoStruct((SOAPStruct) parms[0]);
- returnelement = fac.createOMElement("echoStructReturn", ns);
- }
- Encoder outobj = null;
- if (result != null) {
- if (result instanceof String || result instanceof String[]) {
- outobj = new SimpleTypeEncoder(result);
- } else if (result instanceof SOAPStruct) {
- outobj = new SOAPStructEncoder((SOAPStruct) result);
- }
- }
-
- SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
-
- responseEnvelope.getBody().addChild(returnelement);
- if (result != null) {
- returnelement.setBuilder(new ObjectToOMBuilder(returnelement, outobj));
- returnelement.declareNamespace(OMConstants.ARRAY_ITEM_NSURI, "arrays");
- returnelement.declareNamespace(
- "http://soapinterop.org/WSDLInteropTestDocLit",
- "s");
-
- }
- msgContext.setEnvelope(responseEnvelope);
-
- return msgContext;
+// TODO fix this
+ throw new UnsupportedOperationException();
+// AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
+// if (operationName != null) {
+// AxisOperation op = service.getOperation(operationName);
+// if (op != null) {
+//
+//
+//// TODO fix this
+// // msgContext.setOperationConfig(op);
+// } else {
+// throw new AxisFault("Operation not found " + operationName);
+// }
+// } else {
+// throw new AxisFault(
+// "Operation Name not specifed the request String is " + methodName);
+// }
+//
+// //get the implementation class for the Web Service
+// Object obj = getTheImplementationObject(msgContext);
+//
+// //find the WebService method
+// Class ImplClass = obj.getClass();
+// AxisOperation op = msgContext.getOperationContext().getAxisOperation();
+// methodName = op.getName().getLocalPart();
+//
+// Method[] methods = ImplClass.getMethods();
+// for (int i = 0; i < methods.length; i++) {
+// if (methods[i].getName().equals(methodName)) {
+// this.method = methods[i];
+// break;
+// }
+// }
+// //deserialize (XML-> java)
+// Object[] parms = deserializeParameters(msgContext, method, xpp);
+// //invoke the WebService
+//
+// WSDLInteropTestDocLitPortType benchmark = (WSDLInteropTestDocLitPortType) obj;
+// Object result = null;
+// OMElement returnelement = null;
+// SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+// OMNamespace ns = fac.createOMNamespace("http://soapinterop.org/xsd", "doclitTypes");
+//
+// if ("echoVoid".equals(methodName)) {
+// benchmark.echoVoid();
+// returnelement = fac.createOMElement("echoVoidReturn", ns);
+// } else if ("echoString".equals(methodName)) {
+// result = benchmark.echoString((String) parms[0]);
+// returnelement = fac.createOMElement("echoStringReturn", ns);
+// } else if ("echoStringArray".equals(methodName)) {
+// result = benchmark.echoStringArray((String[]) parms[0]);
+// returnelement = fac.createOMElement("echoStringArrayReturn", ns);
+// } else if ("echoStruct".equals(methodName)) {
+// result = benchmark.echoStruct((SOAPStruct) parms[0]);
+// returnelement = fac.createOMElement("echoStructReturn", ns);
+// }
+// Encoder outobj = null;
+// if (result != null) {
+// if (result instanceof String || result instanceof String[]) {
+// outobj = new SimpleTypeEncoder(result);
+// } else if (result instanceof SOAPStruct) {
+// outobj = new SOAPStructEncoder((SOAPStruct) result);
+// }
+// }
+//
+// SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
+//
+// responseEnvelope.getBody().addChild(returnelement);
+// if (result != null) {
+// returnelement.setBuilder(new ObjectToOMBuilder(returnelement, outobj));
+// returnelement.declareNamespace(OMConstants.ARRAY_ITEM_NSURI, "arrays");
+// returnelement.declareNamespace(
+// "http://soapinterop.org/WSDLInteropTestDocLit",
+// "s");
+//
+// }
+// msgContext.setEnvelope(responseEnvelope);
+//
+// return msgContext;
} else {
throw new AxisFault("this Service only supports doc-lit");
}
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java Thu May 5 19:31:16 2005
@@ -7,7 +7,13 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMText;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
/*
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java Thu May 5 19:31:16 2005
@@ -19,7 +19,15 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMText;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java Thu May 5 19:31:16 2005
@@ -26,7 +26,12 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
import org.apache.axis.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -84,7 +89,7 @@
//find the WebService method
Class ImplClass = obj.getClass();
- AxisOperation op = msgContext.getoperationConfig();
+ AxisOperation op = msgContext.getOperationContext().getAxisOperation();
String methodName = op.getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
for (int i = 0; i < methods.length; i++) {
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java Thu May 5 19:31:16 2005
@@ -1,7 +1,11 @@
package userguide.sample1;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
/*
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java?rev=168499&r1=168498&r2=168499&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java Thu May 5 19:31:16 2005
@@ -27,7 +27,6 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.SOAPEnvelope;