Menu
▾
▴
[Jboss-svn-commits] JBossWS SVN: r512 - in trunk/src/test: ant java/org/jboss/test/ws java/org/jboss/test/ws/jbws1010 java/org/jboss/test/ws/tools java/org/jboss/test/ws/tools/sei resources resources/jbws1010 resources/jbws1010/META-INF resources/jbws1010/WEB-INF resources/jbws1010/WEB-INF/wsdl resources/wsdlfixture
|
From: <jbo...@li...> - 2006-06-29 08:36:43
|
Author: dar...@jb...
Date: 2006-06-29 04:36:26 -0400 (Thu, 29 Jun 2006)
New Revision: 512
Added:
trunk/src/test/java/org/jboss/test/ws/jbws1010/
trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/tools/sei/InheritenceChildInterface.java
trunk/src/test/java/org/jboss/test/ws/tools/sei/InheritenceParentInterface.java
trunk/src/test/resources/jbws1010/
trunk/src/test/resources/jbws1010/META-INF/
trunk/src/test/resources/jbws1010/META-INF/application-client.xml
trunk/src/test/resources/jbws1010/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1010/WEB-INF/
trunk/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1010/WEB-INF/web.xml
trunk/src/test/resources/jbws1010/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1010/WEB-INF/wsdl/
trunk/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jbws1010/wstools-config.xml
trunk/src/test/resources/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl
Removed:
trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java
trunk/src/test/resources/jbws1010/META-INF/
trunk/src/test/resources/jbws1010/META-INF/application-client.xml
trunk/src/test/resources/jbws1010/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1010/WEB-INF/
trunk/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1010/WEB-INF/web.xml
trunk/src/test/resources/jbws1010/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1010/WEB-INF/wsdl/
trunk/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jbws1010/wstools-config.xml
Modified:
trunk/src/test/ant/build-jars.xml
trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
Log:
Merged JBWS-1010 from branch/jbossws-1.0 to trunk
Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/ant/build-jars.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -288,7 +288,35 @@
<include name="jboss-client.xml"/>
</metainf>
</jar>
-
+
+ <!-- jbossws-jbws1010 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jbws231 -->
<war warfile="${build.test.dir}/libs/jbossws-jbws231.war" webxml="${build.test.dir}/resources/jbws231/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1010 (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java 2006-06-29 08:36:26 UTC (rev 512)
@@ -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.jbws1010;
-
-import java.rmi.RemoteException;
-
-/**
- *
- * @author dar...@jb...
- * @since 27-June-2006
- */
-public interface InheritenceChildInterface extends InheritenceParentInterface
-{
-
- public String getB() throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/InheritenceChildInterface.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,37 +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.jbws1010;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author dar...@jb...
- * @since 27 June 2006
- */
-public interface InheritenceParentInterface extends Remote
-{
-
- public String getA() throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/InheritenceParentInterface.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,65 +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.jbws1010;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.test.ws.jbws231.JBWS231TestCase;
-
-public class JBWS1010TestCase extends JBossWSTest
-{
-
- private static InheritenceChildInterface port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1010TestCase.class, "jbossws-jbws1010.war, jbossws-jbws1010-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (InheritenceChildInterface)service.getPort(InheritenceChildInterface.class);
- }
- }
-
- public void testGetA() throws Exception
- {
- String response = port.getA();
- assertEquals("A", response);
- }
-
- public void testGetB() throws Exception
- {
- String response = port.getB();
- assertEquals("B", response);
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,43 +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.jbws1010;
-
-import java.rmi.RemoteException;
-
-/**
- *
- * @author dar...@jb...
- * @since 27-June-2006
- */
-public class TestEndpointImpl implements InheritenceChildInterface
-{
-
- public String getA() throws RemoteException
- {
- return "A";
- }
-
- public String getB() throws RemoteException
- {
- return "B";
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1010/TestEndpointImpl.java)
Modified: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-06-29 08:36:26 UTC (rev 512)
@@ -28,6 +28,7 @@
import org.jboss.test.ws.jaxb.complex.ComplexTypes;
import org.jboss.test.ws.tools.sei.ArrayInterface;
import org.jboss.test.ws.tools.sei.CustomInterface;
+import org.jboss.test.ws.tools.sei.InheritenceChildInterface;
import org.jboss.test.ws.tools.sei.PrimitiveTypes;
import org.jboss.test.ws.tools.sei.ServiceException;
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
@@ -95,6 +96,14 @@
String fixturefile = "resources/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl";
doWSDLTest(seiClass, fixturefile);
}
+
+ /** Test a SEI that inherits a method from a super-interface. */
+ public void testInterfaceInheritence() throws Exception
+ {
+ Class seiClass = InheritenceChildInterface.class;
+ String fixturefile = "resources/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl";
+ doWSDLTest(seiClass, fixturefile);
+ }
private void doWSDLTest(Class seiClass, String fixturefile) throws Exception
{
Copied: trunk/src/test/java/org/jboss/test/ws/tools/sei/InheritenceChildInterface.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/sei/InheritenceChildInterface.java)
Copied: trunk/src/test/java/org/jboss/test/ws/tools/sei/InheritenceParentInterface.java (from rev 511, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/sei/InheritenceParentInterface.java)
Copied: trunk/src/test/resources/jbws1010 (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010)
Copied: trunk/src/test/resources/jbws1010/META-INF (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/META-INF)
Deleted: trunk/src/test/resources/jbws1010/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/META-INF/application-client.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/META-INF/application-client.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -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>HelloService</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.jbws1010.InheritenceChildInterface</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jbws1010/META-INF/application-client.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jbws1010/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/META-INF/jboss-client.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/META-INF/jboss-client.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -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-jbws1010?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jbws1010/META-INF/jboss-client.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jbws1010/WEB-INF (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF)
Deleted: trunk/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -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.jbws1010</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1010/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1010.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1010'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>InheritenceChildInterfacePort</port-name>
- <java-port-name>InheritenceChildInterfacePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1010.InheritenceChildInterface</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1010'>portTypeNS:InheritenceChildInterface</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1010'>bindingNS:InheritenceChildInterfaceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>getB</java-method-name>
- <wsdl-operation>getB</wsdl-operation>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1010'>wsdlMsgNS:InheritenceChildInterface_getBResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>getA</java-method-name>
- <wsdl-operation>getA</wsdl-operation>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1010'>wsdlMsgNS:InheritenceChildInterface_getAResponse</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/jbws1010/WEB-INF/jaxrpc-mapping.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/src/test/resources/jbws1010/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/web.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/WEB-INF/web.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,17 +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>
- <servlet-class>org.jboss.test.ws.jbws1010.TestEndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: trunk/src/test/resources/jbws1010/WEB-INF/web.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jbws1010/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/webservices.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/WEB-INF/webservices.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1010' 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>InheritenceChildInterfacePort</port-component-name>
- <wsdl-port>impl:InheritenceChildInterfacePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1010.InheritenceChildInterface</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/jbws1010/WEB-INF/webservices.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jbws1010/WEB-INF/wsdl (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1010' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1010' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='InheritenceChildInterface_getA'/>
- <message name='InheritenceChildInterface_getAResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <message name='InheritenceChildInterface_getB'/>
- <message name='InheritenceChildInterface_getBResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='InheritenceChildInterface'>
- <operation name='getA'>
- <input message='tns:InheritenceChildInterface_getA'/>
- <output message='tns:InheritenceChildInterface_getAResponse'/>
- </operation>
- <operation name='getB'>
- <input message='tns:InheritenceChildInterface_getB'/>
- <output message='tns:InheritenceChildInterface_getBResponse'/>
- </operation>
- </portType>
- <binding name='InheritenceChildInterfaceBinding' type='tns:InheritenceChildInterface'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='getA'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1010' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1010' use='literal'/>
- </output>
- </operation>
- <operation name='getB'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1010' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1010' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:InheritenceChildInterfaceBinding' name='InheritenceChildInterfacePort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jbws1010/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1010/wstools-config.xml 2006-06-29 07:53:21 UTC (rev 511)
+++ trunk/src/test/resources/jbws1010/wstools-config.xml 2006-06-29 08:36:26 UTC (rev 512)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<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.jbws1010.InheritenceChildInterface" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1010" type-namespace="http://org.jboss.test.ws/jbws1010/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jbws1010/wstools-config.xml (from rev 511, branches/jbossws-1.0/src/test/resources/jbws1010/wstools-config.xml)
Copied: trunk/src/test/resources/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl (from rev 511, branches/jbossws-1.0/src/test/resources/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl)
|
