Author: rineholt
Date: Fri Mar 17 18:23:00 2006
New Revision: 386791
URL: http://svn.apache.org/viewcvs?rev=386791&view=rev
Log:
Updates to Axis 2.0 .95 SNAPSOT (03/17/06)
Modified:
incubator/tuscany/java/sca/binding.axis2/pom.xml
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClient.java
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/AxiomHelper.java
incubator/tuscany/java/sca/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/util/AxiomHelperTestCase.java
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
incubator/tuscany/java/testing/tomcat/build.xml
Modified: incubator/tuscany/java/sca/binding.axis2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/pom.xml?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/binding.axis2/pom.xml Fri Mar 17 18:23:00 2006
@@ -54,15 +54,42 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-core</artifactId>
- <version>0.94</version>
+ <version>0.95-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>0.95-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>0.95-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ws-commons</groupId>
- <artifactId>ws-policy</artifactId>
- <version>SNAPSHOT</version>
+ <artifactId>policy</artifactId>
+ <version>0.92-SNAPSHOT</version>
<scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClient.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClient.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClient.java
(original)
+++
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/ExternalWebServiceClient.java
Fri Mar 17 18:23:00 2006
@@ -14,32 +14,21 @@
package org.apache.tuscany.binding.axis2.handler;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Method;
-import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.parsers.FactoryConfigurationError;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContextConstants;
-import org.apache.axis2.deployment.AxisConfigBuilder;
-import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurator;
-import org.apache.axis2.om.OMElement;
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import org.apache.tuscany.binding.axis2.util.AxiomHelper;
import org.apache.tuscany.binding.axis2.util.TuscanyAxisConfigurator;
-import org.apache.tuscany.common.resource.ResourceLoader;
-import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.model.assembly.ExternalService;
+import org.apache.ws.commons.om.OMElement;
import org.osoa.sca.ServiceRuntimeException;
import commonj.sdo.helper.TypeHelper;
@@ -134,7 +123,7 @@
String soapAction = operationMetaData.getSOAPAction();
if (soapAction != null) {
- options.setSoapAction(soapAction);
+ options.setAction(soapAction);
}
// If use is encoded assume its an old style service and wont
understand chunking
Modified:
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
Fri Mar 17 18:23:00 2006
@@ -1,49 +1,31 @@
package org.apache.tuscany.binding.axis2.handler;
-import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.ListIterator;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMDocument;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
import org.apache.tuscany.binding.axis2.util.AxiomHelper;
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EntryPointContext;
-import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.model.assembly.EntryPoint;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
import org.apache.wsdl.WSDLConstants;
-import org.eclipse.emf.common.util.UniqueEList;
-
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
import commonj.sdo.helper.TypeHelper;
public class WebServiceEntryPointInOutSyncMessageReceiver extends
AbstractInOutSyncMessageReceiver {
// public static final String MEP_URL =
"http://www.w3.org/2004/08/wsdl/tuscany/in-out";;
- public static final String MEP_URL = WSDLConstants.MEP_URI_OUT_IN;
+ public static final String MEP_URL = WSDLConstants.MEP_URI_IN_OUT;
protected final AggregateContext moduleContext;
Modified:
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
(original)
+++
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
Fri Mar 17 18:23:00 2006
@@ -21,20 +21,14 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
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.servlet.http.HttpSession;
import javax.wsdl.Definition;
import javax.wsdl.Operation;
import javax.wsdl.Port;
@@ -42,22 +36,13 @@
import javax.xml.namespace.QName;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.transport.http.HTTPTransportUtils;
-import org.apache.axis2.transport.http.ListingAgent;
-import org.apache.axis2.transport.http.ServletBasedOutTransportInfo;
+import org.apache.axis2.transport.http.AxisServlet;
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
@@ -71,143 +56,19 @@
/**
* @version $Rev: 383148 $ $Date: 2006-03-04 08:07:17 -0800 (Sat, 04 Mar 2006)
$
*/
-public class WebServiceEntryPointServlet extends HttpServlet {
+public class WebServiceEntryPointServlet extends AxisServlet {
private static final long serialVersionUID = -2085869393709833372L;
-
- private static final String CONFIGURATION_CONTEXT =
"CONFIGURATION_CONTEXT";
-
- public static final String SESSION_ID = "SessionId";
-
- private ConfigurationContext configContext;
-
- private AxisConfiguration axisConfiguration;
-
- private ListingAgent lister;
-
private boolean tuscanyGetDefaultAxis2xmlChecked= false;
- private MessageContext createAndSetInitialParamsToMsgCtxt(SessionContext
sessionContext, MessageContext msgContext, HttpServletResponse
httpServletResponse, HttpServletRequest httpServletRequest) throws AxisFault {
- msgContext = new MessageContext();
- msgContext.setConfigurationContext(configContext);
- msgContext.setSessionContext(sessionContext);
- msgContext.setTransportIn(axisConfiguration.getTransportIn(new
QName(Constants.TRANSPORT_HTTP)));
- msgContext.setTransportOut(axisConfiguration.getTransportOut(new
QName(Constants.TRANSPORT_HTTP)));
-
- msgContext.setProperty(Constants.OUT_TRANSPORT_INFO, new
ServletBasedOutTransportInfo(httpServletResponse));
- msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
getTransportHeaders(httpServletRequest));
- msgContext.setProperty(SESSION_ID,
httpServletRequest.getSession().getId());
- return msgContext;
- }
-
- public void destroy() {
- super.destroy();
- }
-
- protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
- MessageContext msgContext = null;
- OutputStream out = null;
-
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader mycl = getClass().getClassLoader();
- try {
- if (tccl != mycl) {
- Thread.currentThread().setContextClassLoader(mycl);
- }
-
- SessionContext sessionContext = getSessionContext(request);
- Map<String, String> map = request.getParameterMap();
-
- msgContext = createAndSetInitialParamsToMsgCtxt(sessionContext,
msgContext, response, request);
- msgContext.setDoingREST(true);
- msgContext.setServerSide(true);
- out = response.getOutputStream();
-
- boolean processed = HTTPTransportUtils.processHTTPGetRequest(
- msgContext,
- request.getInputStream(),
- out,
- request.getContentType(),
- request.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
- request.getRequestURL().toString(),
- configContext,
- map);
-
- if (!processed) {
- try {
- lister.handle(request, response, out);
- } catch (Exception e) {
- throw new ServletException(e.getMessage(), e);
- }
- }
- } catch (AxisFault e) {
- if (msgContext != null) {
- handleFault(msgContext, out, e);
- } else {
- throw new ServletException(e);
- }
- } finally {
- if (tccl != mycl) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
- }
-
- protected void doPost(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
- MessageContext msgContext = null;
- OutputStream out = null;
-
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader mycl = getClass().getClassLoader();
- try {
- if (tccl != mycl) {
- Thread.currentThread().setContextClassLoader(mycl);
- }
- SessionContext sessionContext = getSessionContext(request);
-
- msgContext = createAndSetInitialParamsToMsgCtxt(sessionContext,
msgContext, response, request);
-
- // adding ServletContext into msgContext;
- msgContext.setProperty(Constants.SERVLET_CONTEXT, sessionContext);
- out = response.getOutputStream();
- HTTPTransportUtils.processHTTPPostRequest(
- msgContext,
- request.getInputStream(),
- out,
- request.getContentType(),
- request.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
- request.getRequestURL().toString());
-
- Object contextWritten =
msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
-
- response.setContentType("text/xml; charset=" +
msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
-
- if ((contextWritten == null) ||
!Constants.VALUE_TRUE.equals(contextWritten)) {
- response.setStatus(HttpServletResponse.SC_ACCEPTED);
- }
- } catch (AxisFault e) {
- if (msgContext != null) {
-
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- handleFault(msgContext, out, e);
- } else {
- throw new ServletException(e);
- }
- } finally {
- if (tccl != mycl) {
- Thread.currentThread().setContextClassLoader(tccl);
- }
- }
- }
+ // private static final String CONFIGURATION_CONTEXT =
"CONFIGURATION_CONTEXT";
- private void handleFault(MessageContext msgContext, OutputStream out,
AxisFault e) throws AxisFault {
- msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
+ // public static final String SESSION_ID = "SessionId";
- AxisEngine engine = new AxisEngine(configContext);
- MessageContext faultContext =
engine.createFaultMessageContext(msgContext, e);
+ // private ConfigurationContext configContext;
- engine.sendFault(faultContext);
- }
+ // private AxisConfiguration axisConfiguration;
public void init(ServletConfig config) throws ServletException {
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
@@ -217,11 +78,9 @@
Thread.currentThread().setContextClassLoader(mycl);
}
tuscanyGetDefaultAxis2xml(config);
+ super.init(config);
configContext = initConfigContext(config);
initTuscany(configContext.getAxisConfiguration(), config);
- lister = new ListingAgent(configContext);
- axisConfiguration = configContext.getAxisConfiguration();
- config.getServletContext().setAttribute(CONFIGURATION_CONTEXT,
configContext);
} catch (Exception e) {
e.printStackTrace();
throw new ServletException(e);
@@ -231,7 +90,6 @@
}
}
}
-
private void initTuscany(final AxisConfiguration axisConfig, ServletConfig
config) throws AxisFault, ServletException {
// Get the current SCA module context
@@ -297,7 +155,8 @@
}
}
}
-
+
+
protected synchronized void tuscanyGetDefaultAxis2xml( ServletConfig
config) throws ServletException {
if (tuscanyGetDefaultAxis2xmlChecked)
@@ -335,47 +194,46 @@
}
}
-
- /**
- * Initialize the Axis configuration context
- *
- * @param config
- * Servlet configuration
- * @throws AxisFault
- * if there was a problem configuring the Axis engine
- */
- protected ConfigurationContext initConfigContext(ServletConfig config)
throws AxisFault {
- ServletContext context = config.getServletContext();
- String repoDir = context.getRealPath("/WEB-INF");
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- ConfigurationContext configContext =
erfac.createConfigurationContextFromFileSystem(repoDir);
- configContext.setProperty(Constants.CONTAINER_MANAGED,
Constants.VALUE_TRUE);
- configContext.setRootDir(new File(context.getRealPath("/WEB-INF")));
- return configContext;
- }
-
- private static SessionContext getSessionContext(HttpServletRequest
httpServletRequest) {
- HttpSession httpSession = httpServletRequest.getSession(true);
- SessionContext sessionContext = (SessionContext)
httpSession.getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
-
- if (sessionContext == null) {
- sessionContext = new SessionContext(null);
- httpSession.setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
sessionContext);
+ @Override
+ protected void doGet(HttpServletRequest arg0, HttpServletResponse arg1)
throws ServletException, IOException {
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ ClassLoader mycl = getClass().getClassLoader();
+ try {
+ if (tccl != mycl) {
+ Thread.currentThread().setContextClassLoader(mycl);
+ }
+ super.doGet(arg0, arg1);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ } finally {
+ if (tccl != mycl) {
+ Thread.currentThread().setContextClassLoader(tccl);
+ }
}
- return sessionContext;
+
}
-
- private static Map getTransportHeaders(HttpServletRequest req) {
- HashMap<String, String> headerMap = new HashMap<String, String>();
- Enumeration<String> headerNames = req.getHeaderNames();
-
- while (headerNames.hasMoreElements()) {
- String key = headerNames.nextElement();
- String value = req.getHeader(key);
- headerMap.put(key, value);
+ @Override
+ protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1)
throws ServletException, IOException {
+
+
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ ClassLoader mycl = getClass().getClassLoader();
+ try {
+ if (tccl != mycl) {
+ Thread.currentThread().setContextClassLoader(mycl);
+ }
+ super.doPost(arg0, arg1);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ } finally {
+ if (tccl != mycl) {
+ Thread.currentThread().setContextClassLoader(tccl);
+ }
}
- return headerMap;
}
+
}
Modified:
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/AxiomHelper.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/AxiomHelper.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/AxiomHelper.java
(original)
+++
incubator/tuscany/java/sca/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/util/AxiomHelper.java
Fri Mar 17 18:23:00 2006
@@ -24,13 +24,13 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMXMLParserWrapper;
-import org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.tuscany.sdo.helper.DataFactoryImpl;
import org.apache.tuscany.sdo.helper.XMLHelperImpl;
import org.apache.tuscany.sdo.helper.XSDHelperImpl;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMXMLParserWrapper;
+import org.apache.ws.commons.om.impl.llom.factory.OMXMLBuilderFactory;
import org.osoa.sca.ServiceRuntimeException;
import commonj.sdo.DataObject;
Modified:
incubator/tuscany/java/sca/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/util/AxiomHelperTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/util/AxiomHelperTestCase.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/util/AxiomHelperTestCase.java
(original)
+++
incubator/tuscany/java/sca/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/util/AxiomHelperTestCase.java
Fri Mar 17 18:23:00 2006
@@ -6,13 +6,10 @@
import junit.framework.TestCase;
-import org.apache.axis2.om.OMElement;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
import org.apache.tuscany.sdo.helper.XSDHelperImpl;
import org.apache.tuscany.sdo.util.DataObjectUtil;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
+import org.apache.ws.commons.om.OMElement;
import commonj.sdo.DataObject;
import commonj.sdo.helper.TypeHelper;
Modified:
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
Fri Mar 17 18:23:00 2006
@@ -167,6 +167,24 @@
public void setStream(ServletInputStream stream) {
inputStream = stream;
}
+
+ @Override
+ public String getRemoteHost() {
+
+ return "locahost";
+ }
+
+ @Override
+ public int getRemotePort() {
+
+ return 1080;
+ }
+
+ @Override
+ public String getRemoteAddr() {
+
+ return "127.0.0.1";
+ }
}
public static class MockResponse extends Response {
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=386791&r1=386790&r2=386791&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Fri Mar 17 18:23:00 2006
@@ -47,6 +47,8 @@
<property name="tuscany.sdo.acceptance.groupId"
value='org/apache/tuscany' />
<property name="tuscany.sdo.acceptance.version" value='SNAPSHOT' />
+ <property name="tuscany.acceptance.axis2.version"
value='0.95-SNAPSHOT' />
+
<property name="tuscany.acceptance.samples.dir" value='../../samples'
/>
<!-- property name="tuscany.maven.repos.dir"
value='${user.home}\.maven\repository' / -->
<!-- change for maven 2.0 -->
@@ -87,16 +89,23 @@
<include
name="**/${tuscany.acceptance.groupId}/tuscany-binding-axis2/${tuscany.acceptance.version}/tuscany-binding-axis2-${tuscany.acceptance.version}.jar"
/>
- <include name="**/asm/asm/2.2/asm-2.2.jar" />
<include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
- <include name="**/axis2/axis2-core/0.94/axis2-core-0.94.jar" />
+ <include
name="**/axis2/axis2-core/${tuscany.acceptance.axis2.version}/axis2-core-${tuscany.acceptance.axis2.version}.jar"
/>
+ <include
name="**/axis2/axis2-common/${tuscany.acceptance.axis2.version}/axis2-common-${tuscany.acceptance.axis2.version}.jar"
/>
+ <include
name="**/axis2/axis2-wsdl/${tuscany.acceptance.axis2.version}/axis2-wsdl-${tuscany.acceptance.axis2.version}.jar"
/>
+ <include
name="**/ws-commons/policy/0.92-SNAPSHOT/policy-0.92-SNAPSHOT.jar" />
+ <include
name="**/ws-commons/XmlSchema/1.0-SNAPSHOT/XmlSchema-1.0-SNAPSHOT.jar" />
+ <include
name="**/ws-commons/axiom/1.0-SNAPSHOT/axiom-1.0-SNAPSHOT.jar" />
+
+
+ <include name="**/asm/asm/2.2/asm-2.2.jar" />
<include
name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
<include
name="**/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"
/>
<include
name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
<include name="**/log4j/log4j/1.2.12/log4j-1.2.12.jar" />
<include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
- <include
name="**/ws-commons/ws-policy/SNAPSHOT/ws-policy-SNAPSHOT.jar" />
<include name="**/woodstox/wstx-asl/2.8.2/wstx-asl-2.8.2.jar"
/>
+
<!--
<include name="**/axis/axis/1.2.1/axis-1.2.1.jar" />
