You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2005/02/10 07:33:05 UTC
svn commit: r153171 [2/3] - in
webservices/axis/trunk/java/dev/scratch/prototype2/src:
java/org/apache/axis/clientapi/ java/org/apache/axis/context/
java/org/apache/axis/deployment/
java/org/apache/axis/deployment/repository/utill/
java/org/apache/axis/description/ java/org/apache/axis/engine/
java/org/apache/axis/handlers/ java/org/apache/axis/impl/
java/org/apache/axis/om/impl/ java/org/apache/axis/om/impl/llom/
java/org/apache/axis/om/impl/llom/builder/
java/org/apache/axis/om/impl/llom/exception/
java/org/apache/axis/om/impl/llom/factory/
java/org/apache/axis/om/impl/llom/serialize/
java/org/apache/axis/om/impl/llom/traverse/
java/org/apache/axis/om/impl/llom/util/ java/org/apache/axis/phaseresolver/
java/org/apache/axis/providers/ java/org/apache/axis/receivers/
java/org/apache/axis/transport/ java/org/apache/axis/transport/http/
java/org/apache/axis/transport/tcp/
samples/encoding/sample1/src/org/apache/axis/sample/echo/
test/org/apache/axis/clientapi/ test/org/apache/axis/deployment/
test/org/apache/axis/description/ test/org/apache/axis/engine/
test/org/apache/axis/integration/ test/org/apache/axis/misc/
test/org/apache/axis/om/ test/org/apache/axis/om/builder/
test/org/apache/axis/om/factory/ test/org/apache/axis/om/impl/builder/
test/org/apache/axis/om/impl/seriliazer/
test/org/apache/axis/om/impl/streamwrapper/
test/org/apache/axis/om/impl/traverse/
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java Wed Feb 9 22:32:42 2005
@@ -1,12 +1,12 @@
-package org.apache.axis.impl.llom.serialize;
-
-import org.apache.axis.om.OMSerializer;
-import org.apache.axis.om.OMException;
+package org.apache.axis.om.impl.llom.serialize;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMSerializer;
//import java.util.Stack;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenIterator.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenIterator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenIterator.java Wed Feb 9 22:32:42 2005
@@ -1,9 +1,9 @@
-package org.apache.axis.impl.llom.traverse;
+package org.apache.axis.om.impl.llom.traverse;
+
+import java.util.Iterator;
import org.apache.axis.om.OMException;
import org.apache.axis.om.OMNode;
-
-import java.util.Iterator;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenQNameIterator.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenQNameIterator.java Wed Feb 9 22:32:42 2005
@@ -1,9 +1,9 @@
-package org.apache.axis.impl.llom.traverse;
-
-import org.apache.axis.impl.llom.OMNamedNodeImpl;
-import org.apache.axis.om.OMNode;
+package org.apache.axis.om.impl.llom.traverse;
import javax.xml.namespace.QName;
+
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.impl.llom.OMNamedNodeImpl;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java Wed Feb 9 22:32:42 2005
@@ -1,10 +1,10 @@
-package org.apache.axis.impl.llom.traverse;
+package org.apache.axis.om.impl.llom.traverse;
+
+import javax.xml.namespace.QName;
import org.apache.axis.om.OMAttribute;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMNode;
-
-import javax.xml.namespace.QName;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/util/StreamWriterToContentHandlerConverter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/util/StreamWriterToContentHandlerConverter.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/util/StreamWriterToContentHandlerConverter.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/impl/llom/util/StreamWriterToContentHandlerConverter.java Wed Feb 9 22:32:42 2005
@@ -1,4 +1,4 @@
-package org.apache.axis.impl.llom.util;
+package org.apache.axis.om.impl.llom.util;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java Wed Feb 9 22:32:42 2005
@@ -1,19 +1,19 @@
package org.apache.axis.phaseresolver;
+import java.util.ArrayList;
+import java.util.Vector;
+
import org.apache.axis.deployment.DeploymentConstants;
import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
-import org.apache.axis.engine.Phase;
import org.apache.axis.engine.Handler;
-import org.apache.axis.impl.description.AxisService;
+import org.apache.axis.engine.Phase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
-import java.util.Vector;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java Wed Feb 9 22:32:42 2005
@@ -1,8 +1,8 @@
package org.apache.axis.phaseresolver;
-import org.apache.axis.description.HandlerMetaData;
-
import java.util.Vector;
+
+import org.apache.axis.description.HandlerMetaData;
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java Wed Feb 9 22:32:42 2005
@@ -1,15 +1,20 @@
package org.apache.axis.phaseresolver;
-import org.apache.axis.description.*;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
-import org.apache.axis.impl.description.AxisService;
-
-import javax.xml.namespace.QName;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
-import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransport;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/AbstractProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/AbstractProvider.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/AbstractProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/AbstractProvider.java Wed Feb 9 22:32:42 2005
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.axis.impl.providers;
+package org.apache.axis.providers;
+
+import javax.xml.namespace.QName;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.Provider;
-
-import javax.xml.namespace.QName;
/**
* This is the Absract provider. It is just a another handler. the
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java Wed Feb 9 22:32:42 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis.impl.providers;
+package org.apache.axis.providers;
import java.lang.reflect.Method;
@@ -22,10 +22,10 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
+import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Provider;
-import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMUtils;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/SimpleJavaProvider.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/SimpleJavaProvider.java Wed Feb 9 22:32:42 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis.impl.providers;
+package org.apache.axis.providers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -25,20 +25,19 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
import org.apache.axis.encoding.Encoder;
import org.apache.axis.encoding.SimpleTypeEncoder;
import org.apache.axis.encoding.SimpleTypeEncodingUtils;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Provider;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.llom.builder.ObjectToOMBuilder;
import org.apache.axis.om.OMConstants;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMNamespace;
-
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.ObjectToOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/INReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/INReceiver.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/INReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/INReceiver.java Wed Feb 9 22:32:42 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis.impl.receivers;
+package org.apache.axis.receivers;
public class INReceiver {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java Wed Feb 9 22:32:42 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis.impl.receivers;
+package org.apache.axis.receivers;
public class InOutAsyncReceiver {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutSyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutSyncReceiver.java?view=diff&r1=153162&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutSyncReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/receivers/InOutSyncReceiver.java Wed Feb 9 22:32:42 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis.impl.receivers;
+package org.apache.axis.receivers;
import javax.xml.namespace.QName;
@@ -24,7 +24,7 @@
import org.apache.axis.engine.Provider;
import org.apache.axis.engine.Receiver;
import org.apache.axis.engine.Sender;
-import org.apache.axis.impl.handlers.AbstractHandler;
+import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java Wed Feb 9 22:32:42 2005
@@ -17,18 +17,18 @@
package org.apache.axis.transport;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
/**
* This is a simple implementation of an HTTP server for processing
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java Wed Feb 9 22:32:42 2005
@@ -27,7 +27,7 @@
import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.TransportSender;
-import org.apache.axis.impl.handlers.AbstractHandler;
+import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.transport.http;
+
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.addressing.AddressingConstants;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisEngine;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.axis.engine.TransportSenderLocator;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXBuilder;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+
+
+
+
+public class AxisServlet extends HttpServlet{
+ private EngineRegistry engineRegistry;
+
+ public void init(ServletConfig config) throws ServletException {
+ try {
+ ServletContext context = config.getServletContext();
+ String repoDir = context.getRealPath("/WEB-INF");
+ engineRegistry = EngineRegistryFactory.createEngineRegistry(repoDir);
+ } catch (AxisFault e) {
+ throw new ServletException(e);
+ }
+ }
+
+
+
+
+ /* (non-Javadoc)
+ * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ */
+ protected void doPost(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+ try {
+ res.setContentType("text/xml; charset=utf-8");
+ AxisEngine engine = new AxisEngine(engineRegistry);
+ MessageContext msgContext = new MessageContext(engineRegistry);
+ msgContext.setServerSide(true);
+ String filePart = req.getRequestURL().toString();
+ msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,filePart));
+
+ String soapActionString = req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
+ if (soapActionString != null) {
+ msgContext.setProperty(MessageContext.SOAP_ACTION, soapActionString);
+ }
+
+ InputStreamReader isr = new InputStreamReader(req.getInputStream());
+ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(isr);
+ StAXBuilder builder = new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
+ msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
+
+ storeOutputInfo(msgContext, res.getOutputStream());
+ engine.receive(msgContext);
+ } catch (AxisFault e) {
+ throw new ServletException(e);
+ } catch (XMLStreamException e) {
+ throw new ServletException(e);
+ } catch (FactoryConfigurationError e) {
+ throw new ServletException(e);
+ }
+
+ }
+
+ protected void storeOutputInfo(MessageContext msgContext,
+ OutputStream out) throws AxisFault {
+// try {
+ // Send it on its way...
+// out.write(HTTPConstants.HTTP);
+// out.write(HTTPConstants.OK);
+// out.write("\n\n".getBytes());
+ //We do not have any Addressing Headers to put
+ //let us put the information about incoming transport
+ msgContext.setProperty(MessageContext.TRANSPORT_TYPE,
+ TransportSenderLocator.TRANSPORT_HTTP);
+ msgContext.setProperty(MessageContext.TRANSPORT_DATA, out);
+// } catch (IOException e) {
+// throw AxisFault.makeFault(e);
+// }
+ }
+
+
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPConstants.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPConstants.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPConstants.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.transport.http;
+
+/**
+ * HTTP protocol and message context constants.
+ */
+public class HTTPConstants {
+ /**
+ * The MessageContext transport ID of HTTP.
+ * (Maybe this should be more specific, like "http_servlet",
+ * whaddya think? - todo by Jacek)
+ */
+
+ public static final String HEADER_PROTOCOL_10 = "HTTP/1.0";
+ public static final String HEADER_PROTOCOL_11 = "HTTP/1.1";
+ public static final String HEADER_PROTOCOL_V10 = "1.0".intern();
+ public static final String HEADER_PROTOCOL_V11 = "1.1".intern();
+ public static final String HEADER_POST = "POST";
+ public static final String HEADER_HOST = "Host";
+ public static final String HEADER_CONTENT_DESCRIPTION = "Content-Description";
+ public static final String HEADER_CONTENT_TYPE = "Content-Type";
+ public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+ public static final String HEADER_CONTENT_TYPE_JMS = "ContentType";
+ public static final String HEADER_CONTENT_LENGTH = "Content-Length";
+ public static final String HEADER_CONTENT_LOCATION = "Content-Location";
+ public static final String HEADER_CONTENT_ID = "Content-Id";
+ public static final String HEADER_SOAP_ACTION = "SOAPAction";
+ public static final String HEADER_AUTHORIZATION = "Authorization";
+ public static final String HEADER_PROXY_AUTHORIZATION = "Proxy-Authorization";
+ public static final String HEADER_EXPECT = "Expect";
+ public static final String HEADER_EXPECT_100_Continue = "100-continue";
+ public static final String HEADER_USER_AGENT = "User-Agent";
+ public static final String HEADER_CACHE_CONTROL = "Cache-Control";
+ public static final String HEADER_CACHE_CONTROL_NOCACHE = "no-cache";
+ public static final String HEADER_PRAGMA = "Pragma";
+ public static final String HEADER_LOCATION = "Location";
+
+
+ public static final String REQUEST_HEADERS = "HTTP-Request-Headers";
+ public static final String RESPONSE_HEADERS = "HTTP-Response-Headers";
+
+ /*http 1.1*/
+ public static final String HEADER_TRANSFER_ENCODING = "Transfer-Encoding".intern();
+ public static final String HEADER_TRANSFER_ENCODING_CHUNKED = "chunked".intern();
+
+ public static final String HEADER_CONNECTION = "Connection";
+ public static final String HEADER_CONNECTION_CLOSE = "close".intern();
+ public static final String HEADER_CONNECTION_KEEPALIVE = "Keep-Alive".intern();//The default don't send.
+
+ public static final String HEADER_ACCEPT = "Accept";
+ public static final String HEADER_ACCEPT_TEXT_ALL = "text/*";
+ public static final String HEADER_ACCEPT_APPL_SOAP = "application/soap+xml";
+ public static final String HEADER_ACCEPT_MULTIPART_RELATED = "multipart/related";
+ public static final String HEADER_ACCEPT_APPLICATION_DIME = "application/dime";
+
+
+ /**
+ * Cookie headers
+ */
+ public static final String HEADER_COOKIE = "Cookie";
+ public static final String HEADER_COOKIE2 = "Cookie2";
+ public static final String HEADER_SET_COOKIE = "Set-Cookie";
+ public static final String HEADER_SET_COOKIE2 = "Set-Cookie2";
+
+ /**
+ * Integer
+ */
+ public static String MC_HTTP_STATUS_CODE = "transport.http.statusCode";
+
+ /**
+ * String
+ */
+ public static String MC_HTTP_STATUS_MESSAGE = "transport.http.statusMessage";
+
+ /**
+ * HttpServlet
+ */
+ public static String MC_HTTP_SERVLET = "transport.http.servlet";
+
+ /**
+ * HttpServletRequest
+ */
+ public static String MC_HTTP_SERVLETREQUEST = "transport.http.servletRequest";
+ /**
+ * HttpServletResponse
+ */
+ public static String MC_HTTP_SERVLETRESPONSE = "transport.http.servletResponse";
+ public static String MC_HTTP_SERVLETLOCATION = "transport.http.servletLocation";
+ public static String MC_HTTP_SERVLETPATHINFO = "transport.http.servletPathInfo";
+
+
+ /**
+ * HTTP header field values
+ */
+ public static final String HEADER_DEFAULT_CHAR_ENCODING = "iso-8859-1";
+
+ /**
+ * AXIS servlet plugin parameter names.
+ */
+
+ public static final String PLUGIN_NAME = "transport.http.plugin.pluginName";
+ public static final String PLUGIN_SERVICE_NAME = "transport.http.plugin.serviceName";
+ public static final String PLUGIN_IS_DEVELOPMENT = "transport.http.plugin.isDevelopment";
+ public static final String PLUGIN_ENABLE_LIST = "transport.http.plugin.enableList";
+ public static final String PLUGIN_ENGINE = "transport.http.plugin.engine";
+ public static final String PLUGIN_WRITER = "transport.http.plugin.writer";
+ public static final String PLUGIN_LOG = "transport.http.plugin.log";
+ public static final String PLUGIN_EXCEPTION_LOG = "transport.http.plugin.exceptionLog";
+
+
+ public static final byte OK[] = ("200 OK").getBytes();
+ public static final byte NOCONTENT[] = ("202 OK\n\n").getBytes();
+ public static final byte UNAUTH[] = ("401 Unauthorized").getBytes();
+ public static final byte SENDER[] = "400".getBytes();
+ public static final byte ISE[] = ("500 Internal server error").getBytes();
+ // HTTP prefix
+ public static byte HTTP[] = "HTTP/1.0 ".getBytes();
+
+
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPTransportSender.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPTransportSender.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/HTTPTransportSender.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.transport.http;
+
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.transport.AbstractTransportSender;
+
+import java.io.OutputStream;
+
+public class HTTPTransportSender extends AbstractTransportSender {
+ protected OutputStream out;
+
+ public HTTPTransportSender(OutputStream out) {
+ this.out = out;
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext) throws AxisFault {
+ OutputStream out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_DATA);
+ if (out == null) {
+ throw new AxisFault("can not find the suffient information to find endpoint");
+ } else {
+ return out;
+ }
+
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext, EndpointReference epr) throws AxisFault {
+ //TODO this is temporay work around
+ return obtainOutputStream(msgContext);
+ }
+
+ protected void finalizeSending() {
+ }
+
+ protected void startSending() {
+// if(!msgContext.isServerSide()){
+// URL url = (URL)msgContext.getProperty(MessageContext.REQUEST_URL);
+// if(url != null){
+// StringBuffer buf = new StringBuffer();
+// buf.append("POST ").append(url.getFile()).append("HTTP/1.1\n");
+// buf.append("Host: ").append(url.getHost());
+// buf.append("Content-Type: application/soap+xml; charset=\"utf-8\"\n");
+// out.write(buf.toString().getBytes());
+// }else{
+// throw new AxisFault(MessageContext.REQUEST_URL + "where to send ?");
+// }
+// }
+ }
+
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.transport.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class NonBlockingBufferedInputStream extends InputStream {
+
+ // current stream to be processed
+ private InputStream in;
+
+ // maximum number of bytes allowed to be returned.
+ private int remainingContent = Integer.MAX_VALUE;
+
+ // Internal buffer for the input stream
+ private byte[] buffer = new byte[4096];
+ private int offset = 0; // bytes before this offset have been processed
+ private int numbytes = 0; // number of valid bytes in this buffer
+
+ /**
+ * set the input stream to be used for subsequent reads
+ *
+ * @param in the InputStream
+ */
+ public void setInputStream(InputStream in) {
+ this.in = in;
+ numbytes = 0;
+ offset = 0;
+ remainingContent = (in == null) ? 0 : Integer.MAX_VALUE;
+ }
+
+ /**
+ * set the maximum number of bytes allowed to be read from this input
+ * stream.
+ *
+ * @param value the Content Length
+ */
+ public void setContentLength(int value) {
+ if (in != null) this.remainingContent = value - (numbytes - offset);
+ }
+
+ /**
+ * Replenish the buffer with data from the input stream. This is
+ * guaranteed to read atleast one byte or throw an exception. When
+ * possible, it will read up to the length of the buffer
+ * the data is buffered for efficiency.
+ *
+ * @return the byte read
+ */
+ private void refillBuffer() throws IOException {
+ if (remainingContent <= 0 || in == null) return;
+
+ // determine number of bytes to read
+ numbytes = in.available();
+ if (numbytes > remainingContent) numbytes = remainingContent;
+ if (numbytes > buffer.length) numbytes = buffer.length;
+ if (numbytes <= 0) numbytes = 1;
+
+ // actually attempt to read those bytes
+ numbytes = in.read(buffer, 0, numbytes);
+
+ // update internal state to reflect this read
+ remainingContent -= numbytes;
+ offset = 0;
+ }
+
+ /**
+ * Read a byte from the input stream, blocking if necessary. Internally
+ * the data is buffered for efficiency.
+ *
+ * @return the byte read
+ */
+ public int read() throws IOException {
+ if (in == null) return -1;
+ if (offset >= numbytes) refillBuffer();
+ if (offset >= numbytes) return -1;
+ return buffer[offset++] & 0xFF;
+ }
+
+ /**
+ * Read bytes from the input stream. This is guaranteed to return at
+ * least one byte or throw an exception. When possible, it will return
+ * more bytes, up to the length of the array, as long as doing so would
+ * not require waiting on bytes from the input stream.
+ *
+ * @param dest byte array to read into
+ * @return the number of bytes actually read
+ */
+ public int read(byte[] dest) throws IOException {
+ return read(dest, 0, dest.length);
+ }
+
+ /**
+ * Read a specified number of bytes from the input stream. This is
+ * guaranteed to return at least one byte or throw an execption. When
+ * possible, it will return more bytes, up to the length specified,
+ * as long as doing so would not require waiting on bytes from the
+ * input stream.
+ *
+ * @param dest byte array to read into
+ * @param off starting offset into the byte array
+ * @param len maximum number of bytes to read
+ * @return the number of bytes actually read
+ */
+ public int read(byte[] dest, int off, int len) throws IOException {
+ int ready = numbytes - offset;
+
+ if (ready >= len) {
+ System.arraycopy(buffer, offset, dest, off, len);
+ offset += len;
+ return len;
+ } else if (ready > 0) {
+ System.arraycopy(buffer, offset, dest, off, ready);
+ offset = numbytes;
+ return ready;
+ } else {
+ if (in == null) return -1;
+ refillBuffer();
+ if (offset >= numbytes) return -1;
+ return read(dest, off, len);
+ }
+ }
+
+ /**
+ * skip over (and discard) a specified number of bytes in this input
+ * stream
+ *
+ * @param len the number of bytes to be skipped
+ * @return the action number of bytes skipped
+ */
+ public int skip(int len) throws IOException {
+ int count = 0;
+ while (len-- > 0 && read() >= 0) count++;
+ return count;
+ }
+
+ /**
+ * return the number of bytes available to be read without blocking
+ *
+ * @return the number of bytes
+ */
+ public int available() throws IOException {
+ if (in == null) return 0;
+
+ // return buffered + available from the stream
+ return (numbytes - offset) + in.available();
+ }
+
+ /**
+ * disassociate from the underlying input stream
+ */
+ public void close() throws IOException {
+ setInputStream(null);
+ }
+
+ /**
+ * Just like read except byte is not removed from the buffer.
+ * the data is buffered for efficiency.
+ * Was added to support multiline http headers. ;-)
+ *
+ * @return the byte read
+ */
+ public int peek() throws IOException {
+ if (in == null) return -1;
+ if (offset >= numbytes) refillBuffer();
+ if (offset >= numbytes) return -1;
+ return buffer[offset] & 0xFF;
+ }
+}
+
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPReceiver.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPReceiver.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPReceiver.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,549 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.transport.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.addressing.AddressingConstants;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisEngine;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.axis.engine.TransportSenderLocator;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXBuilder;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.transport.AbstractTransportReceiver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class SimpleHTTPReceiver
+ extends AbstractTransportReceiver
+ implements Runnable {
+ protected static Log log =
+ LogFactory.getLog(SimpleHTTPReceiver.class.getName());
+
+ protected static String transportName = "SimpleHTTP";
+
+ // Standard MIME headers for XML payload
+ protected static byte XML_MIME_STUFF[] =
+ ("\r\nContent-Type: text/xml; charset=utf-8\r\n" + "Content-Length: ")
+ .getBytes();
+
+ // Standard MIME headers for HTML payload
+ protected static byte HTML_MIME_STUFF[] =
+ ("\r\nContent-Type: text/html; charset=utf-8\r\n" + "Content-Length: ")
+ .getBytes();
+
+ // Mime/Content separator
+ protected static byte SEPARATOR[] = "\r\n\r\n".getBytes();
+
+ // Tiddly little response
+ // protected static final String responseStr =
+ // "<html><head><title>SimpleAxisServer</title></head>" +
+ // "<body><h1>SimpleAxisServer</h1>" +
+ // Messages.getEnvelope("reachedServer00") +
+ // "</html>";
+ // protected static byte cannedHTMLResponse[] = responseStr.getBytes();
+
+ // ASCII character mapping to lower case
+ protected static final byte[] toLower = new byte[256];
+
+ static {
+ for (int i = 0; i < 256; i++) {
+ toLower[i] = (byte) i;
+ }
+
+ for (int lc = 'a'; lc <= 'z'; lc++) {
+ toLower[lc + 'A' - 'a'] = (byte) lc;
+ }
+ }
+
+ // buffer for IO
+ protected static final int BUFSIZ = 4096;
+
+ // mime header for content length
+ protected static final byte lenHeader[] = "content-length: ".getBytes();
+ protected static final int lenLen = lenHeader.length;
+
+ // mime header for content type
+ protected static final byte typeHeader[] =
+ (HTTPConstants.HEADER_CONTENT_TYPE.toLowerCase() + ": ").getBytes();
+ protected static final int typeLen = typeHeader.length;
+
+ // mime header for content location
+ protected static final byte locationHeader[] =
+ (HTTPConstants.HEADER_CONTENT_LOCATION.toLowerCase() + ": ").getBytes();
+ protected static final int locationLen = locationHeader.length;
+
+ // mime header for soap action
+ protected static final byte actionHeader[] = "soapaction: ".getBytes();
+ protected static final int actionLen = actionHeader.length;
+
+ // mime header for cookie
+ protected static final byte cookieHeader[] = "cookie: ".getBytes();
+ protected static final int cookieLen = cookieHeader.length;
+
+ // mime header for cookie2
+ protected static final byte cookie2Header[] = "cookie2: ".getBytes();
+ protected static final int cookie2Len = cookie2Header.length;
+
+ // HTTP header for authentication
+ protected static final byte authHeader[] = "authorization: ".getBytes();
+ protected static final int authLen = authHeader.length;
+
+ // mime header for GET
+ protected static final byte getHeader[] = "GET".getBytes();
+
+ // mime header for POST
+ protected static final byte postHeader[] = "POST".getBytes();
+
+ // header ender
+ protected static final byte headerEnder[] = ": ".getBytes();
+
+ // "Basic" auth string
+ protected static final byte basicAuth[] = "basic ".getBytes();
+
+ /**
+ * @param myAxisServer
+ */
+ public SimpleHTTPReceiver(EngineRegistry reg) {
+ super(reg);
+ }
+
+ public SimpleHTTPReceiver(String dir) throws AxisFault {
+ EngineRegistry er = EngineRegistryFactory.createEngineRegistry(dir);
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e1) {
+ throw new AxisFault("Thread interuptted", e1);
+ }
+ this.engineReg = er;
+
+ }
+
+ /**
+ * The main workhorse method.
+ */
+
+ protected void invokeMethodFromGet(String methodName, String args)
+ throws Exception {
+
+ }
+
+ /**
+ * Read all mime headers, returning the value of Content-Length and
+ * SOAPAction.
+ *
+ * @param is InputStream to read from
+ * @param contentType The content type.
+ * @param contentLocation The content location
+ * @param soapAction StringBuffer to return the soapAction into
+ * @param httpRequest StringBuffer for GET / POST
+ * @param cookie first cookie header (if doSessions)
+ * @param cookie2 second cookie header (if doSessions)
+ * @return Content-Length
+ */
+ protected int parseHeaders(
+ NonBlockingBufferedInputStream is,
+ byte buf[],
+ StringBuffer contentType,
+ StringBuffer contentLocation,
+ StringBuffer soapAction,
+ StringBuffer httpRequest,
+ StringBuffer fileName,
+ StringBuffer cookie,
+ StringBuffer cookie2,
+ StringBuffer authInfo)
+ // MimeHeaders headers)
+ throws java.io.IOException {
+ int n;
+ int len = 0;
+
+ // parse first line as GET or POST
+ n = this.readLine(is, buf, 0, buf.length);
+ if (n < 0) {
+ // nothing!
+ throw new java.io.IOException("Unexpected end of stream");
+ }
+
+ // which does it begin with?
+ httpRequest.delete(0, httpRequest.length());
+ fileName.delete(0, fileName.length());
+ contentType.delete(0, contentType.length());
+ contentLocation.delete(0, contentLocation.length());
+
+ if (buf[0] == getHeader[0]) {
+ httpRequest.append("GET");
+ for (int i = 0; i < n - 5; i++) {
+ char c = (char) (buf[i + 5] & 0x7f);
+ if (c == ' ')
+ break;
+ fileName.append(c);
+ }
+ return 0;
+ } else if (buf[0] == postHeader[0]) {
+ httpRequest.append("POST");
+ for (int i = 0; i < n - 6; i++) {
+ char c = (char) (buf[i + 6] & 0x7f);
+ if (c == ' ')
+ break;
+ fileName.append(c);
+ }
+ } else {
+ throw new java.io.IOException(
+ "Cannot handle non-GET, non-POST request");
+ }
+
+ while ((n = readLine(is, buf, 0, buf.length)) > 0) {
+
+ if ((n <= 2) && (buf[0] == '\n' || buf[0] == '\r') && (len > 0))
+ break;
+
+ // RobJ gutted the previous logic; it was too hard to extend for more headers.
+ // Now, all it does is search forwards for ": " in the buf,
+ // then do a length / byte compare.
+ // Hopefully this is still somewhat efficient (Sam is watching!).
+
+ // First, search forwards for ": "
+ int endHeaderIndex = 0;
+ while (endHeaderIndex < n
+ && toLower[buf[endHeaderIndex]] != headerEnder[0]) {
+ endHeaderIndex++;
+ }
+ endHeaderIndex += 2;
+ // endHeaderIndex now points _just past_ the ": ", and is
+ // comparable to the various lenLen, actionLen, etc. values
+
+ // convenience; i gets pre-incremented, so initialize it to one less
+ int i = endHeaderIndex - 1;
+
+ // which header did we find?
+ if (endHeaderIndex == lenLen && matches(buf, lenHeader)) {
+ // parse content length
+
+ while ((++i < n) && (buf[i] >= '0') && (buf[i] <= '9')) {
+ len = (len * 10) + (buf[i] - '0');
+ }
+ // headers.addHeader(HTTPConstants.HEADER_CONTENT_LENGTH, String.valueOf(len));
+
+ } else if (
+ endHeaderIndex == actionLen && matches(buf, actionHeader)) {
+
+ soapAction.delete(0, soapAction.length());
+ // skip initial '"'
+ i++;
+ while ((++i < n) && (buf[i] != '"')) {
+ soapAction.append((char) (buf[i] & 0x7f));
+ }
+ // headers.addHeader(HTTPConstants.HEADER_SOAP_ACTION, "\"" + soapAction.toString() + "\"");
+
+ } else if (endHeaderIndex == authLen && matches(buf, authHeader)) {
+ if (matches(buf, endHeaderIndex, basicAuth)) {
+ i += basicAuth.length;
+ while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
+ if (buf[i] == ' ')
+ continue;
+ authInfo.append((char) (buf[i] & 0x7f));
+ }
+ // headers.addHeader(HTTPConstants.HEADER_AUTHORIZATION, new String(basicAuth) + authInfo.toString());
+ } else {
+ throw new java.io.IOException(
+ "Bad authentication type (I can only handle \"Basic\")");
+ }
+ } else if (
+ endHeaderIndex == locationLen
+ && matches(buf, locationHeader)) {
+ while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
+ if (buf[i] == ' ')
+ continue;
+ contentLocation.append((char) (buf[i] & 0x7f));
+ }
+ // headers.addHeader(HTTPConstants.HEADER_CONTENT_LOCATION, contentLocation.toString());
+ } else if (endHeaderIndex == typeLen && matches(buf, typeHeader)) {
+ while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
+ if (buf[i] == ' ')
+ continue;
+ contentType.append((char) (buf[i] & 0x7f));
+ }
+ // headers.addHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentLocation.toString());
+ } else {
+ String customHeaderName =
+ new String(buf, 0, endHeaderIndex - 2);
+ StringBuffer customHeaderValue = new StringBuffer();
+ while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
+ if (buf[i] == ' ')
+ continue;
+ customHeaderValue.append((char) (buf[i] & 0x7f));
+ }
+ // headers.addHeader(customHeaderName, customHeaderValue.toString());
+ }
+
+ }
+ return len;
+ }
+
+ /**
+ * does tolower[buf] match the target byte array, up to the target's length?
+ */
+ public boolean matches(byte[] buf, byte[] target) {
+ for (int i = 0; i < target.length; i++) {
+ if (toLower[buf[i]] != target[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Case-insensitive match of a target byte [] to a source byte [],
+ * starting from a particular offset into the source.
+ */
+ public boolean matches(byte[] buf, int bufIdx, byte[] target) {
+ for (int i = 0; i < target.length; i++) {
+ if (toLower[buf[bufIdx + i]] != target[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * output an integer into the output stream
+ *
+ * @param out OutputStream to be written to
+ * @param value Integer value to be written.
+ */
+ protected void putInt(byte buf[], OutputStream out, int value)
+ throws java.io.IOException {
+ int len = 0;
+ int offset = buf.length;
+
+ // negative numbers
+ if (value < 0) {
+ buf[--offset] = (byte) '-';
+ value = -value;
+ len++;
+ }
+
+ // zero
+ if (value == 0) {
+ buf[--offset] = (byte) '0';
+ len++;
+ }
+
+ // positive numbers
+ while (value > 0) {
+ buf[--offset] = (byte) (value % 10 + '0');
+ value /= 10;
+ len++;
+ }
+
+ // write the result
+ out.write(buf, offset, len);
+ }
+
+ /**
+ * Read a single line from the input stream
+ *
+ * @param is inputstream to read from
+ * @param b byte array to read into
+ * @param off starting offset into the byte array
+ * @param len maximum number of bytes to read
+ */
+ protected int readLine(
+ NonBlockingBufferedInputStream is,
+ byte[] b,
+ int off,
+ int len)
+ throws java.io.IOException {
+ int count = 0, c;
+
+ while ((c = is.read()) != -1) {
+ if (c != '\n' && c != '\r') {
+ b[off++] = (byte) c;
+ count++;
+ }
+ if (count == len)
+ break;
+ if ('\n' == c) {
+ int peek = is.peek();
+ //If the next line begins with tab or space then this is a continuation.
+ if (peek != ' ' && peek != '\t')
+ break;
+ }
+ }
+ return count > 0 ? count : -1;
+ }
+
+ protected MessageContext parseTheTransport(
+ AxisEngine engine,
+ InputStream in)
+ throws AxisFault {
+ byte buf[] = new byte[BUFSIZ];
+ // create an Axis server
+
+ MessageContext msgContext = new MessageContext(this.engineReg);
+ msgContext.setServerSide(true);
+
+ // Reusuable, buffered, content length controlled, InputStream
+ NonBlockingBufferedInputStream is =
+ new NonBlockingBufferedInputStream();
+
+ // buffers for the headers we care about
+ StringBuffer soapAction = new StringBuffer();
+ StringBuffer httpRequest = new StringBuffer();
+ StringBuffer fileName = new StringBuffer();
+ StringBuffer cookie = new StringBuffer();
+ StringBuffer cookie2 = new StringBuffer();
+ StringBuffer authInfo = new StringBuffer();
+ StringBuffer contentType = new StringBuffer();
+ StringBuffer contentLocation = new StringBuffer();
+
+ try {
+ // assume the best
+ byte[] status = HTTPConstants.OK;
+
+ // assume we're not getting WSDL
+ boolean doWsdl = false;
+
+ // cookie for this session, if any
+ String cooky = null;
+
+ String methodName = null;
+
+ authInfo.delete(0, authInfo.length());
+
+ // read headers
+ is.setInputStream(in);
+ // parse all headers into hashtable
+ int contentLength =
+ parseHeaders(
+ is,
+ buf,
+ contentType,
+ contentLocation,
+ soapAction,
+ httpRequest,
+ fileName,
+ cookie,
+ cookie2,
+ authInfo);
+ is.setContentLength(contentLength);
+
+ int paramIdx = fileName.toString().indexOf('?');
+ if (paramIdx != -1) {
+ // Got params
+ String params = fileName.substring(paramIdx + 1);
+ fileName.setLength(paramIdx);
+
+ if ("wsdl".equalsIgnoreCase(params))
+ doWsdl = true;
+
+ if (params.startsWith("method=")) {
+ methodName = params.substring(7);
+ }
+ }
+
+ String filePart = fileName.toString();
+ msgContext.setTo(
+ new EndpointReference(AddressingConstants.WSA_TO, filePart));
+
+ if (httpRequest.toString().equals("GET")) {
+ throw new UnsupportedOperationException("GET not supported");
+ } else {
+
+ // this may be "" if either SOAPAction: "" or if no SOAPAction at all.
+ // for now, do not complain if no SOAPAction at all
+ String soapActionString = soapAction.toString();
+ if (soapActionString != null) {
+ msgContext.setProperty(
+ MessageContext.SOAP_ACTION,
+ soapActionString);
+ }
+
+ InputStreamReader isr = new InputStreamReader(is);
+ XMLStreamReader reader =
+ XMLInputFactory.newInstance().createXMLStreamReader(isr);
+ StAXBuilder builder =
+ new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
+ msgContext.setEnvelope(
+ (SOAPEnvelope) builder.getDocumentElement());
+
+ return msgContext;
+ }
+ } catch (IOException e) {
+ throw AxisFault.makeFault(e);
+ } catch (XMLStreamException e) {
+ throw AxisFault.makeFault(e);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.impl.transport.AbstractTransportReceiver#storeOutputInfo(org.apache.axis.context.MessageContext, java.io.OutputStream)
+ */
+ protected void storeOutputInfo(MessageContext msgContext, OutputStream out)
+ throws AxisFault {
+ try {
+ // Send it on its way...
+ out.write(HTTPConstants.HTTP);
+ out.write(HTTPConstants.OK);
+ out.write("\n\n".getBytes());
+ 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_TYPE,
+ TransportSenderLocator.TRANSPORT_HTTP);
+ msgContext.setProperty(MessageContext.TRANSPORT_DATA, out);
+ } catch (IOException e) {
+ throw AxisFault.makeFault(e);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ if (args.length != 2) {
+ System.out.println("SimpeHttpReciver repositoryLocation port");
+ }
+ SimpleHTTPReceiver reciver = new SimpleHTTPReceiver(args[0]);
+
+ ServerSocket serverSoc = null;
+ serverSoc = new ServerSocket(Integer.parseInt(args[1]));
+ reciver.setServerSocket(serverSoc);
+ Thread thread = new Thread(reciver);
+ thread.setDaemon(true);
+
+ try {
+ thread.start();
+ System.in.read();
+ } finally {
+ reciver.stop();
+
+ }
+ }
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTransportReceiver.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTransportReceiver.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTransportReceiver.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.transport.tcp;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisEngine;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.TransportSenderLocator;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXBuilder;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.transport.AbstractTransportReceiver;
+
+/**
+ * @version $Rev: $ $Date: $
+ */
+
+public class TCPTransportReceiver extends AbstractTransportReceiver {
+ public TCPTransportReceiver(EngineRegistry reg) {
+ super(reg);
+ }
+
+ protected MessageContext parseTheTransport(AxisEngine engine,
+ InputStream in)
+ throws AxisFault {
+ try {
+ MessageContext msgContext = new MessageContext(this.engineReg);
+ InputStreamReader isr = new InputStreamReader(in);
+ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(isr);
+ StAXBuilder builder = new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
+ msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
+
+ return msgContext;
+ } catch (XMLStreamException e) {
+ throw AxisFault.makeFault(e);
+ }
+ }
+
+ protected void storeOutputInfo(MessageContext msgContext, OutputStream out)
+ throws AxisFault {
+ // Send it on its way...
+ //We do not have any Addressing Headers to put
+ //let us put the information about incoming transport
+ msgContext.setProperty(MessageContext.TRANSPORT_TYPE,
+ TransportSenderLocator.TRANSPORT_TCP);
+ msgContext.setProperty(MessageContext.TRANSPORT_DATA, out);
+
+ }
+
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTrasnportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTrasnportSender.java?view=auto&rev=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTrasnportSender.java (added)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/tcp/TCPTrasnportSender.java Wed Feb 9 22:32:42 2005
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.transport.tcp;
+
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.transport.AbstractTransportSender;
+
+import java.io.OutputStream;
+
+public class TCPTrasnportSender extends AbstractTransportSender {
+ protected OutputStream out;
+
+ public TCPTrasnportSender(OutputStream out) {
+ this.out = out;
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext) throws AxisFault {
+ OutputStream out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_DATA);
+ if (out == null) {
+ throw new AxisFault("can not find the suffient information to find endpoint");
+ } else {
+ return out;
+ }
+
+ }
+
+ protected OutputStream obtainOutputStream(MessageContext msgContext, EndpointReference epr) throws AxisFault {
+ return obtainOutputStream(msgContext);
+ }
+
+ protected void finalizeSending() {
+ }
+
+ protected void startSending() {
+ }
+
+}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoProvider.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoProvider.java Wed Feb 9 22:32:42 2005
@@ -13,18 +13,18 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.encoding.Encoder;
import org.apache.axis.encoding.ArrayTypeEncoder;
+import org.apache.axis.encoding.Encoder;
import org.apache.axis.encoding.SimpleTypeEncoder;
import org.apache.axis.encoding.SimpleTypeEncodingUtils;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.impl.llom.builder.ObjectToOMBuilder;
-import org.apache.axis.impl.providers.SimpleJavaProvider;
import org.apache.axis.om.OMConstants;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.ObjectToOMBuilder;
+import org.apache.axis.providers.SimpleJavaProvider;
public class EchoProvider extends SimpleJavaProvider {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoStructEncoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoStructEncoder.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoStructEncoder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/org/apache/axis/sample/echo/EchoStructEncoder.java Wed Feb 9 22:32:42 2005
@@ -17,7 +17,6 @@
import org.apache.axis.encoding.SimpleTypeEncodingUtils;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMException;
-
import org.xml.sax.ContentHandler;
public class EchoStructEncoder implements Encoder {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java Wed Feb 9 22:32:42 2005
@@ -21,15 +21,15 @@
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.description.SimpleAxisOperationImpl;
import org.apache.axis.engine.Echo;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineUtils;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.impl.providers.RawXMLProvider;
-import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.providers.RawXMLProvider;
+import org.apache.axis.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java Wed Feb 9 22:32:42 2005
@@ -18,15 +18,15 @@
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.description.SimpleAxisOperationImpl;
import org.apache.axis.engine.Echo;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineUtils;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.impl.providers.RawXMLProvider;
-import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.providers.RawXMLProvider;
+import org.apache.axis.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BadServiceXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BadServiceXMLTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BadServiceXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BadServiceXMLTest.java Wed Feb 9 22:32:42 2005
@@ -5,7 +5,7 @@
import java.io.InputStream;
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.impl.description.AxisService;
+import org.apache.axis.description.AxisService;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Wed Feb 9 22:32:42 2005
@@ -19,11 +19,11 @@
import org.apache.axis.AbstractTestCase;
import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Provider;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.providers.RawXMLProvider;
+import org.apache.axis.providers.RawXMLProvider;
public class BuildERWithDeploymentTest extends AbstractTestCase {
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/MockFlow.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/MockFlow.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/MockFlow.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/MockFlow.java Wed Feb 9 22:32:42 2005
@@ -17,7 +17,6 @@
package org.apache.axis.description;
import org.apache.axis.engine.EngineUtils;
-import org.apache.axis.impl.description.FlowImpl;
public class MockFlow extends FlowImpl implements Flow {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java Wed Feb 9 22:32:42 2005
@@ -15,21 +15,17 @@
*/
package org.apache.axis.description;
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineRegistryImpl;
import org.apache.axis.engine.Handler;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.description.FlowImpl;
-import org.apache.axis.impl.description.ParameterImpl;
-import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.engine.EngineRegistryImpl;
-import org.apache.axis.impl.handlers.AbstractHandler;
-import org.apache.axis.impl.providers.RawXMLProvider;
-import org.apache.axis.impl.providers.SimpleJavaProvider;
-
-import javax.xml.namespace.QName;
+import org.apache.axis.handlers.AbstractHandler;
+import org.apache.axis.providers.RawXMLProvider;
+import org.apache.axis.providers.SimpleJavaProvider;
public class RegistryTest extends AbstractTestCase{
private EngineRegistry reg;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler.java Wed Feb 9 22:32:42 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.impl.handlers.AbstractHandler;
+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/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler1.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler1.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingHandler1.java Wed Feb 9 22:32:42 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.impl.handlers.AbstractHandler;
+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/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingProvider.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/SpeakingProvider.java Wed Feb 9 22:32:42 2005
@@ -16,14 +16,14 @@
package org.apache.axis.description;
+import java.lang.reflect.Method;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Provider;
-import org.apache.axis.impl.providers.AbstractProvider;
+import org.apache.axis.providers.AbstractProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.lang.reflect.Method;
public class SpeakingProvider extends AbstractProvider implements Provider {
private Log log = LogFactory.getLog(getClass());
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java Wed Feb 9 22:32:42 2005
@@ -23,13 +23,13 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java Wed Feb 9 22:32:42 2005
@@ -27,16 +27,16 @@
import org.apache.axis.clientapi.Callback;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.providers.RawXMLProvider;
-import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.SimpleAxisOperationImpl;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.OMNode;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.providers.RawXMLProvider;
+import org.apache.axis.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java Wed Feb 9 22:32:42 2005
@@ -16,19 +16,19 @@
package org.apache.axis.engine;
//todo
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.providers.SimpleJavaProvider;
-import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.SimpleAxisOperationImpl;
+import org.apache.axis.providers.SimpleJavaProvider;
+import org.apache.axis.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class EchoTest extends AbstractTestCase{
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
@@ -51,7 +51,7 @@
protected void setUp() throws Exception {
AxisGlobal global = new AxisGlobal();
- engineRegistry = new org.apache.axis.impl.engine.EngineRegistryImpl(global);
+ engineRegistry = new org.apache.axis.engine.EngineRegistryImpl(global);
AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java?view=diff&r1=153170&r2=153171
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java Wed Feb 9 22:32:42 2005
@@ -16,14 +16,16 @@
package org.apache.axis.engine;
+import java.io.OutputStream;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
+
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.impl.description.AxisService;
-
-import javax.xml.namespace.QName;
-import java.io.OutputStream;
+import org.apache.axis.description.AxisService;
public class EngineTest extends TestCase{
private QName serviceName = new QName("","EchoService");