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/04/27 16:16:38 UTC
svn commit: r164984 [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/deployment/
core/src/org/apache/axis/deployment/listener/
core/src/org/apache/axis/deployment/repository/utill/
core/src/org/apache/axis/deployment/scheduler/
core/src/org/apache/axis/engine/
core/src/org/apache/axis/handlers/addressing/
core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/receivers/
core/src/org/apache/axis/storage/impl/ core/src/org/apache/axis/transport/
core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/ core/test/org/apache/axis/
core/test/org/apache/axis/addressing/ core/test/org/apache/axis/deployment/
core/test/org/apache/axis/description/
core/test/org/apache/axis/handlers/addressing/
core/test/org/apache/axis/handlers/util/
core/test/org/apache/axis/storage/impl/ samples/src/encoding/sample1/
samples/src/interop/doclit/ samples/src/org/apache/axis/testUtils/
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/
samples/test/org/apache/axis/om/builder/dummy/
wsdl/src/org/apache/axis/wsdl/builder/
wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/ wsdl/src/org/apache/wsdl/
wsdl/src/org/apache/wsdl/impl/ wsdl/src/org/apache/wsdl/util/
wsdl/test/org/apache/wsdl/ xml/src/org/apache/axis/om/impl/llom/
xml/test/org/apache/axis/om/ xml/test/org/apache/axis/om/impl/builder/
xml/test/org/apache/axis/om/impl/serializer/
xml/test/org/apache/axis/om/impl/streamwrapper/
xml/test/org/apache/axis/om/util/
Author: hemapani
Date: Wed Apr 27 07:16:36 2005
New Revision: 164984
URL: http://svn.apache.org/viewcvs?rev=164984&view=rev
Log:
now async (the real thing over two channels works), it broke two test. Will fix them tommarow morning
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/CallbackReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.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/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/storage/impl/AxisFileStorage.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.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/MailTransportSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/AnyContentTypeTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/EndpointReferenceTypeTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler1.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/addressing/AddressingOutHandlerTest.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/storage/impl/AbstractStorageTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AxisMemoryStorageTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStructEncoder.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EndToEndTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadIncreaseTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadTest.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropRequestHandler.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/SOAPStructEncoder.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/SimpleTypeEncoder.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ArrayTypeEncoder.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/Encoder.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/SimpleTypeEncoder.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleTypeEncodingUtils.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/Echo.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/SpeakingHandler.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/SpeakingHandler1.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/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLDescription.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ExtensibleComponentImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.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/SOAPHeaderImpl.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/CompareOMWithDOMTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/IteratorTester.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMElementTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMHeaderTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.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
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparator.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparatorTest.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=164984&r1=164983&r2=164984&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 Apr 27 07:16:36 2005
@@ -17,6 +17,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
@@ -52,6 +53,8 @@
private String callbackServiceName;
private CallbackReceiver callbackReceiver;
+
+ private QName opName;
public Call() throws AxisFault {
try {
@@ -134,8 +137,9 @@
msgctx.setEnvelope(env);
if (useSeparateListener) {
- msgctx.getMessageInformationHeaders().setMessageId(String.valueOf(System.currentTimeMillis()));
- callbackReceiver.addCallback(msgctx.getMessageID(), callback);
+ messageInfoHeaders.setMessageId(String.valueOf(System.currentTimeMillis()));
+ callbackReceiver.addCallback(messageInfoHeaders.getMessageId(), callback);
+ messageInfoHeaders.setReplyTo(ListenerManager.replyToEPR(callbackServiceName+"/"+opName.getLocalPart()));
}
msgctx.setMessageInformationHeaders(messageInfoHeaders);
@@ -257,7 +261,11 @@
callbackService.setName(new QName(callbackServiceName));
callbackReceiver = new CallbackReceiver();
callbackService.setMessageReceiver(callbackReceiver);
-
+
+ opName = new QName("callback_op");
+ AxisOperation callbackOperation = new AxisOperation(opName);
+ callbackService.addOperation(callbackOperation);
+
ListenerManager.makeSureStarted();
ListenerManager.getEngineContext().addService(new ServiceContext(callbackService));
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/CallbackReceiver.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/CallbackReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/CallbackReceiver.java Wed Apr 27 07:16:36 2005
@@ -39,6 +39,8 @@
if (callback != null) {
callback.onComplete(result);
+ }else{
+ throw new AxisFault("The Callback realtes to MessageID "+ messageID + " is not found");
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java Wed Apr 27 07:16:36 2005
@@ -67,7 +67,7 @@
}
}
- public EndpointReference replyToEPR(String serviceName){
- return new EndpointReference(AddressingConstants.WSA_REPLY_TO,"http://127.0.0.1:"+scoket.getLocalPort()+"/axis/services/"+serviceName);
+ public static EndpointReference replyToEPR(String serviceName){
+ return new EndpointReference(AddressingConstants.WSA_REPLY_TO,"http://127.0.0.1:"+ (scoket.getLocalPort())+"/axis/services/"+serviceName);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ContextBuilder.java Wed Apr 27 07:16:36 2005
@@ -1,16 +1,17 @@
package org.apache.axis.context;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
-import org.apache.axis.engine.EngineConfiguration;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.phaseresolver.PhaseResolver;
-import org.apache.axis.phaseresolver.PhaseException;
import org.apache.axis.description.AxisService;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.modules.Module;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.phaseresolver.PhaseException;
+import org.apache.axis.phaseresolver.PhaseResolver;
/**
* Created by IntelliJ IDEA.
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=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Wed Apr 27 07:16:36 2005
@@ -150,6 +150,8 @@
private boolean newThreadRequired = false;
private boolean paused = false;
+
+ public boolean outPutWritten = false;
public MessageContext(MessageContext oldMessageContext) throws AxisFault {
this(
@@ -164,6 +166,7 @@
messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo()) ;
messageInformationHeaders.setFaultTo(oldMessageInfoHeaders.getFaultTo());
messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
+ messageInformationHeaders.setRelatesTo(new RelatesTo(oldMessageInfoHeaders.getMessageId()));
this.serverSide = oldMessageContext.isServerSide();
this.serviceContext = oldMessageContext.getServiceContext();
@@ -540,6 +543,20 @@
*/
public void setMepContext(MEPContext context) {
mepContext = context;
+ }
+
+ /**
+ * @return
+ */
+ public boolean isOutPutWritten() {
+ return outPutWritten;
+ }
+
+ /**
+ * @param b
+ */
+ public void setOutPutWritten(boolean b) {
+ outPutWritten = b;
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Wed Apr 27 07:16:36 2005
@@ -16,6 +16,19 @@
package org.apache.axis.deployment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axis.deployment.listener.RepositoryListenerImpl;
import org.apache.axis.deployment.repository.utill.HDFileItem;
import org.apache.axis.deployment.repository.utill.UnZipJAR;
@@ -23,18 +36,20 @@
import org.apache.axis.deployment.scheduler.DeploymentIterator;
import org.apache.axis.deployment.scheduler.Scheduler;
import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.description.*;
-import org.apache.axis.engine.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineConfiguration;
+import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.MessageReceiver;
import org.apache.axis.modules.Module;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
public class DeploymentEngine implements DeploymentConstants {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Wed Apr 27 07:16:36 2005
@@ -16,19 +16,30 @@
package org.apache.axis.deployment;
-import org.apache.axis.description.*;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfigurationImpl;
-import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportSender;
+import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.io.InputStream;
-import java.util.ArrayList;
+
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.FlowImpl;
+import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.ParameterImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportSender;
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java Wed Apr 27 07:16:36 2005
@@ -16,13 +16,13 @@
package org.apache.axis.deployment.listener;
-import org.apache.axis.deployment.DeploymentConstants;
-import org.apache.axis.deployment.DeploymentEngine;
-import org.apache.axis.deployment.repository.utill.WSInfoList;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.axis.deployment.DeploymentConstants;
+import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.deployment.repository.utill.WSInfoList;
public class RepositoryListenerImpl implements RepositoryListener, DeploymentConstants {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java Wed Apr 27 07:16:36 2005
@@ -16,12 +16,12 @@
package org.apache.axis.deployment.repository.utill;
-import org.apache.axis.engine.AxisFault;
-
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+
+import org.apache.axis.engine.AxisFault;
/**
* HDFileItem = Hot Deployment File Item , to store infromation of the module or servise
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java Wed Apr 27 07:16:36 2005
@@ -16,16 +16,16 @@
package org.apache.axis.deployment.repository.utill;
+import java.io.FileInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
import org.apache.axis.deployment.DeploymentConstants;
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
import org.apache.axis.deployment.DeploymentParser;
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisService;
-
-import java.io.FileInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
public class UnZipJAR implements DeploymentConstants {
//final int BUFFER = 2048;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java Wed Apr 27 07:16:36 2005
@@ -16,13 +16,13 @@
package org.apache.axis.deployment.repository.utill;
-import org.apache.axis.deployment.DeploymentConstants;
-import org.apache.axis.deployment.DeploymentEngine;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.axis.deployment.DeploymentConstants;
+import org.apache.axis.deployment.DeploymentEngine;
public class WSInfoList implements DeploymentConstants {
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java Wed Apr 27 07:16:36 2005
@@ -16,11 +16,11 @@
package org.apache.axis.deployment.scheduler;
+import java.util.TimerTask;
+
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.listener.RepositoryListener;
import org.apache.axis.deployment.listener.RepositoryListenerImpl;
-
-import java.util.TimerTask;
public class SchedulerTask implements Runnable {
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=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Wed Apr 27 07:16:36 2005
@@ -216,6 +216,7 @@
// TODO do we need to set old Headers back?
SOAPBody body = envelope.getBody();
+ e.printStackTrace();
body.addFault(new AxisFault(e.getMessage(), e));
faultContext.setEnvelope(envelope);
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -3,6 +3,10 @@
import java.util.Iterator;
import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.AnyContentType;
@@ -90,7 +94,6 @@
relatesTo.getRelationshipType(),
addressingNamespace);
}
- soapHeader.addChild(relatesToHeader);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Wed Apr 27 07:16:36 2005
@@ -15,6 +15,8 @@
*/
package org.apache.axis.phaseresolver;
+import java.util.ArrayList;
+
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.description.AxisService;
@@ -26,8 +28,6 @@
import org.apache.axis.engine.SimplePhase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
/**
* This class hold all the phases found in the service.xml and server.xml
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java Wed Apr 27 07:16:36 2005
@@ -15,9 +15,9 @@
*/
package org.apache.axis.phaseresolver;
-import org.apache.axis.description.HandlerMetadata;
-
import java.util.ArrayList;
+
+import org.apache.axis.description.HandlerMetadata;
/**
* Class PhaseMetadata
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Wed Apr 27 07:16:36 2005
@@ -15,14 +15,25 @@
*/
package org.apache.axis.phaseresolver;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.ServiceContext;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineConfiguration;
-
-import javax.xml.namespace.QName;
-import java.util.*;
/**
* Class PhaseResolver
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=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractInOutSyncMessageReceiver.java Wed Apr 27 07:16:36 2005
@@ -28,6 +28,7 @@
public final void recieve(MessageContext messgeCtx) throws AxisFault {
MessageContext resultContext = invokeBusinessLogic(messgeCtx);
+
MessageSender sender = new MessageSender(messgeCtx.getEngineContext());
sender.send(resultContext);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/storage/impl/AxisFileStorage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/storage/impl/AxisFileStorage.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/storage/impl/AxisFileStorage.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/storage/impl/AxisFileStorage.java Wed Apr 27 07:16:36 2005
@@ -1,12 +1,9 @@
package org.apache.axis.storage.impl;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.ObjectOutput;
-import java.util.Properties;
import java.util.HashMap;
/*
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/AbstractTransportSender.java Wed Apr 27 07:16:36 2005
@@ -21,6 +21,7 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.HandlerMetadata;
@@ -32,8 +33,7 @@
/**
*/
-public abstract class AbstractTransportSender extends AbstractHandler
- implements TransportSender {
+public abstract class AbstractTransportSender extends AbstractHandler implements TransportSender {
/**
* Field log
*/
@@ -42,8 +42,7 @@
/**
* Field NAME
*/
- public static final QName NAME = new QName("http://axis.ws.apache.org",
- "TransportSender");
+ public static final QName NAME = new QName("http://axis.ws.apache.org", "TransportSender");
/**
* Constructor AbstractTransportSender
@@ -59,87 +58,60 @@
* @throws AxisFault
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- Writer out = null;
- if (msgContext.isProcessingFault()) {
-
- // Means we are processing fault
- if (msgContext.getFaultTo() != null) {
- log.info("Obtain the output stream to send the fault flow to "
- + msgContext.getFaultTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getFaultTo());
- } else {
- log.info(
- "Obtain the output stream to send the fault flow to ANONYMOUS");
- out = obtainWriter(msgContext);
- }
- } else {
- if (msgContext.getTo() != null) {
- log.info("Obtain the output stream to send to To flow to "
- + msgContext.getTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getTo());
- } else if (msgContext.getReplyTo() != null) {
- log.info("Obtain the output stream to send to ReplyTo flow to "
- + msgContext.getReplyTo().getAddress());
- out = obtainWriter(msgContext, msgContext.getTo());
- } else {
- log.info(
- "Obtain the output stream to send the fault flow to ANONYMOUS");
- out = obtainWriter(msgContext);
- }
- }
- startSending(msgContext,out);
- SOAPEnvelope envelope = msgContext.getEnvelope();
- if (envelope != null) {
- XMLStreamWriter outputWriter = null;
- try {
- outputWriter =
- XMLOutputFactory.newInstance().createXMLStreamWriter(out);
- envelope.serializeWithCache(outputWriter);
- outputWriter.flush();
- out.flush();
- } catch (Exception e) {
- throw new AxisFault("Stream error", e);
- }
- }
- finalizeSending(msgContext,out);
- log.info("Send the Response");
+ Writer out = null;
+
+ EndpointReference epr = null;
+
+ if (msgContext.isProcessingFault()) {
+ // Means we are processing fault
+ if (msgContext.getFaultTo() != null &&
+ !AddressingConstants.EPR_ANONYMOUS_URL.equals(msgContext.getFaultTo().getAddress())) {
+ epr = msgContext.getFaultTo();
+ }
+ } else {
+ if (msgContext.getTo() != null &&
+ !AddressingConstants.EPR_ANONYMOUS_URL.equals(msgContext.getTo().getAddress())) {
+ epr = msgContext.getTo();
+ }
+ }
+
+ if(epr!= null){
+ out = openTheConnection(epr);
+ startSendWithToAddress(msgContext,epr,out);
+ writeMessage(msgContext,out);
+ finalizeSendWithToAddress(msgContext,epr,out);
+ }else{
+ out = (Writer)msgContext.getProperty(MessageContext.TRANSPORT_WRITER);
+ if(out != null){
+ startSendWithOutputStreamFromIncomingConnection(msgContext,out);
+ writeMessage(msgContext,out);
+ finalizeSendWithOutputStreamFromIncomingConnection(msgContext,out);
+ } else{
+ throw new AxisFault("Both the TO and Property MessageContext.TRANSPORT_WRITER is Null, No where to send");
+ }
+ }
}
- /**
- * Method startSending
- *
- * @param msgContext
- * @throws AxisFault
- */
- protected abstract void startSending(MessageContext msgContext,Writer writer) throws AxisFault;
+ public void writeMessage(MessageContext msgContext,Writer out) throws AxisFault{
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ if (envelope != null) {
+ XMLStreamWriter outputWriter = null;
+ try {
+ outputWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+ envelope.serialize(outputWriter);
+ outputWriter.flush();
+ out.flush();
+ } catch (Exception e) {
+ throw new AxisFault("Stream error", e);
+ }
+ }
+ }
- /**
- * Method obtainOutputStream
- *
- * @param msgContext
- * @param epr
- * @return
- * @throws AxisFault
- */
- protected abstract Writer obtainWriter(
- MessageContext msgContext, EndpointReference epr) throws AxisFault;
+ public abstract void startSendWithToAddress(MessageContext msgContext, EndpointReference epr,Writer writer)throws AxisFault;
+ public abstract void finalizeSendWithToAddress(MessageContext msgContext,EndpointReference epr, Writer writer)throws AxisFault;
- /**
- * Method obtainOutputStream
- *
- * @param msgContext
- * @return
- * @throws AxisFault
- */
- protected abstract Writer obtainWriter(MessageContext msgContext)
- throws AxisFault;
+ public abstract void startSendWithOutputStreamFromIncomingConnection(MessageContext msgContext,Writer writer)throws AxisFault;
+ public abstract void finalizeSendWithOutputStreamFromIncomingConnection(MessageContext msgContext,Writer writer)throws AxisFault;
- /**
- * Method finalizeSending
- *
- * @param msgContext
- * @throws AxisFault
- */
- protected abstract void finalizeSending(MessageContext msgContext,Writer writer)
- throws AxisFault ;
+ protected abstract Writer openTheConnection(EndpointReference epr)throws AxisFault;
}
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -53,55 +53,65 @@
* @return
* @throws AxisFault
*/
- protected Writer obtainWriter(MessageContext msgContext)
- throws AxisFault {
+ protected Writer obtainWriter(MessageContext msgContext) throws AxisFault {
if (!msgContext.isServerSide()) {
//create a new byte buffer output stream
- outputStream = new ByteArrayOutputStream();
+ outputStream = new ByteArrayOutputStream();
out = new OutputStreamWriter(outputStream);
} else {
- out = (Writer) msgContext.getProperty(
- MessageContext.TRANSPORT_WRITER);
+ out = (Writer) msgContext.getProperty(MessageContext.TRANSPORT_WRITER);
}
if (out == null) {
- throw new AxisFault(
- "can not find the suffient information to find endpoint");
+ throw new AxisFault("can not find the suffient information to find endpoint");
} else {
return out;
}
}
+
/**
- * Method obtainOutputStream
+ * Method writeTransportHeaders
*
+ * @param out
+ * @param url
* @param msgContext
- * @param epr
- * @return
- * @throws AxisFault
+ * @throws IOException
*/
- protected Writer obtainWriter(
- MessageContext msgContext, EndpointReference epr) throws AxisFault {
-
- // TODO this is temporay work around
- return obtainWriter(msgContext);
+ protected void writeTransportHeaders(
+ Writer out,
+ URL url,
+ MessageContext msgContext,
+ int contentLength)
+ throws IOException {
+ Object soapAction = msgContext.getProperty(MessageContext.SOAP_ACTION);
+ String soapActionString = soapAction == null ? "" : soapAction.toString();
+ StringBuffer buf = new StringBuffer();
+ buf.append("POST ").append(url.getFile()).append(" HTTP/1.0\n");
+ buf.append("Content-Type: text/xml; charset=utf-8\n");
+ buf.append("Accept: application/soap+xml, application/dime, multipart/related, text/*\n");
+ buf.append("Host: ").append(url.getHost()).append("\n");
+ buf.append("Cache-Control: no-cache\n");
+ buf.append("Pragma: no-cache\n");
+ buf.append("Content-Length: " + contentLength + "\n");
+ buf.append("SOAPAction: \"" + soapActionString + "\"\n\n");
+ out.write(buf.toString());
}
- /**
- * Method finalizeSending
- *
- * @param msgContext
- * @throws AxisFault
- */
- protected void finalizeSending(MessageContext msgContext,Writer writer)
- throws AxisFault {
+ public void finalizeSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext,
+ Writer writer) {
+ }
- if (!msgContext.isServerSide()) {
+ public void finalizeSendWithToAddress(MessageContext msgContext, EndpointReference epr,Writer writer)
+ throws AxisFault {
EndpointReference toURL = msgContext.getTo();
if (toURL != null) {
try {
URL url = new URL(toURL.getAddress());
- SocketAddress add = new InetSocketAddress(url.getHost(),
- url.getPort()==-1?80:url.getPort());
+ SocketAddress add =
+ new InetSocketAddress(
+ url.getHost(),
+ url.getPort() == -1 ? 80 : url.getPort());
socket = new Socket();
socket.connect(add);
OutputStream outS = socket.getOutputStream();
@@ -109,15 +119,15 @@
Writer realOut = new OutputStreamWriter(outS);
//write header to the out put stream
- writeTransportHeaders(realOut, url, msgContext,bytes.length);
+ writeTransportHeaders(realOut, url, msgContext, bytes.length);
realOut.flush();
//write the content to the real output stream
outS.write(bytes);
outS.flush();
msgContext.setProperty(
- MessageContext.TRANSPORT_READER,
- new InputStreamReader(socket.getInputStream()));
+ MessageContext.TRANSPORT_READER,
+ new InputStreamReader(socket.getInputStream()));
msgContext.setProperty(HTTPConstants.SOCKET, socket);
socket.shutdownOutput();
@@ -130,42 +140,27 @@
} else {
throw new AxisFault("to EPR must be specified");
}
+ }
- }
-
+ protected Writer openTheConnection(EndpointReference epr) {
+ outputStream = new ByteArrayOutputStream();
+ return new OutputStreamWriter(outputStream);
}
- /**
- * Method startSending
- *
- * @param msgContext
- * @throws AxisFault
- */
- protected void startSending(MessageContext msgContext,Writer out) throws AxisFault {
+ public void startSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext,
+ Writer writer) {
+ 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();
+ }
}
- /**
- * Method writeTransportHeaders
- *
- * @param out
- * @param url
- * @param msgContext
- * @throws IOException
- */
- protected void writeTransportHeaders(Writer out, URL url, MessageContext msgContext,int contentLength)
- throws IOException {
- Object soapAction = msgContext.getProperty(MessageContext.SOAP_ACTION);
- String soapActionString = soapAction==null?"":soapAction.toString();
- StringBuffer buf = new StringBuffer();
- buf.append("POST ").append(url.getFile()).append(" HTTP/1.0\n");
- buf.append("Content-Type: text/xml; charset=utf-8\n");
- buf.append(
- "Accept: application/soap+xml, application/dime, multipart/related, text/*\n");
- buf.append("Host: ").append(url.getHost()).append("\n");
- buf.append("Cache-Control: no-cache\n");
- buf.append("Pragma: no-cache\n");
- buf.append("Content-Length: "+contentLength+"\n");
- buf.append("SOAPAction: \""+soapActionString + "\"\n\n");
- out.write(buf.toString());
+ public void startSendWithToAddress(MessageContext msgContext, EndpointReference epr,Writer writer) {
}
+
}
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=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Wed Apr 27 07:16:36 2005
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
import org.apache.axis.Constants;
+import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisTransportOut;
@@ -43,7 +44,7 @@
* not use multiple instances of this class in the same JVM/classloader unless
* you want bad things to happen at shutdown.
*/
-public class SimpleHTTPServer implements Runnable{
+public class SimpleHTTPServer implements Runnable {
/**
* Field log
*/
@@ -75,7 +76,7 @@
*
* @param reg
*/
- public SimpleHTTPServer(EngineContext reg,ServerSocket serverSoc) {
+ public SimpleHTTPServer(EngineContext reg, ServerSocket serverSoc) {
this.engineReg = reg;
this.serverSocket = serverSoc;
}
@@ -86,13 +87,11 @@
* @param dir
* @throws AxisFault
*/
- public SimpleHTTPServer(String dir,ServerSocket serverSoc) throws AxisFault {
+ public SimpleHTTPServer(String dir, ServerSocket serverSoc) throws AxisFault {
try {
this.serverSocket = serverSoc;
- Class erClass = Class.forName(
- "org.apache.axis.deployment.EngineRegistryFactoryImpl");
- EngineRegistryFactory erfac =
- (EngineRegistryFactory) erClass.newInstance();
+ Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
+ EngineRegistryFactory erfac = (EngineRegistryFactory) erClass.newInstance();
this.engineReg = erfac.createEngineRegistry(dir);
Thread.sleep(2000);
} catch (Exception e1) {
@@ -131,29 +130,36 @@
if (engineReg == null) {
throw new AxisFault("Engine Must be null");
}
- Writer out =
- new OutputStreamWriter(socket.getOutputStream());
- Reader in =
- new InputStreamReader(socket.getInputStream());
- AxisTransportOut transportOut = engineReg.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_HTTP));
+ Writer out = new OutputStreamWriter(socket.getOutputStream());
+ Reader in = new InputStreamReader(socket.getInputStream());
+ AxisTransportOut transportOut =
+ engineReg.getEngineConfig().getTransportOut(
+ new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
- new MessageContext(this.engineReg, null, null,engineReg.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),transportOut);
+ new MessageContext(
+ this.engineReg,
+ null,
+ null,
+ engineReg.getEngineConfig().getTransportIn(
+ new QName(Constants.TRANSPORT_HTTP)),
+ transportOut);
msgContext.setServerSide(true);
-
- out.write(HTTPConstants.HTTP);
- out.write(HTTPConstants.OK);
- out.write("\n\n".toCharArray());
- log.info("status written");
// We do not have any Addressing Headers to put
// let us put the information about incoming transport
- msgContext.setProperty(MessageContext.TRANSPORT_WRITER,
- out);
- msgContext.setProperty(MessageContext.TRANSPORT_READER,
- in);
- HTTPTransportReceiver reciver =
- new HTTPTransportReceiver();
+ msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
+ msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
+ HTTPTransportReceiver reciver = new HTTPTransportReceiver();
reciver.invoke(msgContext);
+
+ if (msgContext.getReplyTo() != null
+ && !AddressingConstants.EPR_ANONYMOUS_URL.equals(
+ msgContext.getReplyTo().getAddress())) {
+ out.write(new String(HTTPConstants.NOCONTENT).toCharArray());
+ out.close();
+ }
+ log.info("status written");
+
}
} catch (Throwable e) {
log.error(e);
@@ -262,8 +268,8 @@
}
ServerSocket serverSoc = null;
serverSoc = new ServerSocket(Integer.parseInt(args[1]));
- SimpleHTTPServer reciver = new SimpleHTTPServer(args[0],serverSoc);
-
+ SimpleHTTPServer reciver = new SimpleHTTPServer(args[0], serverSoc);
+
reciver.setServerSocket(serverSoc);
Thread thread = new Thread(reciver);
thread.setDaemon(true);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailTransportSender.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailTransportSender.java Wed Apr 27 07:16:36 2005
@@ -33,39 +33,14 @@
}
- protected Writer obtainOutputStream(MessageContext msgContext)
- throws AxisFault {
- out = (Writer) msgContext.getProperty(MessageContext.TRANSPORT_WRITER);
- if (out == null) {
- throw new AxisFault(
- "Can not find the suffient information to find end point");
- } else {
- return out;
- }
-
- }
+
protected Writer obtainOutputStream(MessageContext msgContext,
EndpointReference epr) throws AxisFault {
- return obtainOutputStream(msgContext);
- }
-
- protected Writer obtainWriter(MessageContext msgContext) throws AxisFault {
- return obtainOutputStream(msgContext);
- }
-
- protected Writer obtainWriter(MessageContext msgContext,
- EndpointReference epr) throws AxisFault {
- //TODO this is temporay work around
- return obtainOutputStream(msgContext);
- }
-
- protected void finalizeSending(MessageContext msgContext) throws AxisFault {
+ throw new UnsupportedOperationException();
}
- protected void finalizeSending(MessageContext msgContext, Writer writer) throws AxisFault {
- }
-
+
protected void startSending(MessageContext msgContext) throws AxisFault {
try {
Writer writer = (Writer) msgContext
@@ -93,5 +68,58 @@
}
}
+ /* (non-Javadoc)
+ * @see org.apache.axis.transport.AbstractTransportSender#finalizeSendWithOutputStreamFromIncomingConnection(org.apache.axis.context.MessageContext, java.io.Writer)
+ */
+ public void finalizeSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext,
+ Writer writer)
+ throws AxisFault {
+ throw new UnsupportedOperationException();
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.transport.AbstractTransportSender#finalizeSendWithToAddress(org.apache.axis.context.MessageContext, org.apache.axis.addressing.EndpointReference, java.io.Writer)
+ */
+ public void finalizeSendWithToAddress(
+ MessageContext msgContext,
+ EndpointReference epr,
+ Writer writer)
+ throws AxisFault {
+ throw new UnsupportedOperationException();
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.transport.AbstractTransportSender#openTheConnection(org.apache.axis.addressing.EndpointReference)
+ */
+ protected Writer openTheConnection(EndpointReference epr) throws AxisFault {
+ throw new UnsupportedOperationException();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.transport.AbstractTransportSender#startSendWithOutputStreamFromIncomingConnection(org.apache.axis.context.MessageContext, java.io.Writer)
+ */
+ public void startSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext,
+ Writer writer)
+ throws AxisFault {
+ throw new UnsupportedOperationException();
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.transport.AbstractTransportSender#startSendWithToAddress(org.apache.axis.context.MessageContext, org.apache.axis.addressing.EndpointReference, java.io.Writer)
+ */
+ public void startSendWithToAddress(
+ MessageContext msgContext,
+ EndpointReference epr,
+ Writer writer)
+ throws AxisFault {
+ throw new UnsupportedOperationException();
+
+ }
+
}
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -24,9 +24,8 @@
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-import org.apache.axis.context.EngineContext;
import org.apache.axis.context.ContextBuilder;
-import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.context.EngineContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.EngineConfiguration;
import org.apache.commons.logging.Log;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java Wed Apr 27 07:16:36 2005
@@ -16,9 +16,9 @@
package org.apache.axis;
-import junit.framework.TestCase;
-
import java.io.File;
+
+import junit.framework.TestCase;
/**
* Abstract base class for test cases.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/AnyContentTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/AnyContentTypeTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/AnyContentTypeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/AnyContentTypeTest.java Wed Apr 27 07:16:36 2005
@@ -16,9 +16,9 @@
package org.apache.axis.addressing;
-import junit.framework.TestCase;
-
import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
public class AnyContentTypeTest extends TestCase {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/EndpointReferenceTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/EndpointReferenceTypeTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/EndpointReferenceTypeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/addressing/EndpointReferenceTypeTest.java Wed Apr 27 07:16:36 2005
@@ -16,9 +16,9 @@
package org.apache.axis.addressing;
-import junit.framework.TestCase;
-
import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
public class EndpointReferenceTypeTest extends TestCase {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java Wed Apr 27 07:16:36 2005
@@ -16,12 +16,12 @@
package org.apache.axis.deployment;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.description.AxisGlobal;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.description.AxisGlobal;
public class BadModuleTest extends AbstractTestCase {
/**
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java Wed Apr 27 07:16:36 2005
@@ -16,12 +16,12 @@
package org.apache.axis.deployment;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.description.AxisGlobal;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.description.AxisGlobal;
public class BadServerXMLTest extends AbstractTestCase {
/**
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServiceXMLTest.java Wed Apr 27 07:16:36 2005
@@ -16,12 +16,12 @@
package org.apache.axis.deployment;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.description.AxisService;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.description.AxisService;
public class BadServiceXMLTest extends AbstractTestCase {
/**
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java Wed Apr 27 07:16:36 2005
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
+import org.apache.axis.context.ContextBuilder;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.phaseresolver.PhaseException;
-import org.apache.axis.context.ContextBuilder;
public class DeploymentotalTest extends TestCase {
EngineConfiguration er;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java Wed Apr 27 07:16:36 2005
@@ -20,7 +20,6 @@
import javax.xml.stream.XMLStreamException;
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.ContextBuilder;
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler.java Wed Apr 27 07:16:36 2005
@@ -16,14 +16,14 @@
package org.apache.axis.description;
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
public class SpeakingHandler extends AbstractHandler implements Handler {
private Log log = LogFactory.getLog(getClass());
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler1.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler1.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/SpeakingHandler1.java Wed Apr 27 07:16:36 2005
@@ -16,14 +16,14 @@
package org.apache.axis.description;
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
public class SpeakingHandler1 extends AbstractHandler implements Handler {
private Log log = LogFactory.getLog(getClass());
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -1,9 +1,9 @@
package org.apache.axis.handlers.addressing;
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.addressing.om.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/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?rev=164984&r1=164983&r2=164984&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 Apr 27 07:16:36 2005
@@ -1,25 +1,18 @@
package org.apache.axis.handlers.addressing;
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.AnyContentType;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.ServiceName;
-import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.impl.llom.util.XMLComparator;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis.om.impl.llom.util.XMLComparator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
/**
* Copyright 2001-2004 The Apache Software Foundation.
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -1,12 +1,13 @@
package org.apache.axis.handlers.util;
-import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.om.OMFactory;
+import java.io.File;
+import java.io.FileReader;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
-import java.io.FileReader;
-import java.io.File;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AbstractStorageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AbstractStorageTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AbstractStorageTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AbstractStorageTest.java Wed Apr 27 07:16:36 2005
@@ -1,6 +1,7 @@
package org.apache.axis.storage.impl;
import junit.framework.TestCase;
+
import org.apache.axis.storage.AxisStorage;
/*
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AxisMemoryStorageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AxisMemoryStorageTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AxisMemoryStorageTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/storage/impl/AxisMemoryStorageTest.java Wed Apr 27 07:16:36 2005
@@ -1,7 +1,5 @@
package org.apache.axis.storage.impl;
-import junit.framework.TestCase;
-import org.apache.axis.storage.AxisStorage;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStructEncoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStructEncoder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStructEncoder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStructEncoder.java Wed Apr 27 07:16:36 2005
@@ -15,17 +15,18 @@
*/
package encoding.sample1;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMException;
-import org.apache.axis.testUtils.Encoder;
-import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
-import org.xml.sax.ContentHandler;
+import java.io.IOException;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import java.io.IOException;
+
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.om.OMException;
+import org.apache.axis.testUtils.Encoder;
+import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
+import org.xml.sax.ContentHandler;
public class EchoStructEncoder implements Encoder {
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -15,6 +15,9 @@
*/
package encoding.sample1;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
@@ -26,9 +29,6 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
public class EchoStub {
private OMFactory fac;
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EndToEndTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EndToEndTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EndToEndTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EndToEndTest.java Wed Apr 27 07:16:36 2005
@@ -15,9 +15,9 @@
*/
package encoding.sample1;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
/*
* Created on Feb 9, 2005
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadIncreaseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadIncreaseTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadIncreaseTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadIncreaseTest.java Wed Apr 27 07:16:36 2005
@@ -15,9 +15,9 @@
*/
package encoding.sample1;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
/*
* Created on Feb 9, 2005
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadTest.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/LoadTest.java Wed Apr 27 07:16:36 2005
@@ -15,9 +15,9 @@
*/
package encoding.sample1;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
/*
* Created on Feb 9, 2005
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -15,6 +15,9 @@
*/
package encoding.sample1;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
@@ -26,9 +29,6 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
public class Sampler {
private int count;
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropRequestHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropRequestHandler.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropRequestHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropRequestHandler.java Wed Apr 27 07:16:36 2005
@@ -1,12 +1,13 @@
package interop.doclit;
-import interop.util.InteropTO;
import interop.util.Constants;
+import interop.util.InteropTO;
+
+import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayOutputStream;
+import javax.xml.stream.XMLStreamWriter;
import org.apache.axis.om.SOAPEnvelope;
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=164984&r1=164983&r2=164984&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 Wed Apr 27 07:16:36 2005
@@ -1,5 +1,8 @@
package interop.doclit;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
@@ -11,9 +14,6 @@
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/SOAPStructEncoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/SOAPStructEncoder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/SOAPStructEncoder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/SOAPStructEncoder.java Wed Apr 27 07:16:36 2005
@@ -15,15 +15,15 @@
*/
package interop.doclit;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMException;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
import org.xml.sax.ContentHandler;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
public class SOAPStructEncoder implements Encoder {
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/SimpleTypeEncoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/SimpleTypeEncoder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/SimpleTypeEncoder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/SimpleTypeEncoder.java Wed Apr 27 07:16:36 2005
@@ -16,14 +16,14 @@
package interop.doclit;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMException;
-import org.apache.axis.testUtils.Encoder;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMException;
+import org.apache.axis.testUtils.Encoder;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
public class SimpleTypeEncoder implements Encoder {
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ArrayTypeEncoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ArrayTypeEncoder.java?rev=164984&r1=164983&r2=164984&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ArrayTypeEncoder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ArrayTypeEncoder.java Wed Apr 27 07:16:36 2005
@@ -16,16 +16,17 @@
package org.apache.axis.testUtils;
+import java.util.ArrayList;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMConstants;
import org.apache.axis.om.OMException;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.util.ArrayList;
public class ArrayTypeEncoder implements Encoder {
private Object[] obj = null;