[jboss-svn-commits] JBossWS SVN: r1051 - in trunk/src: main/java/org/jboss/ws/metadata/wsdl test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1205 test/resources/jaxrpc test/resources/jaxrpc/jbws1205 test/resources/jaxrpc/jbws1205/Client test/resources/jaxrpc/jbws1205/Client/META-INF test/resources/jaxrpc/jbws1205/SimpleEndpoint test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl test/resources/jaxrpc/jbws1205/TestEndpoint test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 25 18:53:52 EDT 2006
Author: darran.lofthouse at jboss.com
Date: 2006-09-25 18:53:34 -0400 (Mon, 25 Sep 2006)
New Revision: 1051
Added:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java
trunk/src/test/resources/jaxrpc/jbws1205/
trunk/src/test/resources/jaxrpc/jbws1205/Client/
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
Removed:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java
trunk/src/test/resources/jaxrpc/jbws1205/Client/
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl
trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
Modified:
trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
trunk/src/test/ant/build-jars-jaxrpc.xml
Log:
JBWS-1205 - Delete temporary files created while parsing WSDL
Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -104,6 +104,9 @@
// Map of <ns,URL> for schemalocation keyed by namespace
private Map<String, URL> schemaLocationsMap = new HashMap<String, URL>();
+ // Temporary files used by this reader.
+ private List<File> tempFiles = new ArrayList<File>();
+
/**
* Takes a WSDL11 Definition element and converts into
* our object graph that has been developed for WSDL20
@@ -127,9 +130,19 @@
if (getAllDefinedBindings(srcWsdl).size() != destWsdl.getBindings().length)
processUnreachableBindings(srcWsdl);
+ cleanupTemporaryFiles();
+
return destWsdl;
}
+ private void cleanupTemporaryFiles()
+ {
+ for (File current : tempFiles)
+ {
+ current.delete();
+ }
+ }
+
// process all bindings not within service separetly
private void processUnreachableBindings(Definition srcWsdl)
{
@@ -223,13 +236,7 @@
if (len > 0)
{
- Collection<URL> col = schemaLocationsMap.values();
JavaToXSD jxsd = new JavaToXSD();
- List<String> strlist = new ArrayList<String>();
- for (URL uri : col)
- {
- strlist.add(uri.toExternalForm());
- }
JBossXSModel xsmodel = jxsd.parseSchema(schemaLocationsMap);
WSDLUtils.addSchemaModel(destTypes, destWsdl.getTargetNamespace(), xsmodel);
}
@@ -332,7 +339,7 @@
log.trace("processSchemaInclude: [targetNS=" + targetNS + ",parentURL=" + wsdlLoc + "]");
tmpFile = SchemaUtils.getSchemaTempFile(targetNS);
- tmpFile.deleteOnExit();
+ tempFiles.add(tmpFile);
FileWriter fwrite = new FileWriter(tmpFile);
new DOMWriter(fwrite).setPrettyprint(true).print(schemaEl);
@@ -1144,4 +1151,4 @@
String attrValue = domElement.getAttribute(attrName);
return (attrValue.length() > 0 ? attrValue : null);
}
-}
\ No newline at end of file
+}
Modified: trunk/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -730,6 +730,54 @@
</webinf>
</war>
+ <!-- jbossws-jbws1205 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="simple-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="test-mapping.xml"/>
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <include name="simple-mapping.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1205-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <include name="test-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${build.test.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205 (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,61 +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.jaxrpc.jbws1205;
-
-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;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 21-September-2006
- */
-public class JBWS1205TestCase extends JBossWSTest
-{
-
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-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 = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- public void testEndpoint() throws Exception
- {
- port.performTest();
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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.jaxrpc.jbws1205;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 15-September-2006
- */
-public interface SimpleEndpoint extends Remote
-{
-
- public String echo(final String message) throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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.jaxrpc.jbws1205;
-
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 15-September-2006
- */
-public class SimpleEndpointImpl implements SimpleEndpoint
-{
-
- public String echo(String message) throws RemoteException
- {
- return message;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Sep 25 23:17:39 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jaxrpc.jbws1205;
-
-
-public class SimpleEndpoint_echo_RequestStruct
-{
-
-protected java.lang.String string_1;
-public SimpleEndpoint_echo_RequestStruct(){}
-
-public SimpleEndpoint_echo_RequestStruct(java.lang.String string_1){
-this.string_1=string_1;
-}
-public java.lang.String getString_1() { return string_1 ;}
-
-public void setString_1(java.lang.String string_1){ this.string_1=string_1; }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Sep 25 23:17:39 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jaxrpc.jbws1205;
-
-
-public class SimpleEndpoint_echo_ResponseStruct
-{
-
-protected java.lang.String result;
-public SimpleEndpoint_echo_ResponseStruct(){}
-
-public SimpleEndpoint_echo_ResponseStruct(java.lang.String result){
-this.result=result;
-}
-public java.lang.String getResult() { return result ;}
-
-public void setResult(java.lang.String result){ this.result=result; }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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.jaxrpc.jbws1205;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 21-September-2006
- */
-public interface TestEndpoint extends Remote
-{
-
- public void performTest() throws TestException, RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,96 +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.jaxrpc.jbws1205;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import org.jboss.ws.server.ServerConfig;
-import org.jboss.ws.server.ServerConfigFactory;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 21-September-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public void performTest() throws TestException
- {
- File[] baseFiles = null;
- File[] endFiles = null;
- String response = "";
-
- try
- {
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
- File tmpDir = serverConfig.getServerTempDir();
- tmpDir = new File(tmpDir.getCanonicalPath() + "/jbossws");
-
- baseFiles = getXsdTempFiles(tmpDir);
-
- SimpleEndpoint endpoint = getEndpoint();
-
- response = endpoint.echo("Hello");
-
- endFiles = getXsdTempFiles(tmpDir);
- }
- catch (Exception e)
- {
- throw new TestException("Test Failure", e);
- }
-
- if (response.equals("Hello") == false)
- {
- throw new TestException("Wrong response, expected 'Hello' got '" + response + "'");
- }
-
- if (endFiles.length > baseFiles.length)
- {
- throw new TestException("Call caused additional files to be created.");
- }
- }
-
- private SimpleEndpoint getEndpoint() throws Exception
- {
- Context ctx = new InitialContext();
- Service service = (Service)ctx.lookup("java:comp/env/service/SimpleService");
-
- return (SimpleEndpoint)service.getPort(SimpleEndpoint.class);
- }
-
- private File[] getXsdTempFiles(final File tmpDir)
- {
- return tmpDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".xsd");
- }
- });
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,54 +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.jaxrpc.jbws1205;
-
-/**
- * @author darran.lofthouse at jboss.com
- * @since 21-September-2006
- */
-public class TestException extends Exception
-{
-
- /** */
- private static final long serialVersionUID = 6362219977684523937L;
-
- public TestException()
- {
- super();
- }
-
- public TestException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public TestException(String message)
- {
- super(message);
- }
-
- public TestException(Throwable cause)
- {
- super(cause);
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java (from rev 1050, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestException.java)
Copied: trunk/src/test/resources/jaxrpc/jbws1205 (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/Client (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client/META-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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/test-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1205.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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/jaxrpc-jbws1205-test?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/Client/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,56 +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.jaxrpc.jbws1205</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1205/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint_echo_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1205/types'>typeNS:echo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>string_1</java-variable-name>
- <xml-element-name>String_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint_echo_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1205/types'>typeNS:echoResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1205.SimpleService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1205'>serviceNS:SimpleService</wsdl-service-name>
- <port-mapping>
- <port-name>SimpleEndpointPort</port-name>
- <java-port-name>SimpleEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1205'>portTypeNS:SimpleEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1205'>bindingNS:SimpleEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <wrapped-element/>
- <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/jbws1205'>wsdlMsgNS:SimpleEndpoint_echo</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/jbws1205'>wsdlMsgNS:SimpleEndpoint_echoResponse</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/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/simple-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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>SimpleEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SimpleEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1205' 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>SimpleService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SimpleService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/simple-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>SimpleEndpointPort</port-component-name>
- <wsdl-port>impl:SimpleEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>SimpleEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='SimpleService' targetNamespace='http://org.jboss.test.ws/jbws1205' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1205/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1205' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1205/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1205/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='echo'>
- <sequence>
- <element name='String_1' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='echoResponse'>
- <sequence>
- <element name='result' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <element name='echo' type='tns:echo'/>
- <element name='echoResponse' type='tns:echoResponse'/>
- </schema>
- </types>
- <message name='SimpleEndpoint_echo'>
- <part element='ns1:echo' name='parameters'/>
- </message>
- <message name='SimpleEndpoint_echoResponse'>
- <part element='ns1:echoResponse' name='result'/>
- </message>
- <portType name='SimpleEndpoint'>
- <operation name='echo'>
- <input message='tns:SimpleEndpoint_echo'/>
- <output message='tns:SimpleEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='SimpleEndpointBinding' type='tns:SimpleEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='SimpleService'>
- <port binding='tns:SimpleEndpointBinding' name='SimpleEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/wsdl/SimpleService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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="SimpleService" style="document" endpoint="org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint"/>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1205" type-namespace="http://org.jboss.test.ws/jbws1205/types"/>
- <mapping file="simple-mapping.xml"/>
- <webservices servlet-link="SimpleEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/SimpleEndpoint/wstools-config.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,12 +0,0 @@
-<!DOCTYPE jboss-web PUBLIC
- "-//JBoss//DTD Web Application 2.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-
- <service-ref>
- <service-ref-name>service/SimpleService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1205-simple?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-web>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/jboss-web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,39 +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.jaxrpc.jbws1205</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1205/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1205.TestException</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1205/types'>typeNS:TestException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <exception-mapping>
- <exception-type>org.jboss.test.ws.jaxrpc.jbws1205.TestException</exception-type>
- <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1205'>exMsgNS:TestException</wsdl-message>
- <constructor-parameter-order>
- <element-name>message</element-name>
- </constructor-parameter-order>
- </exception-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1205.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1205'>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.jaxrpc.jbws1205.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1205'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1205'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>performTest</java-method-name>
- <wsdl-operation>performTest</wsdl-operation>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/test-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1205.TestEndpointImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>service/SimpleService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/SimpleService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/simple-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1205.SimpleEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</web-app>
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1205' 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/test-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.jaxrpc.jbws1205.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/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl 2006-09-25 22:53:34 UTC (rev 1051)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1205' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1205/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1205' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1205/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1205/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='TestException'>
- <sequence>
- <element name='message' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <element name='TestException' type='tns:TestException'/>
- </schema>
- </types>
- <message name='TestEndpoint_performTest'/>
- <message name='TestEndpoint_performTestResponse'/>
- <message name='TestException'>
- <part element='ns1:TestException' name='TestException'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='performTest'>
- <input message='tns:TestEndpoint_performTest'/>
- <output message='tns:TestEndpoint_performTestResponse'/>
- <fault message='tns:TestException' name='TestException'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='performTest'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1205' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1205' use='literal'/>
- </output>
- <fault name='TestException'>
- <soap:fault name='TestException' use='literal'/>
- </fault>
- </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/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2006-09-25 22:12:44 UTC (rev 1050)
+++ trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml 2006-09-25 22:53:34 UTC (rev 1051)
@@ -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" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.jbws1205.TestEndpoint"/>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1205" type-namespace="http://org.jboss.test.ws/jbws1205/types"/>
- <mapping file="test-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml (from rev 1050, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1205/TestEndpoint/wstools-config.xml)
More information about the jboss-svn-commits
mailing list