[jboss-svn-commits] JBossWS SVN: r870 - in branches/jbossws-1.0/src/test: java/org/jboss/test/ws/tools/jbws1090 resources/tools/jbws1090

[jboss-svn-commits at lists.jboss.org]

Author: alex.guizar at jboss.com
Date: 2006-08-31 04:06:17 -0400 (Thu, 31 Aug 2006)
New Revision: 870

Added:
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java
Modified:
   branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml
   branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml
Log:
Merged JBWS-1090, r807

Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java (from rev 807, tags/jbossws-1.0.3.GA/src/test/java/org/jboss/test/ws/tools/jbws1090/AdditionalEndpoint.java)

Modified: branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml	2006-08-31 03:19:11 UTC (rev 869)
+++ branches/jbossws-1.0/src/test/resources/tools/jbws1090/webservices.xml	2006-08-31 08:06:17 UTC (rev 870)
@@ -13,9 +13,7 @@
     <port-component>
       <port-component-name>ValidURL</port-component-name>
       <wsdl-port>impl:ValidURLPort</wsdl-port>
-      <service-endpoint-interface>
-        org.jboss.test.webservice.ws4eesimple.HelloWs
-      </service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>HelloJavaBean</servlet-link>
       </service-impl-bean>
@@ -23,9 +21,7 @@
     <port-component>
       <port-component-name>InvalidURL</port-component-name>
       <wsdl-port>impl:InvalidURLPort</wsdl-port>
-      <service-endpoint-interface>
-        org.jboss.test.webservice.ws4eesimple.HelloWs
-      </service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>HelloJavaBean</servlet-link>
       </service-impl-bean>
@@ -33,9 +29,7 @@
     <port-component>
       <port-component-name>ValidSecureURL</port-component-name>
       <wsdl-port>impl:ValidSecureURLPort</wsdl-port>
-      <service-endpoint-interface>
-        org.jboss.test.webservice.ws4eesimple.HelloWs
-      </service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>HelloJavaBean</servlet-link>
       </service-impl-bean>
@@ -43,9 +37,7 @@
     <port-component>
       <port-component-name>InvalidSecureURL</port-component-name>
       <wsdl-port>impl:InvalidSecureURLPort</wsdl-port>
-      <service-endpoint-interface>
-        org.jboss.test.webservice.ws4eesimple.HelloWs
-      </service-endpoint-interface>
+      <service-endpoint-interface>org.jboss.test.webservice.ws4eesimple.HelloWs</service-endpoint-interface>
       <service-impl-bean>
         <servlet-link>HelloJavaBean</servlet-link>
       </service-impl-bean>
@@ -53,17 +45,15 @@
   </webservice-description>
 
   <webservice-description>
-    <webservice-description-name>HelloService</webservice-description-name>
-    <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+    <webservice-description-name>AdditionalService</webservice-description-name>
+    <wsdl-file>WEB-INF/wsdl/AdditionalService.wsdl</wsdl-file>
+    <jaxrpc-mapping-file>WEB-INF/additional-mapping.xml</jaxrpc-mapping-file>
     <port-component>
-      <port-component-name>HelloEndpointPort</port-component-name>
-      <wsdl-port>impl:HelloEndpointPort</wsdl-port>
-      <service-endpoint-interface>
-        org.jboss.test.ws.tools.jbws1090.HelloEndpoint
-      </service-endpoint-interface>
+      <port-component-name>AdditionalEndpointPort</port-component-name>
+      <wsdl-port>impl:AdditionalEndpointPort</wsdl-port>
+      <service-endpoint-interface>org.jboss.test.ws.tools.jbws1090.AdditionalEndpoint</service-endpoint-interface>
       <service-impl-bean>
-        <servlet-link>HelloEndpoint</servlet-link>
+        <servlet-link>AdditionalServlet</servlet-link>
       </service-impl-bean>
     </port-component>
   </webservice-description>

Modified: branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml	2006-08-31 03:19:11 UTC (rev 869)
+++ branches/jbossws-1.0/src/test/resources/tools/jbws1090/wstools-config.xml	2006-08-31 08:06:17 UTC (rev 870)
@@ -3,12 +3,12 @@
   xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
 
   <java-wsdl>
-    <service name="HelloService"
-      endpoint="org.jboss.test.ws.tools.jbws1090.HelloEndpoint" style="rpc" />
+    <service name="AdditionalService"
+      endpoint="org.jboss.test.ws.tools.jbws1090.AdditionalEndpoint" style="rpc" />
     <namespaces target-namespace="http://org.jboss.test.ws/jbws1090"
       type-namespace="http://org.jboss.test.ws/jbws1090/type" />
-    <mapping file="jaxrpc-mapping.xml" />
-    <webservices servlet-link="HelloEndpoint" append="true" />
+    <mapping file="additional-mapping.xml" />
+    <webservices servlet-link="AdditionalServlet" append="true" />
   </java-wsdl>
 
 </configuration>
\ No newline at end of file