axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r443294 - in /webservices/axis2/trunk/java/modules: integration/test/org/apache/axis2/engine/WSDLClientTest.java kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Date Thu, 14 Sep 2006 09:18:53 GMT
Author: deepal
Date: Thu Sep 14 02:18:52 2006
New Revision: 443294

URL: http://svn.apache.org/viewvc?view=rev&rev=443294
Log:
fixing AXIS2-864
the bus was there in the AxisServlet

Modified:
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?view=diff&rev=443294&r1=443293&r2=443294
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
Thu Sep 14 02:18:52 2006
@@ -61,12 +61,16 @@
                     new QName("http://ws.apache.org/axis2", "EchoXMLService"),
                     "EchoXMLServiceSOAP11port_http");
             OMElement payload = TestingUtils.createDummyOMElement("http://engine.axis2.apache.org/xsd");
+            String epr = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/EchoXMLService";
+            //This is not smt we need to do but , my build is fail if I dont do that :)
+            serviceClient.getOptions().setTo(new EndpointReference(epr));
+            System.out.println(serviceClient.getOptions().getTo().getAddress());
             OMElement response = serviceClient.sendReceive(
                     new QName("http://engine.axis2.apache.org/xsd", "echoOM"), payload);
             assertNotNull(response);
             String textValue = response.getFirstElement().getFirstElement().getText();
             assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new AxisFault(e);
         }
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=443294&r1=443293&r2=443294
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Thu Sep 14 02:18:52 2006
@@ -137,8 +137,7 @@
         if ((query != null) && (query.indexOf("wsdl2") >= 0 ||
                 query.indexOf("wsdl") >= 0 || query.indexOf("xsd") >= 0)) { // handling
meta data exchange stuff
             agent.processListService(req, resp);
-        } else if (requestURI.endsWith(LIST_SERVICES_SUFIX) || requestURI.endsWith(LIST_FAUKT_SERVICES_SUFIX))
-        { // handling list services request
+        } else if (requestURI.endsWith(LIST_SERVICES_SUFIX) || requestURI.endsWith(LIST_FAUKT_SERVICES_SUFIX))
{ // handling list services request
             try {
                 agent.handle(req, resp);
             } catch (Exception e) {
@@ -407,7 +406,7 @@
     }
 
     public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault
{
-       //RUNNING_PORT
+        //RUNNING_PORT
         String port = (String) configContext.getProperty(ListingAgent.RUNNING_PORT);
         if (port == null) {
             port = "8080";
@@ -415,14 +414,17 @@
         if (ip == null) {
             try {
                 ip = HttpUtils.getIpAddress();
+                if (ip == null) {
+                    ip = "localhost";
+                }
             } catch (SocketException e) {
                 throw new AxisFault(e);
             }
         }
         EndpointReference soapEndpoint = new EndpointReference("http://" + ip + ":" + port
+ '/' +
                 configContext.getServiceContextPath() + "/" + serviceName);
-        
-        return new EndpointReference[] {soapEndpoint};
+
+        return new EndpointReference[]{soapEndpoint};
     }
 
     protected MessageContext createMessageContext(HttpServletRequest req,



---------------------------------------------------------------------
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