[jboss-svn-commits] JBossWS SVN: r696 - in trunk/src: main/java/org/jboss/ws/deployment test/ant test/java/org/jboss/test/ws test/java/org/jboss/test/ws/jbws1107 test/resources test/resources/jbws1107 test/resources/jbws1107/META-INF test/resources/jbws1107/WEB-INF test/resources/jbws1107/WEB-INF/wsdl

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Aug 4 16:41:17 EDT 2006


Author: darran.lofthouse at jboss.com
Date: 2006-08-04 16:41:06 -0400 (Fri, 04 Aug 2006)
New Revision: 696

Added:
   trunk/src/test/java/org/jboss/test/ws/jbws1107/
   trunk/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java
   trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java
   trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java
   trunk/src/test/resources/jbws1107/
   trunk/src/test/resources/jbws1107/META-INF/
   trunk/src/test/resources/jbws1107/META-INF/application-client.xml
   trunk/src/test/resources/jbws1107/META-INF/jboss-client.xml
   trunk/src/test/resources/jbws1107/WEB-INF/
   trunk/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml
   trunk/src/test/resources/jbws1107/WEB-INF/web.xml
   trunk/src/test/resources/jbws1107/WEB-INF/webservices.xml
   trunk/src/test/resources/jbws1107/WEB-INF/wsdl/
   trunk/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl
   trunk/src/test/resources/jbws1107/wstools-config.xml
Removed:
   trunk/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java
   trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java
   trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java
   trunk/src/test/resources/jbws1107/META-INF/
   trunk/src/test/resources/jbws1107/META-INF/application-client.xml
   trunk/src/test/resources/jbws1107/META-INF/jboss-client.xml
   trunk/src/test/resources/jbws1107/WEB-INF/
   trunk/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml
   trunk/src/test/resources/jbws1107/WEB-INF/web.xml
   trunk/src/test/resources/jbws1107/WEB-INF/webservices.xml
   trunk/src/test/resources/jbws1107/WEB-INF/wsdl/
   trunk/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl
   trunk/src/test/resources/jbws1107/wstools-config.xml
Modified:
   trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
   trunk/src/test/ant/build-jars.xml
Log:
JBWS-1107 - Merged from branches/jbossws-1.0


Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointPublisher.java	2006-08-04 20:41:06 UTC (rev 696)
@@ -220,7 +220,7 @@
          if (targetBeanName == null)
             throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
          
-         sepTargetMap.put(linkName, targetBeanName);
+         sepTargetMap.put(linkName, targetBeanName.trim());
       }
 
       return sepTargetMap;

Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/ant/build-jars.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -314,6 +314,32 @@
       </metainf>
     </jar>
      
+    <!-- jbossws-jbws1107 -->
+    <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
+      <classes dir="${build.test.dir}/classes">
+      	<include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+      	<include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
+      </classes>
+      <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+        <include name="webservices.xml"/>
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </webinf>    	
+    </war>  	
+    <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
+      <fileset dir="${build.test.dir}/classes">
+        <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+      </fileset>
+      <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
+        <include name="application-client.xml"/>
+        <include name="jboss-client.xml"/>
+      </metainf>
+      <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </metainf>
+    </jar>
+        
     <!-- jbossws-jbws1121 -->
     <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
       <classes dir="${build.test.dir}/classes">

Copied: trunk/src/test/java/org/jboss/test/ws/jbws1107 (from rev 695, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107)

Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jbws1107;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
-
-/**
- * Test case to test that an endpoint can be accessed if there is whitespace
- * around the endpoint name in the web.xml
- * 
- * @author darran.lofthouse at jboss.com
- * @since 04-August-2006
- */
-public class JBWS1107TestCase extends JBossWSTest
-{
-
-   private static TestEndpoint port;
-
-   public static Test suite() throws Exception
-   {
-      return JBossWSTestSetup.newTestSetup(JBWS1107TestCase.class, "jbossws-jbws1107.war, jbossws-jbws1107-client.jar");
-   }
-
-   public void setUp() throws Exception
-   {
-      super.setUp();
-      if (port == null)
-      {
-         if (isTargetServerJBoss())
-         {
-            InitialContext iniCtx = getInitialContext();
-            Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
-            port = (TestEndpoint)service.getPort(TestEndpoint.class);
-         }
-         else
-         {
-            ServiceFactoryImpl factory = new ServiceFactoryImpl();
-            URL wsdlURL = new File("resources/jbws1107/WEB-INF/wsdl/TestService.wsdl").toURL();
-            URL mappingURL = new File("resources/jbws1107/WEB-INF/jaxrpc-mapping.xml").toURL();
-            QName qname = new QName("http://org.jboss.test.ws/jbws1107", "TestService");
-            Service service = factory.createService(wsdlURL, qname, mappingURL);
-            port = (TestEndpoint)service.getPort(TestEndpoint.class);
-         }
-      }
-   }
-
-
-   public void testAccessEnpoint() throws Exception
-   {
-      assertEquals("Hello", port.echoString("Hello"));
-   }
-
-}

Copied: trunk/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java (from rev 695, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/JBWS1107TestCase.java)

Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jbws1107;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 04-August-2006
- */
-public interface TestEndpoint extends Remote
-{
-
-   public String echoString(final String message) throws RemoteException;
-
-}

Copied: trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java (from rev 695, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/TestEndpoint.java)

Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jbws1107;
-
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 04-August-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
-   public String echoString(String message) throws RemoteException
-   {
-      return message;
-   }
-
-}

Copied: trunk/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java (from rev 695, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1107/TestEndpointImpl.java)

Copied: trunk/src/test/resources/jbws1107 (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107)

Copied: trunk/src/test/resources/jbws1107/META-INF (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/META-INF)

Deleted: trunk/src/test/resources/jbws1107/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/META-INF/application-client.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/META-INF/application-client.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-  version="1.4">
-
-  <display-name>TestService</display-name>
-
-  <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
-    <service-interface>javax.xml.rpc.Service</service-interface>
-    <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-    <port-component-ref>
-      <service-endpoint-interface>org.jboss.test.ws.jbws1107.TestEndpoint</service-endpoint-interface>
-    </port-component-ref>
-  </service-ref>
-
-</application-client>
-

Copied: trunk/src/test/resources/jbws1107/META-INF/application-client.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/META-INF/application-client.xml)

Deleted: trunk/src/test/resources/jbws1107/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/META-INF/jboss-client.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/META-INF/jboss-client.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
-   "-//JBoss//DTD Application Client 4.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
-  <jndi-name>jbossws-client</jndi-name>
-
-  <service-ref>
-    <service-ref-name>service/TestService</service-ref-name>
-    <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-jbws1107/TestEndpoint?wsdl</wsdl-override>
-  </service-ref>
-
-</jboss-client>

Copied: trunk/src/test/resources/jbws1107/META-INF/jboss-client.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/META-INF/jboss-client.xml)

Copied: trunk/src/test/resources/jbws1107/WEB-INF (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF)

Deleted: trunk/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
-  <package-type>org.jboss.test.ws.jbws1107</package-type>
-  <namespaceURI>http://org.jboss.test.ws/jbws1107/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
-  <service-interface>org.jboss.test.ws.jbws1107.TestService</service-interface>
-  <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1107'>serviceNS:TestService</wsdl-service-name>
-  <port-mapping>
-   <port-name>TestEndpointPort</port-name>
-   <java-port-name>TestEndpointPort</java-port-name>
-  </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-  <service-endpoint-interface>org.jboss.test.ws.jbws1107.TestEndpoint</service-endpoint-interface>
-  <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1107'>portTypeNS:TestEndpoint</wsdl-port-type>
-  <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1107'>bindingNS:TestEndpointBinding</wsdl-binding>
-  <service-endpoint-method-mapping>
-   <java-method-name>echoString</java-method-name>
-   <wsdl-operation>echoString</wsdl-operation>
-   <method-param-parts-mapping>
-    <param-position>0</param-position>
-    <param-type>java.lang.String</param-type>
-    <wsdl-message-mapping>
-     <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1107'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
-     <wsdl-message-part-name>String_1</wsdl-message-part-name>
-     <parameter-mode>IN</parameter-mode>
-    </wsdl-message-mapping>
-   </method-param-parts-mapping>
-   <wsdl-return-value-mapping>
-    <method-return-value>java.lang.String</method-return-value>
-    <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1107'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
-    <wsdl-message-part-name>result</wsdl-message-part-name>
-   </wsdl-return-value-mapping>
-  </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file

Copied: trunk/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/jaxrpc-mapping.xml)

Deleted: trunk/src/test/resources/jbws1107/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/web.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/WEB-INF/web.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-  version="2.4">
-
-  <servlet>
-    <servlet-name>TestEndpoint</servlet-name>
-    
-    <!-- Do not remove the whitespace as this test is to test  -->
-    <!-- that endpoints can be deployed with whitespace around -->
-    <!-- the class name.                                       -->
-    
-    <servlet-class>
-      org.jboss.test.ws.jbws1107.TestEndpointImpl
-    </servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>TestEndpoint</servlet-name>
-    <url-pattern>/TestEndpoint</url-pattern>
-  </servlet-mapping>
-
-</web-app>
-

Copied: trunk/src/test/resources/jbws1107/WEB-INF/web.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/web.xml)

Deleted: trunk/src/test/resources/jbws1107/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/webservices.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/WEB-INF/webservices.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1107' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
-  <webservice-description-name>TestService</webservice-description-name>
-  <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
-  <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-  <port-component>
-   <port-component-name>TestEndpointPort</port-component-name>
-   <wsdl-port>impl:TestEndpointPort</wsdl-port>
-   <service-endpoint-interface>org.jboss.test.ws.jbws1107.TestEndpoint</service-endpoint-interface>
-   <service-impl-bean>
-    <servlet-link>TestEndpoint</servlet-link>
-   </service-impl-bean>
-  </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file

Copied: trunk/src/test/resources/jbws1107/WEB-INF/webservices.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/webservices.xml)

Copied: trunk/src/test/resources/jbws1107/WEB-INF/wsdl (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/wsdl)

Deleted: trunk/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1107' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1107' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_echoString'>
-  <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoStringResponse'>
-  <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
-  <operation name='echoString' parameterOrder='String_1'>
-   <input message='tns:TestEndpoint_echoString'/>
-   <output message='tns:TestEndpoint_echoStringResponse'/>
-  </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
-  <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
-  <operation name='echoString'>
-   <soap:operation soapAction=''/>
-   <input>
-    <soap:body namespace='http://org.jboss.test.ws/jbws1107' use='literal'/>
-   </input>
-   <output>
-    <soap:body namespace='http://org.jboss.test.ws/jbws1107' use='literal'/>
-   </output>
-  </operation>
- </binding>
- <service name='TestService'>
-  <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
-   <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
-  </port>
- </service>
-</definitions>
\ No newline at end of file

Copied: trunk/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/WEB-INF/wsdl/TestService.wsdl)

Deleted: trunk/src/test/resources/jbws1107/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1107/wstools-config.xml	2006-08-04 20:12:19 UTC (rev 695)
+++ trunk/src/test/resources/jbws1107/wstools-config.xml	2006-08-04 20:41:06 UTC (rev 696)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<!--  Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat -->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-  <java-wsdl>
-    <service name="TestService" endpoint="org.jboss.test.ws.jbws1107.TestEndpoint" style="rpc">
-    </service>
-    <namespaces target-namespace="http://org.jboss.test.ws/jbws1107" type-namespace="http://org.jboss.test.ws/jbws1107/types"/>
-    <mapping file="jaxrpc-mapping.xml"/>
-    <webservices servlet-link="TestEndpoint"/>
-  </java-wsdl>
-</configuration>

Copied: trunk/src/test/resources/jbws1107/wstools-config.xml (from rev 695, branches/jbossws-1.0/src/test/resources/jbws1107/wstools-config.xml)




More information about the jboss-svn-commits mailing list