January 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5525 - in stack/native/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-01-23 10:49:19 -0500 (Wed, 23 Jan 2008) New Revision: 5525 Added: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml stack/native/trunk/src/main/distro/eclipse.classpath stack/native/trunk/src/main/distro/eclipse.project stack/native/trunk/src/main/distro/user-project-build.xml stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/src/main/distro/bin-dist-build.xml Log: - Simple user WS-enabled project generator (like Seam-gen) - [JBWS-1887] Basic Eclipse configuration for user WS-enabled projects - [JBWS-1888] Simple Ant build file for user WS-enabled projects Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-23 14:29:51 UTC (rev 5524) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-23 15:49:19 UTC (rev 5525) @@ -43,6 +43,7 @@ <copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/> <copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/> <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/> + <copy tofile="${bindist.build.dir}/build-project-gen.xml" file="${core.distro.dir}/bin-dist-project-gen.xml"/>  <copy todir="${bindist.build.dir}"> @@ -50,6 +51,11 @@ <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> + <fileset dir="${core.distro.dir}"> + <include name="user-project-build.xml"/> + <include name="eclipse.project"/> + <include name="eclipse.classpath"/> + </fileset> </copy> <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-01-23 14:29:51 UTC (rev 5524) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-01-23 15:49:19 UTC (rev 5525) @@ -98,6 +98,7 @@ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/build-project-gen.xml"/> <import file="${basedir}/build/macros-deploy-framework.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Added: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-project-gen.xml (rev 0) +++ stack/native/trunk/src/main/distro/bin-dist-project-gen.xml 2008-01-23 15:49:19 UTC (rev 5525) @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="init-project-properties"> + <property file="./user-project.properties" /> + <property name="project.home" value="${workspace.home}/${project.name}"/> + + <filterset id="project"> + <filter token="projectName" value="${project.name}" /> + <filter token="jbossHome" value="${jboss.home}" /> + </filterset> + + <path id="jbws-ant.path" path="${basedir}/lib/jbossws-core.jar"/> + <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> + </target> + + <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> + <property file="./user-project.properties" prefix="old" /> + + <echo message="-------------------------------------------------"/> + <echo message=" Welcome to the JBossWS user project generator"/> + <echo message="-------------------------------------------------"/> + <echo message=""/> + + <property name="old.workspace.home" value="C:/Projects"/> + <input addproperty="workspace.home.new" + message="Enter your Java project workspace (the directory that contains your projects) [${old.workspace.home}]" + defaultvalue="${old.workspace.home}"/> + <pathFixer property="workspace.home.new" /> + + <property name="old.jboss.home" value="C:/Program Files/jboss-4.2.2.GA"/> + <input addproperty="jboss.home.new" + message="Enter your JBoss home directory [${old.jboss.home}]" + defaultvalue="${old.jboss.home}"/> + <pathFixer property="jboss.home.new" /> + + <property name="old.jboss.conf" value="default"/> + <input addproperty="jboss.conf.new" + message="Enter the JBoss configuration you would like to use [${old.jboss.conf}]" + defaultvalue="${old.jboss.conf}"/> + + <property name="old.project.name" value="myproject"/> + <input addproperty="project.name.new" + message="Enter the project name [${old.project.name}]" + defaultvalue="${old.project.name}"/> + + <property name="old.project.type" value="jar"/> + <input addproperty="project.type.new" + message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) [${old.project.type}] " + validargs="jar,war" + defaultvalue="${old.project.type}"/> + + <delete file="user-project.properties"/> + <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup"> + <entry key="workspace.home" value="${workspace.home.new}"/> + <entry key="project.name" value="${project.name.new}"/> + <entry key="project.type" value="${project.type.new}"/> + <entry key="jboss.home" value="${jboss.home.new}"/> + <entry key="jboss.conf" value="${jboss.conf.new}"/> + </propertyfile> + + <echo message=""/> + <echo message="Your project settings have been saved in file 'user-project.properties'."/> + <echo message="Please type 'ant create-project' to create the new project."/> + </target> + + <target name="create-project" depends="validate-settings,configure-project,copy-libraries" description="Create a new user project"> + <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/> + <echo message="It includes a simple Ant build file and the required libraries."/> + <echo message="Please refer to http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS for the authoritative documentation."/> + <echo message=""/> + <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/> + <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/> + <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/> + </target> + + <target name="validate-settings" depends="init-project-properties"> + <fail message="No project name specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="project.name"/></not> + <equals arg1="${project.name}" arg2=""/> + </or> + </condition> + </fail> + <fail message="No project workspace specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="workspace.home"/></not> + <equals arg1="${workspace.home}" arg2=""/> + </or> + </condition> + </fail> + </target> + + <target name="configure-project"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <mkdir dir="${project.home}/lib"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/.project" file="${basedir}/build/eclipse.project"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/.classpath" file="${basedir}/build/eclipse.classpath"/> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + </target> + + <target name="copy-libraries"> + <echo message="Copying JBossWS libraries to the ${project.home}/lib directory..." /> + <copy todir="${project.home}/lib" overwrite="true"> + <fileset dir="${basedir}/lib" > + <include name="jaxb-api.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <echo message="Copying other JBoss libraries to the ${project.home}/lib directory..." /> + <copy todir="${project.home}/lib" overwrite="true"> + <fileset dir="${jboss.home}/client" > + <include name="jbossall-client.jar"/> + <include name="jboss-ejb3x.jar"/> + <include name="ejb3-persistence.jar"/> + </fileset> + </copy> + </target> + + + <target name="update-project" depends="validate-settings,copy-libraries" description="Update user project libs"> + <echo message="Libraries from the current configuration have been copied to the '${project.name}' project's lib directory."/> + <echo message="Please refresh / rebuild your project now." /> + </target> + + <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> + <echo message="Deleting the entire project in ${project.home}" /> + <delete dir="${project.home}" /> + </target> + + <target name="settings" depends="init-project-properties" description="Print the current project settings"> + <echo message="Java project workspace: ${workspace.home}"/> + <echo message="JBoss home: ${jboss.home}"/> + <echo message="JBoss conf: ${jboss.conf}"/> + <echo message="Project name: ${project.name}"/> + <echo message="Project type: ${project.type}"/> + </target> + +</project> \ No newline at end of file Property changes on: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/distro/eclipse.classpath =================================================================== --- stack/native/trunk/src/main/distro/eclipse.classpath (rev 0) +++ stack/native/trunk/src/main/distro/eclipse.classpath 2008-01-23 15:49:19 UTC (rev 5525) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="classes/main" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/ejb3-persistence.jar"/> + <classpathentry kind="lib" path="lib/jaxb-api.jar"/> + <classpathentry kind="lib" path="lib/jboss-ejb3x.jar"/> + <classpathentry kind="lib" path="lib/jboss-jaxrpc.jar"/> + <classpathentry kind="lib" path="lib/jboss-jaxws.jar"/> + <classpathentry kind="lib" path="lib/jbossall-client.jar"/> + <classpathentry kind="lib" path="lib/jbossws-client.jar"/> + <classpathentry kind="lib" path="lib/jbossws-core.jar"/> + <classpathentry kind="lib" path="lib/jbossws-spi.jar"/> + <classpathentry kind="output" path="classes"/> +</classpath> Added: stack/native/trunk/src/main/distro/eclipse.project =================================================================== --- stack/native/trunk/src/main/distro/eclipse.project (rev 0) +++ stack/native/trunk/src/main/distro/eclipse.project 2008-01-23 15:49:19 UTC (rev 5525) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>@projectName@</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: stack/native/trunk/src/main/distro/user-project-build.xml =================================================================== --- stack/native/trunk/src/main/distro/user-project-build.xml (rev 0) +++ stack/native/trunk/src/main/distro/user-project-build.xml 2008-01-23 15:49:19 UTC (rev 5525) @@ -0,0 +1,77 @@ +<?xml version="1.0"?> +<project name="@projectName@" default="deploy" basedir="." > + + <property file="${basedir}/build.properties" /> + +  + <property name="project.name" value="@projectName@" /> + <property name="dist.dir" value="dist" /> + <property name="lib.dir" value="lib" /> + <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> + <property name="output.dir" value="output" /> + <property name="src.main.dir" value="src/main/java" /> + <property name="resources.main.dir" value="src/main/resources" /> + <property name="classes.main.dir" value="classes/main/java" /> + <property name="javac.debug" value="true" /> + <property name="javac.deprecation" value="false" /> + + <condition property="project.war" value="true"> + <equals arg1="${project.type}" arg2="war"/> + </condition> + + <fileset id="lib" dir="${lib.dir}"> + <include name="*.jar" /> + </fileset> + + <path id="build.classpath"> + <fileset refid="lib" /> + </path> + + <target name="clean"> + <delete dir="${output.dir}" /> + <delete dir="${dist.dir}" /> + </target> + + <target name="init"> + <mkdir dir="${output.dir}" /> + <mkdir dir="${dist.dir}" /> + </target> + + <target name="compile" depends="init" description="Compile the Java source code" unless="eclipse.running"> + <tstamp/> + <javac destdir="${output.dir}" classpathref="build.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on"> + <src path="${src.main.dir}" /> + </javac> + </target> + + <target name="copyclasses" depends="init" description="Copy the classes that were compiled by Eclipse" if="eclipse.running"> + <copy todir="${output.dir}"> + <fileset dir="${classes/main}"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> + + <target name="dist" depends="compile,copyclasses" description="Create the application distribution archive"> + <fail unless="project.type">project.type not set</fail> + <jar jarfile="${dist.dir}/${project.name}.${project.type}"> + <fileset dir="${output.dir}" /> + <fileset dir="${resources.main.dir}"> + <include name="META-INF/**"/> + <include name="WEB-INF/**" if="project.war" /> + </fileset> + </jar> + </target> + + <target name="deploy" depends="dist" description="Deploy to JBoss AS"> + <fail unless="jboss.home">jboss.home not set</fail> + <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> + </target> + + <target name="undeploy" description="Undeploy from JBoss AS"> + <fail unless="jboss.home">jboss.home not set</fail> + <fail unless="jboss.conf">jboss.conf not set</fail> + <delete file="${deploy.dir}/${project.name}.${project.type}" /> + </target> + +</project> Property changes on: stack/native/trunk/src/main/distro/user-project-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java 2008-01-23 15:49:19 UTC (rev 5525) @@ -0,0 +1,46 @@ +/* + * 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.ws.tools.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class FixPathTask extends Task +{ + private String propertyName; + + @Override + public void execute() throws BuildException + { + String path = getProject().getProperty(propertyName); + + if (path != null) + { + getProject().setProperty(propertyName, path.replace('\\', '/')); + } + } + + public void setProperty(String propertyName) + { + this.propertyName = propertyName; + } +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5524 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxrpc/jbws1124 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-01-23 09:29:51 -0500 (Wed, 23 Jan 2008) New Revision: 5524 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml stack/native/trunk/version.properties Log: Remoting 2.2.2.SP4 is used for 4.2 and 5.0 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2008-01-23 14:28:07 UTC (rev 5523) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2008-01-23 14:29:51 UTC (rev 5524) @@ -52,8 +52,8 @@ { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124one/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService"); + URL mappingURL = new File("resources/jaxrpc/jbas5151/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.test.ws/jbas5151", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); assertEquals("jbws1124one", port.getResourceString()); @@ -64,8 +64,8 @@ { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124two/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService"); + URL mappingURL = new File("resources/jaxrpc/jbas5151/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.test.ws/jbas5151", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); assertEquals("jbws1124two", port.getResourceString()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java 2008-01-23 14:28:07 UTC (rev 5523) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java 2008-01-23 14:29:51 UTC (rev 5524) @@ -30,10 +30,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import javax.jws.WebService; + /** - * @author Thomas.Diesler(a)jboss.org - * @since 07-August-2006 + * @author Heiko.Braun(a)jboss.org */ +@WebService public class TestEndpointImpl implements TestEndpoint { private Logger log = Logger.getLogger(TestEndpointImpl.class); Modified: stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml 2008-01-23 14:28:07 UTC (rev 5523) +++ stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml 2008-01-23 14:29:51 UTC (rev 5524) @@ -4,6 +4,6 @@ PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> -<jboss-app> +<jboss-app> <module-order>strict</module-order> </jboss-app> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-01-23 14:28:07 UTC (rev 5523) +++ stack/native/trunk/version.properties 2008-01-23 14:29:51 UTC (rev 5524) @@ -32,11 +32,11 @@ # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR5 -jboss-remoting-jboss50=2.2.2.SP2 +jboss-remoting-jboss50=2.2.2.SP4 # JBossAS-4.2 jboss-jbossxb-jboss42=1.0.0.SP1 -jboss-remoting-jboss42=2.2.2.SP1 +jboss-remoting-jboss42=2.2.2.SP4 # JBossAS-4.0 jboss-jbossxb-jboss40=1.0.0.CR11

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5523 - stack/native/branches/jbossws-native-2.0.3.QA.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-01-23 09:28:07 -0500 (Wed, 23 Jan 2008) New Revision: 5523 Modified: stack/native/branches/jbossws-native-2.0.3.QA/jbossws-native-2.0.3.QA.iml stack/native/branches/jbossws-native-2.0.3.QA/version.properties Log: Remoting 2.2.2.SP4 is used for 4.2 and 5.0 Modified: stack/native/branches/jbossws-native-2.0.3.QA/jbossws-native-2.0.3.QA.iml =================================================================== --- stack/native/branches/jbossws-native-2.0.3.QA/jbossws-native-2.0.3.QA.iml 2008-01-23 14:08:55 UTC (rev 5522) +++ stack/native/branches/jbossws-native-2.0.3.QA/jbossws-native-2.0.3.QA.iml 2008-01-23 14:28:07 UTC (rev 5523) @@ -9,6 +9,636 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-j2ee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/resolver.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xalan.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting-src.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/serializer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/concurrent.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xml-apis.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/qdox.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xmlunit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-jaxb-intros.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/mail.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j-src.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/policy.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/commons-collections.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/stax-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xmlsec.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-resources.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/hibernate3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: stack/native/branches/jbossws-native-2.0.3.QA/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.3.QA/version.properties 2008-01-23 14:08:55 UTC (rev 5522) +++ stack/native/branches/jbossws-native-2.0.3.QA/version.properties 2008-01-23 14:28:07 UTC (rev 5523) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.3.GA -repository.id=2.0.3.GA +version.id=2.0.3.QA +repository.id=snapshot implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -32,11 +32,11 @@ # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR5 -jboss-remoting-jboss50=2.2.2.SP2 +jboss-remoting-jboss50=2.2.2.SP4 # JBossAS-4.2 jboss-jbossxb-jboss42=1.0.0.SP1 -jboss-remoting-jboss42=2.2.2.SP1 +jboss-remoting-jboss42=2.2.2.SP4 # JBossAS-4.0 jboss-jbossxb-jboss40=1.0.0.CR11

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5522 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/tools and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 09:08:55 -0500 (Wed, 23 Jan 2008) New Revision: 5522 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java Log: [JBPAPP-575] WSDL To Java - All generated types have first character upper case, extends clause in base types do not take this into account. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-01-23 13:55:03 UTC (rev 5521) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -712,7 +712,7 @@ } if (baseName == null && baseType != null) - baseName = baseType.getName(); + baseName = ToolsUtils.firstLetterUpperCase(baseType.getName()); return baseName; } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881 (from rev 4971, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1881; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1881 - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 1, 2007 - */ -public class JBWS1881TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1881/" + scenario; - String toolsDir = "tools/jbws1881/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (from rev 4971, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1881; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1881 + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 1, 2007 + */ +public class JBWS1881TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1881/" + scenario; + String toolsDir = "tools/jbws1881/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881 (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Base.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class Base -{ - -protected java.lang.String id; -public Base(){} - -public Base(java.lang.String id){ -this.id=id; -} -public java.lang.String getId() { return id ;} - -public void setId(java.lang.String id){ this.id=id; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Base.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Base.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class Base +{ + +protected java.lang.String id; +public Base(){} + +public Base(java.lang.String id){ +this.id=id; +} +public java.lang.String getId() { return id ;} + +public void setId(java.lang.String id){ this.id=id; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Person.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class Person - extends Base{ - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/Person.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class Person + extends Base{ + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1881' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1881' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1881/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='base'> - <sequence> - <element name='id' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='Person'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name='TelephoneNumber'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1881' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1881' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1881/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='base'> + <sequence> + <element name='id' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='Person'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name='TelephoneNumber'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class TelephoneNumber - extends Base{ - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class TelephoneNumber + extends Base{ + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,67 +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.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1881.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,67 @@ +<?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.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1881.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</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 Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-01-23 14:08:55 UTC (rev 5522) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-01-23 14:08:55 UTC (rev 5522) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5521 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: main/java/org/jboss/ws/tools/helpers and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 08:55:03 -0500 (Wed, 23 Jan 2008) New Revision: 5521 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: [JBPAPP-574] WSDL to Java - Incorrect case of generated type for anonymous type. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-23 13:49:17 UTC (rev 5520) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -555,7 +555,7 @@ XSElementDeclaration element = (XSElementDeclaration)term; XSTypeDefinition type = element.getTypeDefinition(); - String tempContainingElement = containingElement + element.getName(); + String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName()); QName xmlType = null; if (type.getAnonymous() == false) @@ -711,7 +711,7 @@ if (unwrapper.xmlType != null) xmlType = unwrapper.xmlType; - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); if (unwrapper.array) arraySuffix = "[]"; Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 13:49:17 UTC (rev 5520) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -298,7 +298,7 @@ xt = element.getTypeDefinition(); primitive = unwrapper.primitive; partName = element.getName(); - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); array = unwrapper.array; if (xt.getAnonymous()) { @@ -632,7 +632,8 @@ QName xmlType; if (type.getAnonymous()) { - xmlType = new QName(type.getNamespace(), containingElement + element.getName()); + String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName()); + xmlType = new QName(type.getNamespace(), tempName); } else { @@ -715,7 +716,8 @@ // Anonymous if (localName == null) { - javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); + String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); + javaType = getJavaTypeAsString(null, new QName(tempName), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1873; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1873 - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 29, 2007 - */ -public class JBWS1873TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1873/" + scenario; - String toolsDir = "tools/jbws1873/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1873; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1873 + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 29, 2007 + */ +public class JBWS1873TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1873/" + scenario; + String toolsDir = "tools/jbws1873/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * 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.jbws1873; - - -public class LookupRequest -{ - -protected java.lang.String surname; -public LookupRequest(){} - -public LookupRequest(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * 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.jbws1873; + + +public class LookupRequest +{ + +protected java.lang.String surname; +public LookupRequest(){} + +public LookupRequest(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * 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.jbws1873; - - -public class LookupResponseResponse -{ - -protected java.lang.String number; -public LookupResponseResponse(){} - -public LookupResponseResponse(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * 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.jbws1873; + + +public class LookupResponseResponse +{ + +protected java.lang.String number; +public LookupResponseResponse(){} + +public LookupResponseResponse(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * 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.jbws1873; - - -public class Person -{ - -protected org.jboss.test.ws.jbws1873.LookupRequest request; -public Person(){} - -public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ -this.request=request; -} -public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} - -public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/Person.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * 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.jbws1873; + + +public class Person +{ + +protected org.jboss.test.ws.jbws1873.LookupRequest request; +public Person(){} + +public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ +this.request=request; +} +public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} + +public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1873' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1873' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1873/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name="request" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> - </all> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name="response" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> - </all> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1873' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1873' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1873/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name="request" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> + </all> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name="response" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> + </all> + </complexType> + </element> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * 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.jbws1873; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * 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.jbws1873; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * 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.jbws1873; - - -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ -this.response=response; -} -public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} - -public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * 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.jbws1873; + + +public class TelephoneNumber +{ + +protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; +public TelephoneNumber(){} + +public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ +this.response=response; +} +public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} + +public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,78 +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.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>request</java-variable-name> - <xml-element-name>request</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>response</java-variable-name> - <xml-element-name>response</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>request</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>response</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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,78 @@ +<?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.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>request</java-variable-name> + <xml-element-name>request</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>response</java-variable-name> + <xml-element-name>response</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>request</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>response</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 Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-01-23 13:55:03 UTC (rev 5521) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" - parameter-style="wrapped"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-01-23 13:55:03 UTC (rev 5521) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" + parameter-style="wrapped"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5520 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/tools and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 08:49:17 -0500 (Wed, 23 Jan 2008) New Revision: 5520 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: [JBPAPP-573] JBossWS - WSDL To Java - When an array is returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 13:43:27 UTC (rev 5519) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -489,7 +489,8 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(input); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped()); + // Don't unwrap the actual parameter. + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, false); } else { @@ -503,7 +504,8 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(output); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped()); + // Don't unwrap the response type. + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false); } else { @@ -704,7 +706,7 @@ } } - if ((skipWrapperArray && isRepresentsArray(xt)) == false) + if ((skipWrapperArray && SchemaUtils.isWrapperArrayType(xt)) == false) { jxtm = new JavaXmlTypeMapping(jwm); String javaType; @@ -900,40 +902,6 @@ } /** - * Checks whether the type represents an array type - * - * @param xst - * @return true: type represents an array - */ - private boolean isRepresentsArray(XSTypeDefinition xst) - { - boolean bool = false; - if (xst instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xst; - if (xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY) - return false; - XSParticle xsp = xc.getParticle(); - - if (xsp == null) - return false; - - XSTerm xsterm = xsp.getTerm(); - if (xsterm instanceof XSModelGroup) - { - XSModelGroup xm = (XSModelGroup)xsterm; - XSObjectList xo = xm.getParticles(); - if (xo.getLength() == 1) - { - XSParticle xp = (XSParticle)xo.item(0); - bool = xp.getMaxOccursUnbounded() || xp.getMaxOccurs() > 1; - } - } - } - return bool; - } - - /** * Any custom decisions that need to be made will be done here * * @param javaType Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801 (from rev 4547, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1801; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1801 - * - * WSDL To Java - When an array if returned from a method - * on the SEI it is incorrectly ommitted from the generated - * JAX-RPC mapping. - * - * @author darran.lofthouse(a)jboss.com - * @since Sep 11, 2007 - */ -public class JBWS1801TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1801/" + scenario; - String toolsDir = "tools/jbws1801/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (from rev 4547, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1801; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1801 + * + * WSDL To Java - When an array if returned from a method + * on the SEI it is incorrectly ommitted from the generated + * JAX-RPC mapping. + * + * @author darran.lofthouse(a)jboss.com + * @since Sep 11, 2007 + */ +public class JBWS1801TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1801/" + scenario; + String toolsDir = "tools/jbws1801/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1801/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801 (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Sep 11 12:13:54 BST 2007 - * - * 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.jbws1801; - - -public class Person -{ - -protected java.lang.String[] surname; -public Person(){} - -public Person(java.lang.String[] surname){ -this.surname=surname; -} -public java.lang.String[] getSurname() { return surname ;} - -public void setSurname(java.lang.String[] surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/Person.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Sep 11 12:13:54 BST 2007 + * + * 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.jbws1801; + + +public class Person +{ + +protected java.lang.String[] surname; +public Person(){} + +public Person(java.lang.String[] surname){ +this.surname=surname; +} +public java.lang.String[] getSurname() { return surname ;} + +public void setSurname(java.lang.String[] surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1801' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1801/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1801' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1801/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook.wsdl 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1801' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1801/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1801' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1801/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1801/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Sep 11 12:13:54 BST 2007 - * - * 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.jbws1801; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/PhoneBook_PortType.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Sep 11 12:13:54 BST 2007 + * + * 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.jbws1801; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1801.TelephoneNumber lookup(org.jboss.test.ws.jbws1801.Person lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Sep 11 12:13:54 BST 2007 - * - * 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.jbws1801; - - -public class TelephoneNumber -{ - -protected java.lang.String[] number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String[] number){ -this.number=number; -} -public java.lang.String[] getNumber() { return number ;} - -public void setNumber(java.lang.String[] number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/TelephoneNumber.java 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Sep 11 12:13:54 BST 2007 + * + * 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.jbws1801; + + +public class TelephoneNumber +{ + +protected java.lang.String[] number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String[] number){ +this.number=number; +} +public java.lang.String[] getNumber() { return number ;} + +public void setNumber(java.lang.String[] number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,59 +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.jbws1801</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1801</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1801.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1801.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/jaxrpc-mapping.xml 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,59 @@ +<?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.jbws1801</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1801/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1801</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1801</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1801.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1801.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1801/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1801.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1801'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1801.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1801'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1801'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1801.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1801.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1801'>wsdlMsgNS:PhoneBook_lookupResponse</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 Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2007-09-11 12:45:34 UTC (rev 4547) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2008-01-23 13:49:17 UTC (rev 5520) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (from rev 4547, stack/native/trunk/src/test/resources/tools/jbws1801/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2008-01-23 13:49:17 UTC (rev 5520) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1801/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5519 - stack/native/branches/jbossws-native-2.0.1.SP2_CP.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 08:43:27 -0500 (Wed, 23 Jan 2008) New Revision: 5519 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties Log: Update version.id to identify as CP branch. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-01-23 13:31:41 UTC (rev 5518) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-01-23 13:43:27 UTC (rev 5519) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2 -repository.id=2.0.1.SP2 +version.id=2.0.1.SP2_CP +repository.id=2.0.1.SP2_CP implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5518 - stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 08:31:41 -0500 (Wed, 23 Jan 2008) New Revision: 5518 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/version.properties Log: [JBWS-1963] Update version.id Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/version.properties 2008-01-23 12:36:23 UTC (rev 5517) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/version.properties 2008-01-23 13:31:41 UTC (rev 5518) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2 +version.id=2.0.1.SP2_JBWS-1963 repository.id=2.0.1.SP2 implementation.title=JBoss Web Services - Native

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5517 - in framework/trunk: hudson/hudson-home and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-01-23 07:36:23 -0500 (Wed, 23 Jan 2008) New Revision: 5517 Added: framework/trunk/hudson/hudson-home/jobs/TCK-1.4/ framework/trunk/hudson/hudson-home/jobs/TCK-1.4/config.xml Modified: framework/trunk/ant.properties.example framework/trunk/hudson/hudson-home/config.xml Log: [JBWS-1962] adding TCK 14 build job Modified: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example 2008-01-23 11:53:55 UTC (rev 5516) +++ framework/trunk/ant.properties.example 2008-01-23 12:36:23 UTC (rev 5517) @@ -46,6 +46,10 @@ hudson.jboss423.build=jboss-4.2.3.GA hudson.jboss423.rev=HEAD +hudson.tck14.url=https://svn.corp.jboss.com/repos/tck/tck141/trunk +hudson.tck14.build=tck141 +hudson.tck14.rev=HEAD + hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/trunk hudson.jboss500.build=jboss-5.0.0.Beta4 hudson.jboss500.rev=HEAD Modified: framework/trunk/hudson/hudson-home/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/config.xml 2008-01-23 11:53:55 UTC (rev 5516) +++ framework/trunk/hudson/hudson-home/config.xml 2008-01-23 12:36:23 UTC (rev 5517) @@ -7,6 +7,8 @@ <h2>JBossWS-(a)version.id@ QA Environment</h2> <table> + <tr><th align=left>TCK-14:</th><td>@hudson.tck14.url@</td></tr> + <tr><td colspan=2></td></tr> <tr><th align=left>Framework:</th><td>@hudson.framework.url@</td></tr> <tr><td colspan=2></td></tr> <tr><th align=left>Stack-Native:</th><td>@hudson.native.url@</td></tr> @@ -18,6 +20,7 @@ <tr><th align=left>@hudson.jboss422.build@</th><td>-r(a)hudson.jboss422.rev@ @hudson.jboss422.url@</td></tr> <tr><th align=left>@hudson.jboss421.build@</th><td>-r(a)hudson.jboss421.rev@ @hudson.jboss421.url@</td></tr> <tr><th align=left>@hudson.jboss405.build@</th><td>-r(a)hudson.jboss405.rev@ @hudson.jboss405.url@</td></tr> + <tr><td colspan=2></td></tr> </table> ]]> </systemMessage> Added: framework/trunk/hudson/hudson-home/jobs/TCK-1.4/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/TCK-1.4/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/TCK-1.4/config.xml 2008-01-23 12:36:23 UTC (rev 5517) @@ -0,0 +1,57 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +SVNBASE=TCK-1.4 + +# +# Verify build +# +if [ ! -d $SVNBASE ]; then + echo "Cannot find expected build: $SVNBASE" + exit 1 +fi + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> +  + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.tck14.url@</remote> + <local>TCK-1.4</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> +  + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>20</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build TCK-1.4</description> + <actions class="vector"/> +</project> \ No newline at end of file Property changes on: framework/trunk/hudson/hudson-home/jobs/TCK-1.4/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5516 - in stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src: test/java/org/jboss/test/ws/tools and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 06:53:55 -0500 (Wed, 23 Jan 2008) New Revision: 5516 Added: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java Log: [JBWS-1963] WSDL To Java - All generated types have first character upper case, extends clause in base types do not take this into account. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-01-23 11:52:05 UTC (rev 5515) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -712,7 +712,7 @@ } if (baseName == null && baseType != null) - baseName = baseType.getName(); + baseName = ToolsUtils.firstLetterUpperCase(baseType.getName()); return baseName; } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881 (from rev 4971, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1881; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1881 - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 1, 2007 - */ -public class JBWS1881TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1881/" + scenario; - String toolsDir = "tools/jbws1881/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (from rev 4971, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1881; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1881 + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 1, 2007 + */ +public class JBWS1881TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1881/" + scenario; + String toolsDir = "tools/jbws1881/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881 (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Base.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class Base -{ - -protected java.lang.String id; -public Base(){} - -public Base(java.lang.String id){ -this.id=id; -} -public java.lang.String getId() { return id ;} - -public void setId(java.lang.String id){ this.id=id; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Base.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Base.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class Base +{ + +protected java.lang.String id; +public Base(){} + +public Base(java.lang.String id){ +this.id=id; +} +public java.lang.String getId() { return id ;} + +public void setId(java.lang.String id){ this.id=id; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Person.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class Person - extends Base{ - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/Person.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class Person + extends Base{ + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1881' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1881' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1881/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='base'> - <sequence> - <element name='id' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='Person'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name='TelephoneNumber'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1881' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1881' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1881/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='base'> + <sequence> + <element name='id' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='Person'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name='TelephoneNumber'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * 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.jbws1881; - - -public class TelephoneNumber - extends Base{ - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/TelephoneNumber.java 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * 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.jbws1881; + + +public class TelephoneNumber + extends Base{ + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,67 +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.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1881.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,67 @@ +<?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.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1881.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</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 Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2007-11-01 16:01:19 UTC (rev 4971) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-01-23 11:53:55 UTC (rev 5516) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml (from rev 4971, stack/native/trunk/src/test/resources/tools/jbws1881/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-01-23 11:53:55 UTC (rev 5516) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2008