[jbossws-commits] JBossWS SVN: r2397 - in trunk: build/ant-import and 32 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 07:54:28 -0500 (Sun, 18 Feb 2007) New Revision: 2397 Added: trunk/build/etc/jbossws-component-info14.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml Removed: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/etc/jbossws-component-info.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/version.properties trunk/integration-jboss40/build.xml trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss42/build.xml trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml trunk/jbossws-core/.classpath trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java Log: svn merge -r2386:2396 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 Add [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI Update to xerces-2.9.0 Include wsdl4j in sar Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant-import/build-release.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -44,8 +44,12 @@ <!-- jbossws --> <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> <mkdir dir="${jbossws.repository.dir}/lib"/> + <delete> + <fileset dir="${jbossws.repository.dir}/lib"/> + </delete> <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -68,9 +72,12 @@ </filterset> </copy> - <!-- jbossws14 - -> + <!-- jbossws14 --> <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> <mkdir dir="${jbossws14.repository.dir}/lib"/> + <delete> + <fileset dir="${jbossws14.repository.dir}/lib"/> + </delete> <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -79,14 +86,14 @@ <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws40-jdk14.sar"/> <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> </fileset> </copy> - <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info14.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - --> </target> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant-import/build-thirdparty.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -38,6 +38,7 @@ <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <!--get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/--> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant.properties.example 2007-02-18 12:54:28 UTC (rev 2397) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/etc/jbossws-component-info.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -9,13 +9,8 @@ <artifact id="jboss-saaj.jar"/> <artifact id="jbossws40.sar"/> - <artifact id="jbossws-jboss40-integration.jar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws-jboss42-integration.jar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws-jboss50-integration.jar"/> <artifact id="jbossws50-deployer.zip"/> <import componentref="apache-xmlsec"> @@ -35,6 +30,7 @@ <compatible version="@jboss-microcontainer@"/> </import> <import componentref="jboss/remoting"> + <compatible version="1.4.3.GA"/> <compatible version="2.2.0.Alpha2"/> <compatible version="@jboss-remoting@"/> </import> @@ -42,13 +38,8 @@ <compatible version="@sun-jaxb@"/> </import> - <!-- - There should be no dependency on core or client jars except for - jbossws propriatary annotations. Do not expose these jars here. - - Instead include jbossws-core.jar and jbossws-jboss??-integration.jar in the test classpath - --> <export> + <include input="jbossws-core.jar"/> <include input="jboss-jaxrpc.jar"/> <include input="jboss-jaxws.jar"/> <include input="jboss-saaj.jar"/> Copied: trunk/build/etc/jbossws-component-info14.xml (from rev 2396, branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml) =================================================================== --- trunk/build/etc/jbossws-component-info14.xml (rev 0) +++ trunk/build/etc/jbossws-component-info14.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,45 @@ +<project name="jboss/jbossws-component-info"> + + <component id="jboss/jbossws14" licenseType="lgpl" version=&quot;@repository.id(a)&quot; + description="JBossWS an implementation of J2EE Web Services - Retrotranslated"> + + <artifact id="jbossws14-client.jar"/> + <artifact id="jboss-jaxws14.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-saaj.jar"/> + + <artifact id="jbossws40-jdk14.sar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + </import> + <import componentref="jboss/jbossretro"> + <compatible version="@jboss-jbossretro@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="1.4.3.GA"/> + <compatible version="@jboss-remoting@"/> + </import> + + <export> + <include input="jbossws14-client.jar"/> + <include input="jboss-jaxws14.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -16,7 +16,7 @@ <table> <tr><th align=left&gt;@hudson.jboss50.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr> - <tr><th align=left&gt;@hudson.jboss42.build@-ejb3&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> + <tr><th align=left&gt;@hudson.jboss42.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> <tr><th align=left&gt;@hudson.jboss40.build@-ejb3&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr> <tr><th align=left>jboss-4.0.5.GA-ejb3</th><td>https://svn.jboss.o... <tr><th align=left>apache-tomcat-@apache-tomcat@</th></tr> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT=&quot;-Djbossws.integration.target=tomcat -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/version.properties 2007-02-18 12:54:28 UTC (rev 2397) @@ -16,7 +16,7 @@ # thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss -javassist=3.4.GA +javassist=3.5.0.CR1 jboss-jbossxb=1.0.0.CR9 jboss-microcontainer=1.0.2 jboss-remoting=2.0.0.GA @@ -29,7 +29,7 @@ apache-logging=1.0.5.GA-jboss apache-tomcat=5.5.20 apache-xalan=j_2.7.0 -apache-xerces=2.7.1 +apache-xerces=2.9.0 dom4j=1.6.1 gnu-getopt=1.0.10 hibernate=3.2.1.GA Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss40/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -175,9 +175,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> @@ -267,14 +266,13 @@ <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> <include name="jbossws14-core.jar"/> + <include name="jboss-jaxws14.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss40.resources.dir}"> Modified: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -25,7 +25,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss42/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -131,9 +131,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> Modified: trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -25,7 +25,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss50/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -103,9 +103,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> Modified: trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -23,7 +23,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -18,15 +18,9 @@ --> <property name="webServiceHost">localhost</property> <property name="alwaysModifySOAPAddress">true</property> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> </bean> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/.classpath 2007-02-18 12:54:28 UTC (rev 2397) @@ -15,7 +15,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-src.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -66,7 +66,7 @@ inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled()); if (inputSource == null) - if(log.isDebugEnabled()) log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); return inputSource; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.metadata.wsdl.xmlschema; import org.apache.xerces.xs.ShortList; @@ -28,23 +28,22 @@ import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSException; import org.apache.xerces.xs.XSNamedMap; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; - +import org.jboss.util.NotImplementedException; /** * Represents an XS Element Declaration * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since May 3, 2005 */ -public class JBossXSElementDeclaration - extends JBossXSObject - implements XSElementDeclaration +public class JBossXSElementDeclaration extends JBossXSObject implements XSElementDeclaration { protected String targetNamespace = null; protected JBossXSTypeDefinition xstype = null; protected boolean nillable = false; private XSElementDeclaration xsed; - + /** * Sole Annotation object */ @@ -74,31 +73,29 @@ */ public JBossXSElementDeclaration(XSElementDeclaration xe) { - if(xe == null) - throw new IllegalArgumentException("Illegal Null Argument:xe"); - - xsed = xe; - name= xe.getName(); - namespace = xe.getNamespace(); - XSTypeDefinition xt = xe.getTypeDefinition(); - if(xt instanceof JBossXSTypeDefinition == false - && xt instanceof XSComplexTypeDefinition) - { - xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); - } - else - if(xt instanceof JBossXSTypeDefinition == false) - { - xstype = new JBossXSTypeDefinition(xt); - } - this.annotation = xe.getAnnotation(); + if (xe == null) + throw new IllegalArgumentException("Illegal Null Argument:xe"); + + xsed = xe; + name = xe.getName(); + namespace = xe.getNamespace(); + XSTypeDefinition xt = xe.getTypeDefinition(); + if (xt instanceof JBossXSTypeDefinition == false && xt instanceof XSComplexTypeDefinition) + { + xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); + } + else if (xt instanceof JBossXSTypeDefinition == false) + { + xstype = new JBossXSTypeDefinition(xt); + } + this.annotation = xe.getAnnotation(); } public XSElementDeclaration getXSElementDeclaration() { return xsed; } - + /** * One of XSConstants.SCOPE_GLOBAL, XSConstants.SCOPE_LOCAL * or XSConstants.SCOPE_ABSENT @@ -112,12 +109,11 @@ return this.xstype; } - public void setTypeDefinition(XSTypeDefinition xst ) + public void setTypeDefinition(XSTypeDefinition xst) { - if(xst instanceof JBossXSTypeDefinition) - this.xstype = (JBossXSTypeDefinition)xst ; - else - if(xst instanceof XSComplexTypeDefinition) + if (xst instanceof JBossXSTypeDefinition) + this.xstype = (JBossXSTypeDefinition)xst; + else if (xst instanceof XSComplexTypeDefinition) this.xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xst); } @@ -141,7 +137,7 @@ return this.enclosingCTDefinition; } - public void setEnclosingCTDefinition( XSComplexTypeDefinition enclosingCTDefinition) + public void setEnclosingCTDefinition(XSComplexTypeDefinition enclosingCTDefinition) { this.enclosingCTDefinition = enclosingCTDefinition; } @@ -154,7 +150,7 @@ public void setTargetNamespace(String targetNamespace) { this.targetNamespace = targetNamespace; - this.setNamespace( targetNamespace ); + this.setNamespace(targetNamespace); } public short getConstraintType() @@ -231,7 +227,7 @@ { return this.annotation; } - + /** * Get the type */ @@ -240,4 +236,9 @@ { return XSConstants.ELEMENT_DECLARATION; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.metadata.wsdl.xmlschema; // $Id$ @@ -64,11 +64,6 @@ /** * Resolves an external parsed entity. If the entity cannot be * resolved, this method should return null. - * - * @param resourceIdentifier description of the resource to be resolved - * @throws XNIException Thrown on general error. - * @throws IOException Thrown if resolved entity stream cannot be - * opened or some other i/o error occurs. */ public XMLInputSource resolveEntity(XMLResourceIdentifier resId) throws XNIException, IOException { @@ -86,13 +81,13 @@ { XMLInputSource source = getXMLInputSource(inputSource, resId); return source; - } + } } catch (Exception ex) { log.trace(ex); - } - + } + try { String expandedSysId = resId.getExpandedSystemId(); @@ -137,8 +132,7 @@ } // Delegate to JBoss Entity Resolver - XMLInputSource source = getXMLInputSource( - delegate.resolveEntity(null, namespaceURI), resId); + XMLInputSource source = getXMLInputSource(delegate.resolveEntity(null, namespaceURI), resId); if (source != null) return source; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -54,6 +54,7 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; @@ -742,4 +743,9 @@ return anonymousTypeMap; } } + + public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0) + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.metadata.wsdl.xmlschema; import java.util.Iterator; @@ -28,14 +28,14 @@ import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSModelGroup; import org.apache.xerces.xs.XSObjectList; +import org.jboss.util.NotImplementedException; /** * Implements a ModelGroup of the Xerces Schema API * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSModelGroup extends JBossXSObject - implements XSModelGroup +public class JBossXSModelGroup extends JBossXSObject implements XSModelGroup { private JBossXSObjectList xsparts = new JBossXSObjectList();; protected short compositor = 0; @@ -73,21 +73,21 @@ Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next()); + xsparts.addItem((JBossXSParticle)iter.next()); } } public void setParticles(List p, boolean shouldSort) { xsparts = new JBossXSObjectList(); - if(shouldSort) + if (shouldSort) setParticles(p); else { Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next(), false); + xsparts.addItem((JBossXSParticle)iter.next(), false); } } @@ -106,4 +106,9 @@ { return XSConstants.MODEL_GROUP; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,36 +1,37 @@ /* -* 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. -*/ + * 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.metadata.wsdl.xmlschema; import org.apache.xerces.xs.XSConstants; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSTerm; +import org.jboss.util.NotImplementedException; /** * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSParticle - extends JBossXSObject implements XSParticle, Comparable +public class JBossXSParticle extends JBossXSObject implements XSParticle, Comparable { protected int minOccurs = 0; protected int maxOccurs = 0; @@ -111,22 +112,27 @@ public int compareTo(Object o) { int c = -1; - if(o instanceof JBossXSParticle) + if (o instanceof JBossXSParticle) { JBossXSParticle w = (JBossXSParticle)o; String oname = w.getTerm().getName(); - String termName = term.getName() ; - if( termName != null ) - c = termName.compareTo(oname); + String termName = term.getName(); + if (termName != null) + c = termName.compareTo(oname); //In the case of doclit, need to be careful about String_1,SimpleType_2 - if( termName != null) + if (termName != null) { - char num1 = termName.charAt(termName.length()-1); - char num2 = oname.charAt(oname.length()-1); - if(Character.isDigit(num1) && Character.isDigit(num2)) - c = (""+num1).compareTo((""+num2)); + char num1 = termName.charAt(termName.length() - 1); + char num2 = oname.charAt(oname.length() - 1); + if (Character.isDigit(num1) && Character.isDigit(num2)) + c = ("" + num1).compareTo(("" + num2)); } } return c; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -88,7 +88,8 @@ EntityResolver entityResolver = new JBossWSEntityResolver(); // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + // ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition wsdlDefinition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); return wsdlDefinition; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -47,8 +47,6 @@ import org.w3c.dom.Element; import org.xml.sax.EntityResolver; -import com.ibm.wsdl.xml.WSDLReaderImpl; - /** * A factory that creates a <code>WSDLDefinitions</code> object from an URL. * @@ -126,7 +124,8 @@ } // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + //((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -157,4 +157,8 @@ { return latestImportURI; } + + public void close() + { + } } Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -188,6 +188,15 @@ </fileset> </war> + <!-- jaxws-jbws1529 --> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> + </classes> + </war> + <!-- jaxws-jsr181-complex --> <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Deleted: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml =================================================================== --- trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id: build-interop.xml 1948 2007-01-12 16:47:53Z heiko.braun(a)jboss.com $ --> - -<project name="TOOLS-Delegate"> - <macrodef name="call-wsconsume"> - - <attribute name="sourceDir"/> - <attribute name="destDir"/> - <attribute name="wsdlLocation"/> - <attribute name="verbose" default="false"/> - <attribute name="package"/> - - <sequential> - - <echo>-----------------------------------------------</echo> - <echo>Invoking wsimport </echo> - <echo>sourceDir: @{sourceDir}</echo> - <echo>wsdlLocation: @{wsdlLocation}</echo> - <echo>-----------------------------------------------</echo> - - <mkdir dir="@{sourceDir}"/> - <mkdir dir="@{destDir}"/> - -<!-- Config for SUN RI - <property name="ri.home" value="NOT_SET"/> - <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> - <classpath> - <pathelement location="${ri.home}/lib/activation.jar"/> - <pathelement location="${ri.home}/lib/FastInfoset.jar"/> - <pathelement location="${ri.home}/lib/http.jar"/> - <pathelement location="${ri.home}/lib/jaxb-api.jar"/> - <pathelement location="${ri.home}/lib/jaxb-xjc.jar"/> - <pathelement location="${ri.home}/lib/jaxws-api.jar"/> - <pathelement location="${ri.home}/lib/jaxws-rt.jar"/> - <pathelement location="${ri.home}/lib/jaxws-tools.jar"/> - <pathelement location="${ri.home}/lib/jsr173_api.jar"/> - <pathelement location="${ri.home}/lib/jsr181-api.jar"/> - <pathelement location="${ri.home}/lib/jsr250-api.jar"/> - <pathelement location="${ri.home}/lib/resolver.jar"/> - <pathelement location="${ri.home}/lib/saaj-api.jar"/> - <pathelement location="${ri.home}/lib/saaj-impl.jar"/> - <pathelement location="${ri.home}/lib/sjsxp.jar"/> - </classpath> - </taskdef> ---> - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath> - <pathelement location="${core.output.dir}/lib/jbossws-client.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-jaxws.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - </classpath> - </taskdef> - <wsconsume - keep="true" - sourcedestdir="@{sourceDir}" - destdir="@{destDir}" - wsdl="@{wsdlLocation}" - package="@{package}" - verbose="@{verbose}"> - </wsconsume> - - </sequential> - </macrodef> -</project> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -17,8 +17,9 @@ <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - + <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> @@ -252,6 +253,10 @@ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> @@ -275,7 +280,7 @@ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> </target> - + <!-- Generate JAX-RPC sources --> @@ -309,7 +314,7 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" /> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> @@ -358,9 +363,9 @@ <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> - + <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> - + <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529 (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1529; -import javax.jws.WebService; - -@WebService (targetNamespace="http://sei-namespace") -public interface JBWS1529 -{ - public String echo(String message) throws UserException; -} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; +import javax.jws.WebService; + +@WebService (targetNamespace="http://sei-namespace") +public interface JBWS1529 +{ + public String echo(String message) throws UserException; +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1529; - -import javax.jws.WebService; - -// An endpoint implementation that does not define a target namespace -// does NOT inherit the namespace from the referrenced SEI -(a)WebService(endpointInterface=&quot;org.jboss.test.ws.jaxws.jbws1529.JBWS1529&quot;, name="JBWS1529") -public class JBWS1529Impl implements JBWS1529 -{ - public String echo(String message) throws UserException - { - if ("dofault".equals(message)) - throw new UserException(); - - return message; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import javax.jws.WebService; + +// An endpoint implementation that does not define a target namespace +// does NOT inherit the namespace from the referrenced SEI +(a)WebService(endpointInterface=&quot;org.jboss.test.ws.jaxws.jbws1529.JBWS1529&quot;, name="JBWS1529") +public class JBWS1529Impl implements JBWS1529 +{ + public String echo(String message) throws UserException + { + if ("dofault".equals(message)) + throw new UserException(); + + return message; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1529; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * wsdlReader fails with faults defined on jaxws SEI - * - * http://jira.jboss.org/jira/browse/JBWS-1529 - * - * @author Thomas.Diesler(a)jboss.com - */ -public class JBWS1529TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; - private JBWS1529 proxy; - -/* - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1529Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1529)service.getPort(JBWS1529.class); - } -*/ - public void testWSDLReader() throws Exception - { - File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); - assertNotNull(wsdl); - } - - public void testEcho() throws Exception - { - System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); - //String retStr = proxy.echo("hi there"); - //assertEquals("hi there", retStr); - } -} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * wsdlReader fails with faults defined on jaxws SEI + * + * http://jira.jboss.org/jira/browse/JBWS-1529 + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBWS1529TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; + private JBWS1529 proxy; + +/* + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1529Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1529)service.getPort(JBWS1529.class); + } +*/ + public void testWSDLReader() throws Exception + { + File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); + assertTrue(wsdlFile.exists()); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); + assertNotNull(wsdl); + } + + public void testEcho() throws Exception + { + System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); + //String retStr = proxy.echo("hi there"); + //assertEquals("hi there", retStr); + } +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,26 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1529; - -public class UserException extends Exception -{ -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +public class UserException extends Exception +{ +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -37,6 +37,15 @@ import org.jboss.test.ws.JBossWSTestSetup; /** + * Test service endpoint capability to process inlined and optimized + * requests transparently. Both client and service endpoint do have handlers in place. + * This means that an additional transition to a conceptually inlined message (handler view) + * will happen as well. + * + * <ul> + * <li>Client and service endpoint have MTOM enabled (roundtrip) + * <li>Client send inlined requests (MTOM disabled), service answers with an optimized response. + * </ul> * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @since 05.12.2006 */ Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -33,6 +33,14 @@ import org.jboss.test.ws.JBossWSTestSetup; /** + * Test service endpoint capability to process inlined and optimized + * requests transparently. + * <ul> + * <li>Client and service endpoint have MTOM enabled (roundtrip) + * <li>Client send inlined requests (MTOM disabled), service answers with an optimized response. + * </ul> + * + * @see XOPBase * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @since 05.12.2006 */ Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529 (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529) Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF) Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='JBWS1529Service' targetNamespace='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <import location='JBWS1529_PortType.wsdl' namespace='http://sei-namespace'/> - <service name='JBWS1529Service'> - <port binding='ns1:JBWS1529Binding' name='JBWS1529Port'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <import location='JBWS1529_PortType.wsdl' namespace='http://sei-namespace'/> + <service name='JBWS1529Service'> + <port binding='ns1:JBWS1529Binding' name='JBWS1529Port'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='JBWS1529Service' targetNamespace='http://sei-namespace' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://sei-namespace' version='1.0' xmlns:tns='http://sei-namespace' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='UserException' type='tns:UserException'/> - <xs:element name='echo' type='tns:echo'/> - <xs:element name='echoResponse' type='tns:echoResponse'/> - <xs:complexType name='echo'> - <xs:sequence> - <xs:element minOccurs='0' name='arg0' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='UserException'> - <xs:sequence> - <xs:element minOccurs='0' name='message' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='JBWS1529_echo'> - <part element='ns1:echo' name='echo'/> - </message> - <message name='JBWS1529_echoResponse'> - <part element='ns1:echoResponse' name='echoResponse'/> - </message> - <message name='UserException'> - <part element='ns1:UserException' name='UserException'/> - </message> - <portType name='JBWS1529'> - <operation name='echo' parameterOrder='echo'> - <input message='ns1:JBWS1529_echo'/> - <output message='ns1:JBWS1529_echoResponse'/> - <!--fault message='tns:UserException' name='UserException'/--> - <fault message='ns1:UserException' name='UserException'/> - </operation> - </portType> - <binding name='JBWS1529Binding' type='ns1:JBWS1529'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - <fault name='UserException'> - <soap:fault name='UserException' use='literal'/> - </fault> - </operation> - </binding> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://sei-namespace' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://sei-namespace' version='1.0' xmlns:tns='http://sei-namespace' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='UserException' type='tns:UserException'/> + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='UserException'> + <xs:sequence> + <xs:element minOccurs='0' name='message' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='JBWS1529_echo'> + <part element='ns1:echo' name='echo'/> + </message> + <message name='JBWS1529_echoResponse'> + <part element='ns1:echoResponse' name='echoResponse'/> + </message> + <message name='UserException'> + <part element='ns1:UserException' name='UserException'/> + </message> + <portType name='JBWS1529'> + <operation name='echo' parameterOrder='echo'> + <input message='ns1:JBWS1529_echo'/> + <output message='ns1:JBWS1529_echoResponse'/> + <!--fault message='tns:UserException' name='UserException'/--> + <fault message='ns1:UserException' name='UserException'/> + </operation> + </portType> + <binding name='JBWS1529Binding' type='ns1:JBWS1529'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + <fault name='UserException'> + <soap:fault name='UserException' use='literal'/> + </fault> + </operation> + </binding> +</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1529.JBWS1529Impl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1529.JBWS1529Impl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app>