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/04/26 06:19:49 UTC
svn commit: r164735 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/context/ core/src/org/apache/axis/engine/
core/src/org/apache/axis/receivers/
core/src/org/apache/axis/transport/http/ core/src/org/apache/axis/util/
samples/ samples/src/encoding/sample1/
samples/src/encoding/sample2/benchMark/
samples/src/org/apache/axis/testUtils/
samples/test/org/apache/axis/integration/
Author: hemapani
Date: Mon Apr 25 21:19:46 2005
New Revision: 164735
URL: http://svn.apache.org/viewcvs?rev=164735&view=rev
Log:
at last all the test in the build works,there are tweeking todo
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
webservices/axis/trunk/java/modules/samples/project.xml
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml
webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Mon Apr 25 21:19:46 2005
@@ -18,8 +18,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
@@ -27,7 +25,6 @@
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.ExecutionChain;
-import org.apache.axis.om.OMElement;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.wsdl.WSDLService;
@@ -151,16 +148,6 @@
*/
private boolean newThreadRequired = false;
- /**
- * Field xpp
- */
- private XMLStreamReader xpp;
-
- /**
- * Field soapOperationElement
- */
- private OMElement soapOperationElement;
-
private boolean paused = false;
public MessageContext(MessageContext oldMessageContext) throws AxisFault {
@@ -422,35 +409,7 @@
return this.chain;
}
- /**
- * @return
- */
- public XMLStreamReader getXpp() {
- return xpp;
- }
-
- /**
- * @param reader
- */
- public void setXpp(XMLStreamReader reader) {
- xpp = reader;
- }
-
- /**
- * @return
- */
- public OMElement getSoapOperationElement() {
- return soapOperationElement;
- }
-
- /**
- * @param element
- */
- public void setSoapOperationElement(OMElement element) {
- soapOperationElement = element;
- }
-
- /**
+ /**
* @return
*/
public Map getProperties() {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java Mon Apr 25 21:19:46 2005
@@ -20,7 +20,9 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContext;
import org.apache.axis.context.ServiceContext;
+import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.handlers.AbstractHandler;
@@ -28,9 +30,7 @@
/**
* Class Dispatcher
*/
-public class RequestURIBasedDispatcher
- extends AbstractHandler
- implements Handler {
+public class RequestURIBasedDispatcher extends AbstractHandler implements Handler {
/**
* Field NAME
*/
@@ -61,27 +61,40 @@
int index = filePart.lastIndexOf(URI_ID_STRING);
String serviceStr = null;
if (index > 0) {
- serviceStr =
- filePart.substring(index + URI_ID_STRING.length() + 1);
+ serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
EngineContext engineContext = msgctx.getEngineContext();
- QName serviceName = new QName(serviceStr);
- ServiceContext serviceContext =
- engineContext.getService(serviceName);
+
+ QName serviceName = null;
+ QName operatoinName = null;
+
+ if ((index = serviceStr.indexOf('/')) > 0) {
+ serviceName = new QName(serviceStr.substring(0, index));
+ operatoinName = new QName(serviceStr.substring(index + 1));
+ } else {
+ serviceName = new QName(serviceStr);
+ }
+
+ ServiceContext serviceContext = engineContext.getService(serviceName);
if (serviceContext == null) {
- EngineConfiguration registry =
- msgctx.getEngineContext().getEngineConfig();
+ EngineConfiguration registry = msgctx.getEngineContext().getEngineConfig();
service = registry.getService(serviceName);
if (service != null) {
serviceContext = new ServiceContext(service);
+ if (operatoinName != null) {
+ AxisOperation axisOp =
+ serviceContext.getServiceConfig().getOperation(operatoinName);
+ msgctx.setOperationContext(new OperationContext(axisOp));
+ }
}
}
if (serviceContext != null) {
msgctx.setServiceContext(serviceContext);
- msgctx.setMessageStyle(
- serviceContext.getServiceConfig().getStyle());
+ msgctx.setMessageStyle(serviceContext.getServiceConfig().getStyle());
+
}
+
}
} else {
// TODO client side service Dispatch ,, What this really mean?
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java Mon Apr 25 21:19:46 2005
@@ -27,7 +27,7 @@
import org.apache.axis.engine.MessageReceiver;
public abstract class AbstractMessageReceiver implements MessageReceiver{
- public static final String IMPL_INFO = "impl";
+ public static final String SERVICE_CLASS = "ServiceClass";
public static final String SCOPE = "scope";
/**
@@ -41,12 +41,12 @@
try {
AxisService service = msgContext.getServiceContext().getServiceConfig();
ClassLoader classLoader = service.getClassLoader();
- Parameter implInfoParam = service.getParameter(IMPL_INFO);
+ Parameter implInfoParam = service.getParameter(SERVICE_CLASS);
if(implInfoParam != null){
Class implClass = Class.forName((String)implInfoParam.getValue(),true,classLoader);
return implClass.newInstance();
}else{
- throw new AxisFault("IMPL_INFO parameter is not specified");
+ throw new AxisFault("SERVICE_CLASS parameter is not specified");
}
} catch (Exception e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java Mon Apr 25 21:19:46 2005
@@ -103,7 +103,7 @@
msgContext.setTo(
new EndpointReference(
AddressingConstants.WSA_TO,
- getServiceLookUp(requestURI)));
+ requestURI));
// TODO see is it a Service request e.g. WSDL, list ....
// TODO take care of the other HTTPHeaders
@@ -417,18 +417,18 @@
}
}
- private String getServiceLookUp(String requestURI) throws AxisFault {
- final String URI_ID_STRING = "/services";
- String filePart = requestURI;
-
- int index = filePart.lastIndexOf(URI_ID_STRING);
- String serviceStr = null;
- if (index > 0) {
- serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
- return serviceStr;
-
- } else {
- throw new AxisFault("Both the URI and SOAP_ACTION are Null");
- }
- }
+// private String getServiceLookUp(String requestURI) throws AxisFault {
+// final String URI_ID_STRING = "/services";
+// String filePart = requestURI;
+//
+// int index = filePart.lastIndexOf(URI_ID_STRING);
+// String serviceStr = null;
+// if (index > 0) {
+// serviceStr = filePart.substring(index + URI_ID_STRING.length() + 1);
+// return serviceStr;
+//
+// } else {
+// throw new AxisFault("Both the URI and SOAP_ACTION are Null");
+// }
+// }
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Mon Apr 25 21:19:46 2005
@@ -81,7 +81,7 @@
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(
new ParameterImpl(
- AbstractMessageReceiver.IMPL_INFO,
+ AbstractMessageReceiver.SERVICE_CLASS,
className));
service.setMessageReceiver(messageReceiver);
return service;
Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Mon Apr 25 21:19:46 2005
@@ -94,7 +94,7 @@
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
<exclude>**/*InteropStubTest.java</exclude>
- <exclude>**/*EchoTest.java</exclude>
+ <!-- <exclude>**/*EchoTest.java</exclude> -->
<!-- <exclude>**/*TransportDeploymentTest.java</exclude> -->
<!-- <exclude>**/*BuildERWithDeploymentTest.java</exclude> -->
</excludes>
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java Mon Apr 25 21:19:46 2005
@@ -41,8 +41,8 @@
MessageContext msgContext,
Method method)
throws AxisFault {
- XMLStreamReader xpp =
- msgContext.getSoapOperationElement().getPullParser(true);
+ XMLStreamReader xpp = msgContext.getEnvelope().getBody().getFirstElement().getPullParser(true);
+
Class[] parms = method.getParameterTypes();
Object[] objs = new Object[parms.length];
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml Mon Apr 25 21:19:46 2005
@@ -1,4 +1,4 @@
-<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc" contextPath="services">
+<service messageReceiver="encoding.sample1.EchoProvider" style="rpc" contextPath="services">
<parameter name="ServiceClass" locked="xsd:false">encoding.sample1.EchoImpl</parameter>
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java Mon Apr 25 21:19:46 2005
@@ -48,7 +48,7 @@
Method method)
throws AxisFault {
XMLStreamReader xpp =
- msgContext.getSoapOperationElement().getPullParser(true);
+ msgContext.getEnvelope().getBody().getFirstElement().getPullParser(true);
Class[] parms = method.getParameterTypes();
Object[] objs = new Object[parms.length];
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java Mon Apr 25 21:19:46 2005
@@ -54,8 +54,7 @@
public Object[] deserializeParameters(MessageContext msgContext,
Method method)
throws AxisFault {
- XMLStreamReader xpp =
- msgContext.getSoapOperationElement().getPullParser(true);
+ XMLStreamReader xpp = msgContext.getEnvelope().getBody().getFirstElement().getPullParser(true);
Class[] parms = method.getParameterTypes();
Object[] objs = new Object[parms.length];
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java Mon Apr 25 21:19:46 2005
@@ -79,13 +79,9 @@
}
- private XMLStreamReader invokeTheService(SOAPEnvelope envelope)
+ private XMLStreamReader invokeTheService(SOAPEnvelope envelope,EndpointReference targetEPR)
throws Exception {
- EndpointReference targetEPR =
- new EndpointReference(AddressingConstants.WSA_TO,
- "http://127.0.0.1:"
- + (org.apache.axis.integration.Constants.TESTING_PORT)
- + "/axis/services/echo");
+
Call call = new Call();
call.setTo(targetEPR);
call.setTransport(Constants.TRANSPORT_HTTP);
@@ -115,13 +111,18 @@
public void testEchoString() throws Exception {
String message = "Hello testing";
-
+ EndpointReference targetEPR =
+ new EndpointReference(AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (org.apache.axis.integration.Constants.TESTING_PORT)
+ + "/axis/services/echo/echoString");
+
OMElement returnelement = fac.createOMElement("param1", ns);
returnelement.setBuilder(new ObjectToOMBuilder(returnelement,
new SimpleTypeEncoder(message)));
returnelement.declareNamespace(arrayNs);
SOAPEnvelope envelope = createRawMessage("echoString", returnelement);
- XMLStreamReader xpp = invokeTheService(envelope);
+ XMLStreamReader xpp = invokeTheService(envelope,targetEPR);
String value = SimpleTypeEncodingUtils.deserializeString(xpp);
assertEquals(value, message);
}
@@ -134,6 +135,13 @@
"Hello testing3",
"Hello testing4",
"Hello testing5"};
+
+ EndpointReference targetEPR =
+ new EndpointReference(AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (org.apache.axis.integration.Constants.TESTING_PORT)
+ + "/axis/services/echo/echoStringArray");
+
OMElement returnelement = fac.createOMElement("param1", ns);
ObjectToOMBuilder builder =
@@ -144,7 +152,7 @@
returnelement.declareNamespace(arrayNs);
SOAPEnvelope envelope = createRawMessage("echoStringArray", returnelement);
- XMLStreamReader xpp = invokeTheService(envelope);
+ XMLStreamReader xpp = invokeTheService(envelope,targetEPR);
String[] values = SimpleTypeEncodingUtils.deserializeStringArray(xpp);
for (int i = 0; i < values.length; i++) {
assertEquals(values[i], messages[i]);
@@ -152,6 +160,12 @@
}
public void testEchoStruct() throws Exception {
+ EndpointReference targetEPR =
+ new EndpointReference(AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (org.apache.axis.integration.Constants.TESTING_PORT)
+ + "/axis/services/echo/echoEchoStruct");
+
String[] messages =
new String[]{
"Hello testing1",
@@ -224,7 +238,7 @@
SOAPEnvelope envelope =
createRawMessage("echoEchoStruct", returnelement);
- XMLStreamReader xpp = invokeTheService(envelope);
+ XMLStreamReader xpp = invokeTheService(envelope,targetEPR);
Method deserializeMethod =
encoderClass.getMethod("deSerialize",
@@ -234,6 +248,12 @@
}
public void testEchoStructArray() throws Exception {
+ EndpointReference targetEPR =
+ new EndpointReference(AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (org.apache.axis.integration.Constants.TESTING_PORT)
+ + "/axis/services/echo/echoEchoStructArray");
+
Object[] objs = new Object[10];
Class clasname =
Class.forName("encoding.sample1.EchoStruct", true, cl);
@@ -303,7 +323,7 @@
SOAPEnvelope envelope =
createRawMessage("echoEchoStructArray", returnelement);
- XMLStreamReader xpp = invokeTheService(envelope);
+ XMLStreamReader xpp = invokeTheService(envelope,targetEPR);
Encoder enc = new ArrayTypeEncoder(objs, (Encoder) obj1);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=164735&r1=164734&r2=164735&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Mon Apr 25 21:19:46 2005
@@ -51,7 +51,7 @@
Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
- File file = new File("modules/samples/target/test-resources/samples");
+ File file = new File("target/test-resources/samples");
System.out.println(new File(file,"server.xml").exists());
EngineContext er = erfac.createEngineRegistry(file.getAbsolutePath());
try {