axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r417672 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/deployment/util/Utils.java core/src/org/apache/axis2/engine/AxisEngine.java integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
Date Wed, 28 Jun 2006 05:21:15 GMT
Author: deepal
Date: Tue Jun 27 22:21:15 2006
New Revision: 417672

URL: http://svn.apache.org/viewvc?rev=417672&view=rev
Log:
-reverting chamikara's changes to AxisEngine
- add a test case to send the request via HTTP and get the response via TCP

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=417672&r1=417671&r2=417672&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
Tue Jun 27 22:21:15 2006
@@ -331,7 +331,7 @@
             PhasesInfo phasesInfo = axisConfig.getPhasesInfo();
             ClassLoader moduleClassLoader = module.getModuleClassLoader();
             ArrayList services = new ArrayList();
-            InputStream in = moduleClassLoader.getResourceAsStream("services/services.list");
+            InputStream in = moduleClassLoader.getResourceAsStream("aars/aars.list");
             if (in != null) {
                 BufferedReader input;
                 try {
@@ -351,7 +351,7 @@
                     if (servicename == null || "".equals(servicename)) {
                         continue;
                     }
-                    InputStream fin = moduleClassLoader.getResourceAsStream("services/" +
servicename);
+                    InputStream fin = moduleClassLoader.getResourceAsStream("aars/" + servicename);
                     if (fin == null) {
                         throw new AxisFault("No service archiev found : " + servicename);
                     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=417672&r1=417671&r2=417672&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
Tue Jun 27 22:21:15 2006
@@ -621,7 +621,7 @@
             //there may be instance where you want to send the response to replyTo
             //and this default behaviour should happen if somebody (e.g. a module) has not
already provided
             //a Sender.
-            if (sender==null && msgContext.isServerSide() && msgContext.getTo()
!= null) {
+            if (msgContext.isServerSide() && msgContext.getTo() != null) {
                 try {
                     String replyToAddress = msgContext.getTo().getAddress();
                     if (!(AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(replyToAddress)

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=417672&r1=417671&r2=417672&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
Tue Jun 27 22:21:15 2006
@@ -24,6 +24,7 @@
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 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;
@@ -92,5 +93,37 @@
         sender.finalizeInvoke();
 
     }
+
+    public void testEchoXMLCompleteSyncwithTwoTransport() throws Exception {
+          AxisService service =
+                  Utils.createSimpleServiceforClient(serviceName,
+                          Echo.class.getName(),
+                          operationName);
+
+          ConfigurationContext configConetxt = UtilServer.createClientConfigurationContext();
+
+          OMFactory fac = OMAbstractFactory.getOMFactory();
+
+          OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
+          OMElement method = fac.createOMElement("echoOMElement", omNs);
+          OMElement value = fac.createOMElement("myValue", omNs);
+          value.setText("Isaac Asimov, The Foundation Trilogy");
+          method.addChild(value);
+          Options options = new Options();
+          options.setTo(targetEPR);
+          options.setTransportInProtocol(Constants.TRANSPORT_TCP);
+          options.setUseSeparateListener(true);
+          options.setAction(operationName.getLocalPart());
+
+          ServiceClient sender = new ServiceClient(configConetxt, service);
+          sender.setOptions(options);
+
+          OMElement result = sender.sendReceive(operationName, method);
+
+          TestingUtils.campareWithCreatedOMElement(result);
+          sender.finalizeInvoke();
+
+      }
+
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message