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 10:46:00 UTC
svn commit: r164767 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/addressing/ core/src/org/apache/axis/context/
core/src/org/apache/axis/engine/ core/test/org/apache/axis/engine/
samples/test/org/apache/axis/encoding/ samples/test/org/apache/axis/engine/
Author: hemapani
Date: Tue Apr 26 01:45:59 2005
New Revision: 164767
URL: http://svn.apache.org/viewcvs?rev=164767&view=rev
Log:
get the test cases working agien
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java Tue Apr 26 01:45:59 2005
@@ -69,4 +69,6 @@
public static final String EPR_PORT_TYPE = "PortType";
public static final String EPR_SERVICE_NAME = "ServiceName";
public static final String EPR_SERVICE_NAME_PORT_NAME = "PortName";
+
+ public static final String EPR_ANONYMOUS_URL = "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous";
}
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=164767&r1=164766&r2=164767&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 Tue Apr 26 01:45:59 2005
@@ -160,8 +160,11 @@
oldMessageContext.getTransportOut());
this.messageInformationHeaders = new MessageInformationHeadersCollection();
-
- oldMessageContext.getMessageInformationHeaders();
+ MessageInformationHeadersCollection oldMessageInfoHeaders = oldMessageContext.getMessageInformationHeaders();
+ messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo()) ;
+ messageInformationHeaders.setFaultTo(oldMessageInfoHeaders.getFaultTo());
+ messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
+
this.serverSide = oldMessageContext.isServerSide();
this.serviceContext = oldMessageContext.getServiceContext();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Tue Apr 26 01:45:59 2005
@@ -34,8 +34,7 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "AddressingBasedDispatcher");
- private AxisService service;
+ new QName("http://axis.ws.apache.org", "AddressingBasedDispatcher");
/**
* Constructor Dispatcher
@@ -54,7 +53,8 @@
if (msgctx.getServiceContext() == null) {
EndpointReference toEPR = msgctx.getTo();
QName serviceName = new QName(toEPR.getAddress());
- service = msgctx.getEngineContext().getEngineConfig().getService(serviceName);
+ AxisService service =
+ msgctx.getEngineContext().getEngineConfig().getService(serviceName);
if (service != null) {
EngineContext engineContext = msgctx.getEngineContext();
@@ -71,16 +71,24 @@
} else {
throw new AxisFault("No service found under the " + toEPR.getAddress());
}
-
- } else if (msgctx.getoperationConfig() == null) {
+
+ }
+
+ if (msgctx.getoperationConfig() == null) {
+ AxisService service = msgctx.getServiceContext().getServiceConfig();
String action = (String) msgctx.getWSAAction();
- QName operationName = new QName(action);
- AxisOperation op = service.getOperation(operationName);
- if (op != null) {
- msgctx.setOperationConfig(op);
+ if (action != null) {
+ QName operationName = new QName(action);
+ AxisOperation op = service.getOperation(operationName);
+ if (op != null) {
+ msgctx.setOperationConfig(op);
+ } else {
+ throw new AxisFault("Operation not found");
+ }
} else {
- throw new AxisFault("Operation not found");
+ throw new AxisFault("Operation not found, WSA Action is Null");
}
+
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Tue Apr 26 01:45:59 2005
@@ -101,7 +101,7 @@
sender.invoke(context);
} catch (AxisFault error) {
- error.printStackTrace();
+ //error.printStackTrace();
handleFault(context, error);
}
@@ -181,6 +181,7 @@
log.info("ending the out flow");
} catch (Throwable e) {
handleFault(context, e);
+
}
}
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=164767&r1=164766&r2=164767&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 Tue Apr 26 01:45:59 2005
@@ -80,15 +80,20 @@
service = registry.getService(serviceName);
if (service != null) {
serviceContext = new ServiceContext(service);
- if (operatoinName != null) {
- AxisOperation axisOp =
- serviceContext.getServiceConfig().getOperation(operatoinName);
+ }
+ }
+ if (serviceContext != null) {
+ if (operatoinName != null) {
+ AxisOperation axisOp =
+ serviceContext.getServiceConfig().getOperation(operatoinName);
+ if(axisOp != null){
msgctx.setOperationConfig(axisOp);
+ }else{
+ throw new AxisFault("Service named "+ serviceName + " Do not have a operation called "+ operatoinName);
}
+
}
- }
- if (serviceContext != null) {
msgctx.setServiceContext(serviceContext);
msgctx.setMessageStyle(serviceContext.getServiceConfig().getStyle());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java Tue Apr 26 01:45:59 2005
@@ -46,6 +46,10 @@
if (serviceContext != null) {
AxisOperation axisOp = msgContext.getoperationConfig();
+
+ if(axisOp == null){
+ throw new AxisFault("Operation Not found");
+ }
Parameter param = axisOp.getParameter(DefinedParameters.PARM_MEP);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/AbstractEngineTest.java Tue Apr 26 01:45:59 2005
@@ -26,7 +26,6 @@
import org.apache.axis.description.AxisService;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
-import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.axis.transport.TransportSender;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java Tue Apr 26 01:45:59 2005
@@ -36,7 +36,7 @@
public class EnginePausingTest extends AbstractEngineTest {
- private QName serviceName = new QName("axis/services/NullService");
+ private QName serviceName = new QName("NullService");
private QName operationName = new QName("DummyOp");
public EnginePausingTest() {
@@ -112,7 +112,7 @@
mc.setTo(
new EndpointReference(
AddressingConstants.WSA_TO,
- "axis/services/NullService"));
+ "axis/services/NullService/DummyOp"));
mc.setWSAAction(operationName.getLocalPart());
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java Tue Apr 26 01:45:59 2005
@@ -47,7 +47,7 @@
OMElement omel = omfac.createOMElement("value", omNs);
omel.addChild(omfac.createText("1234"));
- deserialize(method, omel.getXMLStreamReaderWithoutCaching());
+ deserialize(method, omel.getXMLStreamReader());
}
@@ -58,7 +58,7 @@
OMElement omel = omfac.createOMElement("value", omNs);
omel.addChild(omfac.createText("1234"));
- deserialize(method, omel.getXMLStreamReaderWithoutCaching());
+ deserialize(method, omel.getXMLStreamReader());
}
@@ -74,7 +74,7 @@
omel.addChild(temp);
}
- deserialize(method, omel.getXMLStreamReaderWithoutCaching());
+ deserialize(method, omel.getXMLStreamReader());
}
public void testDeserializingStringArrayVal() throws SecurityException, NoSuchMethodException, AxisFault, XMLStreamException, FactoryConfigurationError {
@@ -89,7 +89,7 @@
}
omel.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
- XMLStreamReader xpp = omel.getXMLStreamReaderWithoutCaching();
+ XMLStreamReader xpp = omel.getXMLStreamReader();
String[] strs = SimpleTypeEncodingUtils.deserializeStringArray(xpp);
for (int i = 0; i < strs.length; i++) {
System.out.println(strs[i]);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?rev=164767&r1=164766&r2=164767&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java Tue Apr 26 01:45:59 2005
@@ -47,6 +47,8 @@
private Log log = LogFactory.getLog(getClass());
private static final String SERVICE_NAME = "EchoXMLService";
private static final String OPERATION_NAME = "echoOMElement";
+
+
private static final String ADDRESS = "http://127.0.0.1:" + (UtilServer.TESTING_PORT) +
"/axis/services/" + SERVICE_NAME + "/" +OPERATION_NAME;
// private static final String ADDRESS = "http://127.0.0.1:8080/axis/services/" + SERVICE_NAME;
@@ -166,7 +168,6 @@
}
fail("the test must fail due to bad service Name");
} catch (AxisFault e) {
- System.out.println("e.getMessage() = " + e.getMessage());
assertTrue((e.getMessage().indexOf(UtilServer.FAILURE_MESSAGE)) > 0);
return;
}