axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r471680 - in /webservices/axis2/branches/java/1_1/modules: integration/test-resources/rampart/ integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/groovy/ kernel/src/org/apache/axis2/description/
Date Mon, 06 Nov 2006 10:09:20 GMT
Author: deepal
Date: Mon Nov  6 02:09:19 2006
New Revision: 471680

URL: http://svn.apache.org/viewvc?view=rev&rev=471680
Log:
fixing build break after someone's commit :)

Modified:
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-1.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-3.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-4.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-5.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-6.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-7.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-8.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-9.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-1.xml
    webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-2.xml
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-1.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-1.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-1.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-1.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService1">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-2.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-2.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService2">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-3.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-3.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-3.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-3.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService3">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-4.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-4.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-4.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-4.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService4">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-5.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-5.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-5.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-5.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService5">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-6.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-6.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-6.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-6.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService6">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-7.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-7.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-7.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-7.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService7">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-8.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-8.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-8.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-8.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService8">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-9.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-9.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-9.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-9.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureService9">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-1.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-1.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-1.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-1.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureServiceSC1">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-2.xml?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-2.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test-resources/rampart/services-sc-2.xml
Mon Nov  6 02:09:19 2006
@@ -1,4 +1,4 @@
-<service name="SecureService">
+<service name="SecureServiceSC2">
 
 	<module ref="addressing"/>
 	<module ref="rampart"/>

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
Mon Nov  6 02:09:19 2006
@@ -58,7 +58,7 @@
             URL wsdlURL = new URL("http://localhost:" + UtilServer.TESTING_PORT +
                     "/axis2/services/EchoXMLService?wsdl");
             ServiceClient serviceClient = new ServiceClient(null, wsdlURL,
-                    new QName("http://ws.apache.org/axis2", "EchoXMLService"),
+                    new QName("http://engine.axis2.apache.org/xsd", "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";
@@ -71,6 +71,7 @@
             String textValue = response.getFirstElement().getFirstElement().getText();
             assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
         } catch (Exception e) {
+            e.printStackTrace();
             throw new AxisFault(e);
         }
     }

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
Mon Nov  6 02:09:19 2006
@@ -45,8 +45,8 @@
     private EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
                     + (UtilServer.TESTING_PORT)
-                    + "/axis2/services/groovyService/echo");
-    private QName serviceName = new QName("groovyService");
+                    + "/axis2/services/GroovyService/echo");
+    private QName serviceName = new QName("GroovyService");
     private QName operationName = new QName("echo");
 
 

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=471680&r1=471679&r2=471680
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Mon Nov  6 02:09:19 2006
@@ -555,7 +555,6 @@
     }
 
     /**
-     *
      * @param out
      * @param requestIP
      * @param servicePath
@@ -1339,6 +1338,9 @@
             axisService.addSchema(schemaGenerator.generateSchema());
             axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
             axisService.setTypeTable(schemaGenerator.getTypeTable());
+            if (targetNamespace == null) {
+                targetNamespace = schemaGenerator.getSchemaTargetNameSpace();
+            }
             if (targetNamespace != null && !"".equals(targetNamespace)) {
                 axisService.setTargetNamespace(targetNamespace);
             }
@@ -1457,7 +1459,9 @@
             axisService.addSchema(schemaGenerator.generateSchema());
             axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
             axisService.setTypeTable(schemaGenerator.getTypeTable());
-            axisService.setTypeTable(schemaGenerator.getTypeTable());
+            if (targetNameSpace == null) {
+                targetNameSpace = schemaGenerator.getSchemaTargetNameSpace();
+            }
             if (targetNameSpace != null && !"".equals(targetNameSpace)) {
                 axisService.setTargetNamespace(targetNameSpace);
             }



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