You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2014/03/16 19:43:16 UTC

svn commit: r1578136 - in /axis/axis1/java/trunk: interop-mock/src/main/resources/uddi_v1/ interop-mock/src/main/webapp/WEB-INF/ samples/jaxm-sample/src/main/java/samples/jaxm/ samples/jaxm-sample/src/test/java/test/functional/

Author: veithen
Date: Sun Mar 16 18:43:16 2014
New Revision: 1578136

URL: http://svn.apache.org/r1578136
Log:
Reenabled an old test case (using a mock service).

Added:
    axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/
    axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml   (with props)
    axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml   (with props)
Modified:
    axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
    axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt?rev=1578136&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt Sun Mar 16 18:43:16 2014
@@ -0,0 +1 @@
+Request/response constructed from samples found on the Internet.
\ No newline at end of file

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml?rev=1578136&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml Sun Mar 16 18:43:16 2014
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'>
+    <Body>
+        <find_business generic="1.0" maxRows="100" xmlns="urn:uddi-org:api">
+            <name>Microsoft</name>
+        </find_business>
+    </Body>
+</Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml?rev=1578136&view=auto
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml (added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml Sun Mar 16 18:43:16 2014
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'>
+    <Body>
+        <businessList generic="1.0" operator="Microsoft Corporation" truncated="false" xmlns="urn:uddi-org:api">
+            <businessInfos>
+                <businessInfo businessKey="0076B468-EB27-42E5-AC09-9955CFF462A3">
+                    <name>Microsoft Corporation</name>
+                    <description xml:lang="en">Empowering people through great software - any time, any place and on any device.</description>
+                    <serviceInfos>
+                        <serviceInfo businessKey="0076B468-EB27-42E5-AC09-955CFF462A3" serviceKey="8BF2F51F-8ED4-43FE-B665-38D8205D1333">
+                            <name>Electronic Business Integration Services</name>
+                        </serviceInfo>
+                        <serviceInfo businessKey="0076B468-EB27-42E5-AC09-955CFF462A3" serviceKey="D2BC296A-723B-4C45-9ED4-494F9E53F1D1">
+                            <name>UDDI Web Services</name>
+                        </serviceInfo>
+                    </serviceInfos>
+                </businessInfo>
+            </businessInfos>
+        </businessList>
+    </Body>
+</Envelope>

Propchange: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1578136&r1=1578135&r2=1578136&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml Sun Mar 16 18:43:16 2014
@@ -306,4 +306,17 @@
             </list>
         </property>
     </bean>
+    
+    <!-- UDDI v1 mock -->
+    
+    <bean name="/uddi_v1" class="org.apache.axis.test.interop.mock.MockPostHandler">
+        <property name="exchanges">
+            <list>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:uddi_v1/find_business-request.xml"/>
+                    <property name="response" value="classpath:uddi_v1/find_business-response.xml"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
 </beans>

Modified: axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java?rev=1578136&r1=1578135&r2=1578136&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java (original)
+++ axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java Sun Mar 16 18:43:16 2014
@@ -60,8 +60,8 @@ public class UddiPing {
         msg.saveChanges();
 
         SOAPMessage reply = connection.call(msg, endpoint);
-        //System.out.println("Received reply from: " + endpoint);
-        //reply.writeTo(System.out);
+        System.out.println("Received reply from: " + endpoint);
+        reply.writeTo(System.out);
         connection.close();
     }
 }

Modified: axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java?rev=1578136&r1=1578135&r2=1578136&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java (original)
+++ axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java Sun Mar 16 18:43:16 2014
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.commons.logging.Log;
 import samples.jaxm.DelayedStockQuote;
+import samples.jaxm.UddiPing;
 
 /**
  * Test the JAX-RPC compliance samples.
@@ -31,35 +32,9 @@ public class TestJAXMSamples extends Tes
         super(name);
     } // ctor
 
-//    // This is timing out for some reason - removed for the nonce.
-//    // -- gdaniels, 4/21/2003
-//    public void testUddiPing() throws Exception {
-//        try {
-//            log.info("Testing JAXM UddiPing sample.");
-//            UddiPing.searchUDDI("IBM", "http://www-3.ibm.com/services/uddi/testregistry/inquiryapi");
-//            log.info("Test complete.");
-//        } catch (javax.xml.soap.SOAPException e) {
-//            Throwable t = e.getCause();
-//            if (t != null) {
-//                t.printStackTrace();
-//                if (t instanceof AxisFault) {
-//                    AxisFault af = (AxisFault) t;
-//                    if ((af.detail instanceof SocketException) ||
-//                        (af.getFaultCode().getLocalPart().equals("HTTP")) ) {
-//                        System.out.println("Connect failure caused JAXM UddiPing to be skipped.");
-//                        return;
-//                    }
-//                }
-//                throw new Exception("Fault returned from test: " + t);
-//            } else {
-//                e.printStackTrace();
-//                throw new Exception("Exception returned from test: " + e);
-//            }
-//        } catch (Throwable t) {
-//            t.printStackTrace();
-//            throw new Exception("Fault returned from test: " + t);
-//        }
-//    } // testGetQuote
+    public void testUddiPing() throws Exception {
+        UddiPing.searchUDDI("Microsoft", "http://localhost:" + System.getProperty("jetty.httpPort") + "/uddi_v1");
+    } // testGetQuote
 
     public void testDelayedStockQuote() throws Exception {
         DelayedStockQuote stockQuote = new DelayedStockQuote("http://localhost:" + System.getProperty("jetty.httpPort") + "/xmethods/delayed-quotes");