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

Author: thomas.diesler(a)jboss.com Date: 2007-02-05 15:41:17 -0500 (Mon, 05 Feb 2007) New Revision: 2282 Added: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java trunk/integration-tomcat/src/main/resources/tomcat-users.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore Removed: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/keystore.password trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/etc/default.mf trunk/build/etc/jbossws-component-info.xml trunk/build/hudson/apache-tomcat/conf/server.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml trunk/build/version.properties trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java trunk/integration-tomcat/build.xml trunk/integration-tomcat/src/main/resources/log4j.xml trunk/jbossws-core/build.xml trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java trunk/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/ant.properties.example trunk/jbossws-core/src/main/resources/samples/build.xml trunk/jbossws-docs/user-guide/project/en/modules/wssecurity/wssecurity.xml trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/ant-import/build-samples-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/README_XERCES trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Resolve dependencies on snapshots Hudson management port 8105 WebServiceContextJSE delegates to HTTPServletREquest instead of JBossSX Remove dependency on jboss-web.xml for jaxws samples WSSecurityConfigFactory silently ignores required resources Fix round trip set/getNodeValue for exscaped XML Fix package for naming Util Rollback XML escape optimization Move tomcat-users.xml to integration-tomcat Don't remove temp when setting up TC Add jnpserver.jar to jboss50 classpath Include server stuff in client jar, the ServiceObjectFactory needs it [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2 Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/ant-import/build-release.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -79,7 +79,6 @@ <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"> @@ -193,7 +192,6 @@ </fileset> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> </fileset> </copy> <mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/ant-import/build-samples.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -28,7 +28,7 @@ <include name="build.xml"/> </fileset> </copy> - <copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/> + <!--copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/--> <copy todir="${build.src.samples.dir}"> <fileset dir="${core.samples.dir}"> @@ -63,10 +63,11 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> + <include name="jbossws-client.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-jboss50-integration.jar"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/ant-import/build-setup.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -57,16 +57,22 @@ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/> - <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> + <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/> <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> + <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> - <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> - <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> - <available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/> + <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> + <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/> + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss40.available" file="${jboss40.available.file}"/> + <available property="tomcat.available" file="${tomcat.available.file}"/> + <!-- JDK Detection --> <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/ant-import/build-thirdparty.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -114,6 +114,7 @@ <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/ant.properties.example 2007-02-05 20:41:17 UTC (rev 2282) @@ -9,7 +9,7 @@ #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] -jbossws.integration.target=jboss50 +jbossws.integration.target=jboss42 # The JBoss server instance jboss.server.instance=default Modified: trunk/build/etc/default.mf =================================================================== --- trunk/build/etc/default.mf 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/etc/default.mf 2007-02-05 20:41:17 UTC (rev 2282) @@ -5,6 +5,6 @@ Specification-Vendor: @specification.vendor@ Implementation-Title: @implementation.title@ Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (date=(a)build.id@) +Implementation-Version: @implementation.version@ (build=(a)build.id@) Implementation-Vendor: @implementation.vendor@ Implementation-Vendor-Id: @implementation.vendor.id@ Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/etc/jbossws-component-info.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,50 +1,59 @@ <project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws" - licenseType="lgpl" - version=&quot;@repository.id(a)&quot; - description="JBossWS an implementation of J2EE Web Services"> - - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - <artifact id="jbossws40.sar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - - <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/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="snapshot"/> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="2.2.0.Alpha2"/> - <compatible version="@jboss-remoting@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> + + <component id="jboss/jbossws" licenseType="lgpl" version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> + + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <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"> + <compatible version="@apache-xmlsec@"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="snapshot"/> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="2.2.0.Alpha2"/> + <compatible version="@jboss-remoting@"/> + </import> + <import componentref="sun-jaxb"> + <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="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> \ No newline at end of file Modified: trunk/build/hudson/apache-tomcat/conf/server.xml =================================================================== --- trunk/build/hudson/apache-tomcat/conf/server.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/hudson/apache-tomcat/conf/server.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,5 +1,5 @@ -<Server port="8005" shutdown="SHUTDOWN"> +<Server port="8105" shutdown="SHUTDOWN"> <!-- Comment these entries out to disable JMX MBeans support used for the administration web application --> Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/hudson/hudson-home/config.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -127,7 +127,7 @@ <tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> -<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>N/A</td><td>ok</td></tr> </table> ]]> </description> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -33,7 +33,6 @@ # start jbossas # $TOMCAT_INSTANCE/bin/catalina.sh start -sleep 10 # # execute tests Modified: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -15,14 +15,14 @@ rm -rf $WORKSPACE/apache-tomcat cp -r @hudson.home@/../apache-tomcat $WORKSPACE rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* -rm -rf $WORKSPACE/apache-tomcat/work -rm -rf $WORKSPACE/apache-tomcat/temp +rm -rf $WORKSPACE/apache-tomcat/temp/* +rm -rf $WORKSPACE/apache-tomcat/work/* +rm -rf $WORKSPACE/apache-tomcat/logs/* # # copy tomcat config # cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf -cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf </command> </hudson.tasks.Shell> </builders> Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<tomcat-users> - <role rolename="manager"/> - <user username="manager" password="manager" roles="manager"/> -</tomcat-users> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/build/version.properties 2007-02-05 20:41:17 UTC (rev 2282) @@ -3,7 +3,7 @@ specification.title=JBossWS specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.0 +specification.version=jbossws-1.2 version.id=2.0.0.CR3 repository.id=snapshot @@ -38,9 +38,9 @@ jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 -jboss-jbossretro=snapshot +jboss-jbossretro=1.0.4.GA jboss-security=4.0.5.GA -jboss-vfs=2.0.0.snapshot +jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA jbossws-sun-wsimport=2.0.0 jbpm-bpel=1.1.Beta3 Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss40/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -11,7 +11,8 @@ <!-- $Id$ --> -<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40"> +<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="schema.xsd"> <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> @@ -25,7 +26,7 @@ <property name="jboss40.output.classes.dir" value="${jboss40.output.dir}/classes"/> <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> - + <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> @@ -33,9 +34,9 @@ <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> <property name="jboss42.output.classes14.dir" value="${jboss42.output.dir}/classes14"/> <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> - + <target name="jboss40-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/> </target> @@ -51,14 +52,12 @@ | documentation compiles. --> - <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" - description="Compile all source files."/> + <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-check-ejb3-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/> <!-- Compile integration java sources --> <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" - encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> @@ -71,8 +70,7 @@ </target> <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" - encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> @@ -82,6 +80,13 @@ <classpath path="${core.output.classes.dir}"/> </javac> </target> + <target name="jboss40-check-ejb3-classes" depends="jboss40-init" unless="jboss40.ejb3.available"> + <echo message="****************************************"/> + <echo message="* EJB3 not available *"/> + <echo message="* jboss40 integartion layer will be *"/> + <echo message="* build without EJB3 support! *"/> + <echo message="****************************************"/> + </target> <!-- Compile etc files (manifests and such) --> <target name="jboss40-compile-etc" depends="jboss40-init"> @@ -92,7 +97,7 @@ <!-- ================================================================== --> <target name="jboss40-retro" depends="jboss40-compile,core-compile"> - + <!-- Weave the build.classes to build.classes14 --> <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro"> <classpath> @@ -100,7 +105,7 @@ <pathelement location="${thirdparty.dir}/jbossretro.jar"/> </classpath> </taskdef> - + <mkdir dir="${jboss40.output.classes14.dir}"/> <retro destdir="${jboss40.output.classes14.dir}"> <classpath> @@ -120,7 +125,7 @@ <src path="${core.dir}/output/classes"/> </retro> </target> - + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -128,7 +133,7 @@ <!-- | Build all jar files. --> - <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> + <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> </target> <!-- @@ -195,29 +200,21 @@ | Build retrotranslated jar files. --> <target name="jboss40-jars14" depends="jboss40-jars,jboss40-retro"> - - <!-- Build jboss-jaxws14.jar --> - <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - </fileset> - </jar> - + <!-- Build jbossws14-core.jar --> <mkdir dir="${jboss40.output.lib.dir}"/> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> </fileset> <fileset dir="${core.dir}/src/main/resources"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> </jar> - + <!-- Build jbossws14-jboss40-integration.jar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> @@ -233,9 +230,9 @@ <include name="javax/xml/soap/**"/> </fileset> <fileset dir="${jboss40.output.classes14.dir}"> + <include name="org/jboss/ws/**"/> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> - <include name="org/jboss/ws/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> @@ -252,9 +249,10 @@ </fileset> <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> </jar> - + <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> - <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" + file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> <!-- Build jbossws40-jdk14.sar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> @@ -262,7 +260,6 @@ <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"/> @@ -286,7 +283,7 @@ <include name="jboss-service.xml"/> </metainf> </jar> - + </target> <!-- ================================================================== --> @@ -319,14 +316,18 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> - <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/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"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + </fileset> </copy> <!-- Copy jboss-xml-binding.jar --> <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> @@ -361,14 +362,16 @@ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - </fileset> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-core.jar"/> + <include name="jbossws14-jboss40-integration.jar"/> + </fileset> </copy> <!-- Copy jboss-xml-binding.jar --> <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss42/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -26,7 +26,7 @@ <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> <target name="jboss42-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss42.client}/jboss-client.jar" unless="jboss42.available"/> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> </target> <!-- ================================================================== --> @@ -153,14 +153,18 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> - <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/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"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + </fileset> </copy> </target> Copied: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java (from rev 2280, branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java) =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java (rev 0) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -0,0 +1,125 @@ +/* + * 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.integration.jboss42; + +// $Id$ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.ws.core.UnifiedVirtualFile; + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + loader = new URLClassLoader(new URL[]{rootURL}, ctxLoader); + } + return loader; + } +} Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -33,8 +33,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; -import org.jboss.naming.Util; import org.jboss.system.ServiceMBeanSupport; +import org.jboss.util.naming.Util; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; Copied: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java (from rev 2280, branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java) =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java (rev 0) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -0,0 +1,63 @@ +/* + * 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.integration.jboss42; + +// $Id$ + +import java.lang.reflect.AnnotatedElement; +import java.net.URL; + +import javax.management.MBeanServer; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.xml.transform.Source; + +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.core.jaxws.UnifiedWebServiceRefHandler; + +/** + * Binds a JAXWS @WebServiceRef object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean +{ + public void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, URL rootURL, Source metadata) throws NamingException + { + setupWebServiceRef(encCtx, encName, anElement, new URLLoaderAdapter(rootURL), metadata); + } + + public void create() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + server.registerMBean(this, OBJECT_NAME); + } + + public void destroy() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + server.unregisterMBean(OBJECT_NAME); + } +} Copied: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java (from rev 2280, branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java) =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java (rev 0) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -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.integration.jboss42; + + +import java.lang.reflect.AnnotatedElement; +import java.net.URL; + +import javax.management.ObjectName; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.xml.transform.Source; + +import org.jboss.ws.core.utils.ObjectNameFactory; + +/** + * MBean interface. + */ +public interface WebServiceRefHandlerMBean +{ + // default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler"); + + /** Binds a JAXWS WebServiceRef into the callers ENC + */ + void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement enElement, URL rootURL, Source metadata) throws NamingException; +} 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-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -36,6 +36,9 @@ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property> </bean> + <!-- Bind JAXWS Service objects in client environment context --> + <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss42.WebServiceRefHandler"/> + <!-- A subscription manager for WS-Eventing --> <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss50/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -26,7 +26,7 @@ <property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/> <target name="jboss50-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss50.client}/jboss-client.jar" unless="jboss50.available"/> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> <!-- ================================================================== --> @@ -162,14 +162,18 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/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"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50-integration.jar"/> + </fileset> </copy> </target> Deleted: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,187 +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.ws.integration.jboss50; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxws.client.NameValuePair; -import org.jboss.ws.core.jaxws.client.PortInfo; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * An ObjectModelFactory for UnifiedServiceRef - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class UnifiedServiceRefObjectFactory implements ObjectModelFactory -{ - // Hide constructor - private UnifiedServiceRefObjectFactory() - { - } - - public static UnifiedServiceRefObjectFactory newInstance() - { - return new UnifiedServiceRefObjectFactory(); - } - - public UnifiedServiceRef parse(Source source) - { - // setup the XML binding Unmarshaller - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - StreamResult result = new StreamResult(baos); - TransformerFactory tf = TransformerFactory.newInstance(); - tf.newTransformer().transform(source, result); - - InputStream is = new ByteArrayInputStream(baos.toByteArray()); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - return (UnifiedServiceRef)unmarshaller.unmarshal(is, this, null); - } - catch (Exception ex) - { - WSException.rethrow(ex); - return null; - } - } - - /** - * This method is called on the factory by the object model builder when the parsing starts. - */ - public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - return new UnifiedServiceRef(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) - { - return root; - } - - public void setValue(UnifiedServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-ref-name")) - { - ref.setServiceRefName(value); - } - else if (localName.equals("service-class-name")) - { - ref.setServiceClassName(value); - } - else if (localName.equals("service-qname")) - { - ref.setServiceQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - ref.setConfigName(value); - } - else if (localName.equals("config-file")) - { - ref.setConfigFile(value); - } - else if (localName.equals("handler-chain")) - { - ref.setHandlerChain(value); - } - else if (localName.equals("wsdl-override")) - { - ref.setWsdlLocation(value); - } - } - - public Object newChild(UnifiedServiceRef parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - - if (localName.equals("port-info")) - child = new PortInfo(parent); - - return child; - } - - public void addChild(UnifiedServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getPortInfos().add(portInfo); - } - - public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-endpoint-interface")) - { - portInfo.setServiceEndpointInterface(value); - } - else if (localName.equals("port-qname")) - { - portInfo.setPortQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - portInfo.setConfigName(value); - } - else if (localName.equals("config-file")) - { - portInfo.setConfigFile(value); - } - } - - public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("stub-property")) - child = new NameValuePair(); - return child; - } - - public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getStubProperties().add(stubProp); - } - - public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("name")) - { - nvPair.setName(value); - } - else if (localName.equals("value")) - { - nvPair.setValue(value); - } - } -} Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -23,171 +23,30 @@ // $Id$ -import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import javax.jws.HandlerChain; import javax.management.MBeanServer; import javax.naming.Context; import javax.naming.NamingException; import javax.xml.transform.Source; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; -import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.util.naming.Util; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxws.client.ServiceReferenceable; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; +import org.jboss.ws.core.jaxws.UnifiedWebServiceRefHandler; /** - * Binds a JAXWS Service object in the client's ENC + * Binds a JAXWS @WebServiceRef object in the client's ENC * * @author Thomas.Diesler(a)jboss.org * @since 17-Jan-2007 */ -public class WebServiceRefHandler implements WebServiceRefHandlerMBean +public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean { - // logging support - private static Logger log = Logger.getLogger(WebServiceRefHandler.class); - public void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, Source metadata) throws NamingException { - WebServiceRef wsref = null; - - // Build the list of @WebServiceRef relevant annotations - List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - for (Annotation an : anElement.getAnnotations()) - { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); - - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); - } - } - - // Use the single @WebServiceRef - if (wsrefList.size() == 1) - { - wsref = wsrefList.get(0); - } - else - { - for (WebServiceRef aux : wsrefList) - { - if (encName.endsWith("/" + aux.name())) - { - wsref = aux; - break; - } - } - } - - if (wsref == null) - throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); - - Class targetClass = null; - if (anElement instanceof Field) - targetClass = ((Field)anElement).getType(); - else if (anElement instanceof Method) - targetClass = ((Method)anElement).getParameterTypes()[0]; - - String externalName = encCtx.getNameInNamespace() + "/" + encName; - String targetClassName = (targetClass != null ? targetClass.getName() : null); - log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - - String serviceClassName = null; - - // #1 Use the explicit @WebServiceRef.value - if (wsref.value() != Object.class) - serviceClassName = wsref.value().getName(); - - // #2 Use the target ref type - if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceClassName = targetClass.getName(); - - // #3 Use javax.xml.ws.Service - if (serviceClassName == null) - serviceClassName = Service.class.getName(); - - // #1 Use the explicit @WebServiceRef.type - if (wsref.type() != Object.class) - targetClassName = wsref.type().getName(); - - // #2 Use the target ref type - if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) - targetClassName = targetClass.getName(); - - try - { - UnifiedServiceRefObjectFactory factory = UnifiedServiceRefObjectFactory.newInstance(); - UnifiedServiceRef usRef = factory.parse(metadata); - usRef.setRootFile(new VirtualFileAdaptor(vfsRoot)); - - // Set the wsdlLocation if there is no override already - if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) - usRef.setWsdlLocation(wsref.wsdlLocation()); - - // Set the handlerChain from @HandlerChain on the annotated element - String handlerChain = usRef.getHandlerChain(); - HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); - if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) - handlerChain = anHandlerChain.file(); - - // Resolve path to handler chain - if (handlerChain != null) - { - try - { - new URL(handlerChain); - } - catch (MalformedURLException ex) - { - Class declaringClass = null; - if (anElement instanceof Field) - declaringClass = ((Field)anElement).getDeclaringClass(); - else if (anElement instanceof Method) - declaringClass = ((Method)anElement).getDeclaringClass(); - else if (anElement instanceof Class) - declaringClass = (Class)anElement; - - handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; - VirtualFile vfHandlerChain = vfsRoot.findChild(handlerChain); - if (vfHandlerChain == null) - throw new IllegalStateException("Cannot find handler chain: " + handlerChain); - } - usRef.setHandlerChain(handlerChain); - } - - // Do not use rebind, the binding should be unique - // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); - - log.debug("<service-ref> bound to: java:comp/env/" + encName); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot bind web service ref: " + encName, ex); - } + setupWebServiceRef(encCtx, encName, anElement, new VirtualFileAdaptor(vfsRoot), metadata); } - + public void create() throws Exception { MBeanServer server = MBeanServerLocator.locateJBoss(); Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-tomcat/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -25,10 +25,9 @@ <property name="tomcat.output.classes14.dir" value="${tomcat.output.dir}/classes14"/> <property name="tomcat.output.lib.dir" value="${tomcat.output.dir}/lib"/> - <available property="jbossws.thirdparty.available" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/> - <target name="tomcat-init" depends="prepare, thirdparty"> <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar" unless="tomcat.available"/> + <available property="jbossws.thirdparty.available" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/> </target> <!-- ================================================================== --> @@ -99,7 +98,7 @@ <include name="META-INF/standard-jaxws-client-config.xml"/> <include name="META-INF/standard-jaxws-endpoint-config.xml"/> </fileset> - <webinf dir="${tomcat.resources.dir}/jbossws.war/WEB-INF"> + <webinf dir="${tomcat.resources.dir}"> <include name="log4j.xml"/> </webinf> </war> @@ -110,6 +109,7 @@ <!-- Build jbossws-thirdparty.jar --> <mkdir dir="${tomcat.output.lib.dir}/build"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/commons-logging.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/> @@ -124,6 +124,7 @@ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/log4j.jar"/> + <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/stax-api.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf"> @@ -145,6 +146,11 @@ <include name="xercesImpl.jar"/> </fileset> </copy> + <copy todir="${tomcat.conf.dir}" overwrite="true"> + <fileset dir="${tomcat.resources.dir}"> + <include name="tomcat-users.xml"/> + </fileset> + </copy> <copy todir="${tomcat.common.classes}" overwrite="true"> <fileset dir="${tomcat.resources.dir}"> <include name="log4j.xml"/> Modified: trunk/integration-tomcat/src/main/resources/log4j.xml =================================================================== --- trunk/integration-tomcat/src/main/resources/log4j.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/integration-tomcat/src/main/resources/log4j.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -56,14 +56,27 @@ <priority value="DEBUG"/> </category> - <category name="org.jboss.remoting"> + <category name="org.apache.catalina"> <priority value="INFO"/> </category> - <!-- Enable SOAP message tracing --> + <category name="org.apache.commons"> + <priority value="INFO"/> + </category> + + <category name="org.apache.jasper"> + <priority value="INFO"/> + </category> + + <category name="org.jboss.remoting"> + <priority value="INFO"/> + </category> + + <!-- Enable SOAP message tracing <category name="jbossws.SOAPMessage"> <priority value="TRACE" class="org.jboss.logging.XLevel"/> </category> + --> <!-- ======================= --> <!-- Setup the Root category --> Copied: trunk/integration-tomcat/src/main/resources/tomcat-users.xml (from rev 2255, branches/jbossws-1.2.0/integration-tomcat/src/main/resources/tomcat-users.xml) =================================================================== --- trunk/integration-tomcat/src/main/resources/tomcat-users.xml (rev 0) +++ trunk/integration-tomcat/src/main/resources/tomcat-users.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -0,0 +1,10 @@ +<?xml version='1.0' encoding='utf-8'?> +<tomcat-users> + <!-- Security realm for jbossws sample tests --> + <role rolename="friend"/> + <user username="kermit" password="thefrog" roles="friend"/> + + <!-- Security realm for jbossws sample deployment --> + <role rolename="manager"/> + <user username="manager" password="manager" roles="manager"/> +</tomcat-users> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -146,7 +146,6 @@ <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/core/server/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> Modified: trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -21,17 +21,13 @@ */ package javax.xml.rpc.soap; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamField; +// $Id$ import javax.xml.namespace.QName; import javax.xml.soap.Detail; import javax.xml.soap.Name; import org.jboss.logging.Logger; -import org.jboss.util.id.SerialVersion; /** The SOAPFaultException exception represents a SOAP fault. * @@ -49,36 +45,12 @@ * @author Scott.Stark(a)jboss.org * @author Thomas.Diesler(a)jboss.org * @author Rahul Sharma (javadoc) - * @version $Revision$ */ public class SOAPFaultException extends RuntimeException { // provide logging private static Logger log = Logger.getLogger(SOAPFaultException.class); - /** @since 4.0.2 */ - static final long serialVersionUID; - private static final int CODE_IDX = 0; - private static final int STRING_IDX = 1; - private static final int ACTOR_IDX = 2; - private static final int DETAIL_IDX = 3; - private static final ObjectStreamField[] serialPersistentFields; - static - { - if (SerialVersion.version == SerialVersion.LEGACY) - { - serialVersionUID = -290987278985292477L; - serialPersistentFields = new ObjectStreamField[] { new ObjectStreamField("faultCode", QName.class), new ObjectStreamField("faultString", String.class), - new ObjectStreamField("faultActor", String.class), new ObjectStreamField("faultDetail", Detail.class), }; - } - else - { - serialVersionUID = -7224636940495025621L; - serialPersistentFields = new ObjectStreamField[] { new ObjectStreamField("faultcode", QName.class), new ObjectStreamField("faultstring", String.class), - new ObjectStreamField("faultactor", String.class), new ObjectStreamField("faultdetail", Detail.class), }; - } - } - private QName faultCode; private String faultString; private String faultActor; @@ -116,33 +88,4 @@ { return faultDetail; } - - // Private ------------------------------------------------------- - private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException - { - ObjectInputStream.GetField fields = ois.readFields(); - String name = serialPersistentFields[CODE_IDX].getName(); - this.faultCode = (QName)fields.get(name, null); - name = serialPersistentFields[STRING_IDX].getName(); - this.faultString = (String)fields.get(name, null); - name = serialPersistentFields[ACTOR_IDX].getName(); - this.faultActor = (String)fields.get(name, null); - name = serialPersistentFields[DETAIL_IDX].getName(); - this.faultDetail = (Detail)fields.get(name, null); - } - - private void writeObject(ObjectOutputStream oos) throws IOException - { - // Write j2ee 1.4.1 RI field names - ObjectOutputStream.PutField fields = oos.putFields(); - String name = serialPersistentFields[CODE_IDX].getName(); - fields.put(name, faultCode); - name = serialPersistentFields[STRING_IDX].getName(); - fields.put(name, faultString); - name = serialPersistentFields[ACTOR_IDX].getName(); - fields.put(name, faultActor); - name = serialPersistentFields[DETAIL_IDX].getName(); - fields.put(name, faultDetail); - oos.writeFields(); - } } Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/javax/xml/ws/handler/MessageContext.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -37,168 +37,154 @@ * * @since JAX-WS 2.0 */ -public interface MessageContext extends Map<String, Object> { - - /** - * Standard property: message direction, <code>true</code> for - * outbound messages, <code>false</code> for inbound. - * <p>Type: boolean - */ - public static final String MESSAGE_OUTBOUND_PROPERTY = - "javax.xml.ws.handler.message.outbound"; - - /** - * Standard property: Map of attachments to a message for the inbound - * message, key is the MIME Content-ID, value is a DataHandler. - * <p>Type: java.util.Map<String,DataHandler> - */ - public static final String INBOUND_MESSAGE_ATTACHMENTS = - "javax.xml.ws.binding.attachments.inbound"; - - /** - * Standard property: Map of attachments to a message for the outbound - * message, key is the MIME Content-ID, value is a DataHandler. - * <p>Type: java.util.Map<String,DataHandler> - */ - public static final String OUTBOUND_MESSAGE_ATTACHMENTS = - "javax.xml.ws.binding.attachments.outbound"; - - /** - * Standard property: input source for WSDL document. - * <p>Type: org.xml.sax.InputSource - */ - public static final String WSDL_DESCRIPTION = - "javax.xml.ws.wsdl.description"; - - /** - * Standard property: name of WSDL service. - * <p>Type: javax.xml.namespace.QName - */ - public static final String WSDL_SERVICE = - "javax.xml.ws.wsdl.service"; - - /** - * Standard property: name of WSDL port. - * <p>Type: javax.xml.namespace.QName - */ - public static final String WSDL_PORT = - "javax.xml.ws.wsdl.port"; - - /** - * Standard property: name of wsdl interface (2.0) or port type (1.1). - * <p>Type: javax.xml.namespace.QName - */ - public static final String WSDL_INTERFACE = - "javax.xml.ws.wsdl.interface"; - - /** - * Standard property: name of WSDL operation. - * <p>Type: javax.xml.namespace.QName - */ - public static final String WSDL_OPERATION = - "javax.xml.ws.wsdl.operation"; - - /** - * Standard property: HTTP response status code. - * <p>Type: java.lang.Integer - */ - public static final String HTTP_RESPONSE_CODE = - "javax.xml.ws.http.response.code"; - - /** - * Standard property: HTTP request headers. - * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>> - */ - public static final String HTTP_REQUEST_HEADERS = - "javax.xml.ws.http.request.headers"; - - /** - * Standard property: HTTP response headers. - * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>> - */ - public static final String HTTP_RESPONSE_HEADERS = - "javax.xml.ws.http.response.headers"; - - /** - * Standard property: HTTP request method. - * <p>Type: java.lang.String - */ - public static final String HTTP_REQUEST_METHOD = - "javax.xml.ws.http.request.method"; - - /** - * Standard property: servlet request object. - * <p>Type: javax.servlet.http.HttpServletRequest - */ - public static final String SERVLET_REQUEST = - "javax.xml.ws.servlet.request"; - - /** - * Standard property: servlet response object. - * <p>Type: javax.servlet.http.HttpServletResponse - */ - public static final String SERVLET_RESPONSE = - "javax.xml.ws.servlet.response"; - - /** - * Standard property: servlet context object. - * <p>Type: javax.servlet.ServletContext - */ - public static final String SERVLET_CONTEXT = - "javax.xml.ws.servlet.context"; - - /** - * Standard property: Query string for request. - * <p>Type: String - **/ - public static final String QUERY_STRING = - "javax.xml.ws.http.request.querystring"; - - /** - * Standard property: Request Path Info - * <p>Type: String - */ - public static final String PATH_INFO = - "javax.xml.ws.http.request.pathinfo"; - - /** - * Standard property: WS Addressing Reference Parameters. - * The list MUST include all SOAP headers marked with the - * wsa:IsReferenceParameter="true" attribute. - * <p>Type: List<Element> - * - * @since JAX-WS 2.1 - */ - public static final String REFERENCE_PARAMETERS = - "javax.xml.ws.reference.parameters"; - - /** - * Property scope. Properties scoped as <code>APPLICATION</code> are - * visible to handlers, - * client applications and service endpoints; properties scoped as - * <code>HANDLER</code> - * are only normally visible to handlers. - */ - public enum Scope {APPLICATION, HANDLER}; - - /** - * Sets the scope of a property. - * - * @param name Name of the property associated with the - * <code>MessageContext</code> - * @param scope Desired scope of the property - * @throws java.lang.IllegalArgumentException if an illegal - * property name is specified - */ - public void setScope(String name, Scope scope); - - /** - * Gets the scope of a property. - * - * @param name Name of the property - * @return Scope of the property - * @throws java.lang.IllegalArgumentException if a non-existant - * property name is specified - */ - public Scope getScope(String name); +public interface MessageContext extends Map<String, Object> +{ + + /** + * Standard property: message direction, <code>true</code> for + * outbound messages, <code>false</code> for inbound. + * <p>Type: boolean + */ + public static final String MESSAGE_OUTBOUND_PROPERTY = "javax.xml.ws.handler.message.outbound"; + + /** + * Standard property: Map of attachments to a message for the inbound + * message, key is the MIME Content-ID, value is a DataHandler. + * <p>Type: java.util.Map<String,DataHandler> + */ + public static final String INBOUND_MESSAGE_ATTACHMENTS = "javax.xml.ws.binding.attachments.inbound"; + + /** + * Standard property: Map of attachments to a message for the outbound + * message, key is the MIME Content-ID, value is a DataHandler. + * <p>Type: java.util.Map<String,DataHandler> + */ + public static final String OUTBOUND_MESSAGE_ATTACHMENTS = "javax.xml.ws.binding.attachments.outbound"; + + /** + * Standard property: input source for WSDL document. + * <p>Type: org.xml.sax.InputSource + */ + public static final String WSDL_DESCRIPTION = "javax.xml.ws.wsdl.description"; + + /** + * Standard property: name of WSDL service. + * <p>Type: javax.xml.namespace.QName + */ + public static final String WSDL_SERVICE = "javax.xml.ws.wsdl.service"; + + /** + * Standard property: name of WSDL port. + * <p>Type: javax.xml.namespace.QName + */ + public static final String WSDL_PORT = "javax.xml.ws.wsdl.port"; + + /** + * Standard property: name of wsdl interface (2.0) or port type (1.1). + * <p>Type: javax.xml.namespace.QName + */ + public static final String WSDL_INTERFACE = "javax.xml.ws.wsdl.interface"; + + /** + * Standard property: name of WSDL operation. + * <p>Type: javax.xml.namespace.QName + */ + public static final String WSDL_OPERATION = "javax.xml.ws.wsdl.operation"; + + /** + * Standard property: HTTP response status code. + * <p>Type: java.lang.Integer + */ + public static final String HTTP_RESPONSE_CODE = "javax.xml.ws.http.response.code"; + + /** + * Standard property: HTTP request headers. + * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>> + */ + public static final String HTTP_REQUEST_HEADERS = "javax.xml.ws.http.request.headers"; + + /** + * Standard property: HTTP response headers. + * <p>Type: java.util.Map<java.lang.String, java.util.List<java.lang.String>> + */ + public static final String HTTP_RESPONSE_HEADERS = "javax.xml.ws.http.response.headers"; + + /** + * Standard property: HTTP request method. + * <p>Type: java.lang.String + */ + public static final String HTTP_REQUEST_METHOD = "javax.xml.ws.http.request.method"; + + /** + * Standard property: servlet request object. + * <p>Type: javax.servlet.http.HttpServletRequest + */ + public static final String SERVLET_REQUEST = "javax.xml.ws.servlet.request"; + + /** + * Standard property: servlet response object. + * <p>Type: javax.servlet.http.HttpServletResponse + */ + public static final String SERVLET_RESPONSE = "javax.xml.ws.servlet.response"; + + /** + * Standard property: servlet context object. + * <p>Type: javax.servlet.ServletContext + */ + public static final String SERVLET_CONTEXT = "javax.xml.ws.servlet.context"; + + /** + * Standard property: Query string for request. + * <p>Type: String + **/ + public static final String QUERY_STRING = "javax.xml.ws.http.request.querystring"; + + /** + * Standard property: Request Path Info + * <p>Type: String + */ + public static final String PATH_INFO = "javax.xml.ws.http.request.pathinfo"; + + /** + * Standard property: WS Addressing Reference Parameters. + * The list MUST include all SOAP headers marked with the + * wsa:IsReferenceParameter="true" attribute. + * <p>Type: List<Element> + * + * @since JAX-WS 2.1 + */ + public static final String REFERENCE_PARAMETERS = "javax.xml.ws.reference.parameters"; + + /** + * Property scope. Properties scoped as <code>APPLICATION</code> are + * visible to handlers, + * client applications and service endpoints; properties scoped as + * <code>HANDLER</code> + * are only normally visible to handlers. + */ + public enum Scope + { + APPLICATION, HANDLER + }; + + /** + * Sets the scope of a property. + * + * @param name Name of the property associated with the + * <code>MessageContext</code> + * @param scope Desired scope of the property + * @throws java.lang.IllegalArgumentException if an illegal + * property name is specified + */ + public void setScope(String name, Scope scope); + + /** + * Gets the scope of a property. + * + * @param name Name of the property + * @return Scope of the property + * @throws java.lang.IllegalArgumentException if a non-existant + * property name is specified + */ + public Scope getScope(String name); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -122,7 +122,8 @@ */ public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df) { - if(log.isDebugEnabled()) log.debug("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]"); + if (log.isTraceEnabled()) + log.trace("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]"); registerInternal(javaType, new IQName(xmlType), sf, df); keyPairCache.clear(); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -177,7 +177,7 @@ endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress(); } - catch (Exception ex) + catch (Throwable ex) { // ignore, we are probably a remote client } Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java (from rev 2280, branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -0,0 +1,187 @@ +/* + * 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.core.jaxws; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxws.client.NameValuePair; +import org.jboss.ws.core.jaxws.client.PortInfo; +import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * An ObjectModelFactory for UnifiedServiceRef + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class UnifiedServiceRefObjectFactory implements ObjectModelFactory +{ + // Hide constructor + private UnifiedServiceRefObjectFactory() + { + } + + public static UnifiedServiceRefObjectFactory newInstance() + { + return new UnifiedServiceRefObjectFactory(); + } + + public UnifiedServiceRef parse(Source source) + { + // setup the XML binding Unmarshaller + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + StreamResult result = new StreamResult(baos); + TransformerFactory tf = TransformerFactory.newInstance(); + tf.newTransformer().transform(source, result); + + InputStream is = new ByteArrayInputStream(baos.toByteArray()); + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + return (UnifiedServiceRef)unmarshaller.unmarshal(is, this, null); + } + catch (Exception ex) + { + WSException.rethrow(ex); + return null; + } + } + + /** + * This method is called on the factory by the object model builder when the parsing starts. + */ + public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + return new UnifiedServiceRef(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) + { + return root; + } + + public void setValue(UnifiedServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("service-ref-name")) + { + ref.setServiceRefName(value); + } + else if (localName.equals("service-class-name")) + { + ref.setServiceClassName(value); + } + else if (localName.equals("service-qname")) + { + ref.setServiceQName(QName.valueOf(value)); + } + else if (localName.equals("config-name")) + { + ref.setConfigName(value); + } + else if (localName.equals("config-file")) + { + ref.setConfigFile(value); + } + else if (localName.equals("handler-chain")) + { + ref.setHandlerChain(value); + } + else if (localName.equals("wsdl-override")) + { + ref.setWsdlLocation(value); + } + } + + public Object newChild(UnifiedServiceRef parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + + if (localName.equals("port-info")) + child = new PortInfo(parent); + + return child; + } + + public void addChild(UnifiedServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.getPortInfos().add(portInfo); + } + + public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("service-endpoint-interface")) + { + portInfo.setServiceEndpointInterface(value); + } + else if (localName.equals("port-qname")) + { + portInfo.setPortQName(QName.valueOf(value)); + } + else if (localName.equals("config-name")) + { + portInfo.setConfigName(value); + } + else if (localName.equals("config-file")) + { + portInfo.setConfigFile(value); + } + } + + public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + Object child = null; + if (localName.equals("stub-property")) + child = new NameValuePair(); + return child; + } + + public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) + { + parent.getStubProperties().add(stubProp); + } + + public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + if (localName.equals("name")) + { + nvPair.setName(value); + } + else if (localName.equals("value")) + { + nvPair.setValue(value); + } + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java (from rev 2280, branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -0,0 +1,188 @@ +/* + * 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.core.jaxws; + +// $Id$ + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.jws.HandlerChain; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.xml.transform.Source; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.core.jaxws.client.ServiceReferenceable; +import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; + +/** + * Binds a JAXWS Service object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class UnifiedWebServiceRefHandler +{ + // logging support + private static Logger log = Logger.getLogger(UnifiedWebServiceRefHandler.class); + + protected void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, Source metadata) throws NamingException + { + WebServiceRef wsref = null; + + // Build the list of @WebServiceRef relevant annotations + List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); + + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } + } + + // Use the single @WebServiceRef + if (wsrefList.size() == 1) + { + wsref = wsrefList.get(0); + } + else + { + for (WebServiceRef aux : wsrefList) + { + if (encName.endsWith("/" + aux.name())) + { + wsref = aux; + break; + } + } + } + + if (wsref == null) + throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); + + Class targetClass = null; + if (anElement instanceof Field) + targetClass = ((Field)anElement).getType(); + else if (anElement instanceof Method) + targetClass = ((Method)anElement).getParameterTypes()[0]; + + String externalName = encCtx.getNameInNamespace() + "/" + encName; + String targetClassName = (targetClass != null ? targetClass.getName() : null); + log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + + String serviceClassName = null; + + // #1 Use the explicit @WebServiceRef.value + if (wsref.value() != Object.class) + serviceClassName = wsref.value().getName(); + + // #2 Use the target ref type + if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceClassName = targetClass.getName(); + + // #3 Use javax.xml.ws.Service + if (serviceClassName == null) + serviceClassName = Service.class.getName(); + + // #1 Use the explicit @WebServiceRef.type + if (wsref.type() != Object.class) + targetClassName = wsref.type().getName(); + + // #2 Use the target ref type + if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) + targetClassName = targetClass.getName(); + + try + { + UnifiedServiceRefObjectFactory factory = UnifiedServiceRefObjectFactory.newInstance(); + UnifiedServiceRef usRef = factory.parse(metadata); + usRef.setRootFile(vfsRoot); + + // Set the wsdlLocation if there is no override already + if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) + usRef.setWsdlLocation(wsref.wsdlLocation()); + + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = usRef.getHandlerChain(); + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ex) + { + Class declaringClass = null; + if (anElement instanceof Field) + declaringClass = ((Field)anElement).getDeclaringClass(); + else if (anElement instanceof Method) + declaringClass = ((Method)anElement).getDeclaringClass(); + else if (anElement instanceof Class) + declaringClass = (Class)anElement; + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + UnifiedVirtualFile vfHandlerChain = vfsRoot.findChild(handlerChain); + if (vfHandlerChain == null) + throw new IllegalStateException("Cannot find handler chain: " + handlerChain); + } + usRef.setHandlerChain(handlerChain); + } + + // Do not use rebind, the binding should be unique + // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind + Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); + + log.debug("<service-ref> bound to: java:comp/env/" + encName); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException("Cannot bind web service ref: " + encName, ex); + } + } +} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -24,73 +24,41 @@ // $Id$ import java.security.Principal; -import java.util.HashSet; -import java.util.Set; -import javax.naming.InitialContext; -import javax.naming.NamingException; +import javax.servlet.http.HttpServletRequest; import javax.xml.ws.handler.MessageContext; -import org.jboss.logging.Logger; -import org.jboss.security.RealmMapping; -import org.jboss.security.SecurityAssociation; -import org.jboss.security.SimplePrincipal; +import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; /** - * A WebServiceContext implementation that delegates to jbosssx. + * A WebServiceContext implementation that delegates to the HttpServletRequest. * * @author Thomas.Diesler(a)jboss.org * @since 23-Jan-2007 */ public class WebServiceContextJSE extends AbstractWebServiceContext { - // provide logging - private Logger log = Logger.getLogger(WebServiceContextJSE.class); + private HttpServletRequest httpRequest; - private RealmMapping realmMapping; - public WebServiceContextJSE(MessageContext messageContext) { super(messageContext); + httpRequest = (HttpServletRequest)messageContext.get(MessageContextJAXWS.SERVLET_REQUEST); + if (httpRequest == null) + throw new IllegalStateException("Cannot obtain HTTPServletRequest from message context"); } @Override public Principal getUserPrincipal() { - Principal principal = SecurityAssociation.getCallerPrincipal(); + Principal principal = httpRequest.getUserPrincipal(); return principal; } @Override public boolean isUserInRole(String role) { - boolean isUserInRole = false; - Principal principal = SecurityAssociation.getCallerPrincipal(); - RealmMapping realmMapping = getRealmMapping(); - if (realmMapping != null && principal != null) - { - Set<Principal> roles = new HashSet<Principal>(); - roles.add(new SimplePrincipal(role)); - isUserInRole = realmMapping.doesUserHaveRole(principal, roles); - } + boolean isUserInRole = httpRequest.isUserInRole(role); return isUserInRole; } - - private RealmMapping getRealmMapping() - { - if (realmMapping == null) - { - String lookupName = "java:comp/env/security/realmMapping"; - try - { - InitialContext iniCtx = new InitialContext(); - realmMapping = (RealmMapping)iniCtx.lookup(lookupName); - } - catch (NamingException e) - { - if(log.isDebugEnabled()) log.debug("Cannot obtain realm mapping from: " + lookupName); - } - } - return realmMapping; - } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMUtils.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMUtils.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -37,7 +37,6 @@ import javax.xml.parsers.ParserConfigurationException; import org.jboss.logging.Logger; -import org.jboss.util.xml.JBossEntityResolver; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -68,7 +67,7 @@ factory.setValidating(false); factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder(); - builder.setEntityResolver(new JBossEntityResolver()); + builder.setEntityResolver(new JBossWSEntityResolver()); return builder; } catch (ParserConfigurationException e) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -143,7 +143,9 @@ SecurityDecoder decoder = new SecurityDecoder(securityStore); decoder.decode(soapMessage.getSOAPPart(), secHeaderElement); - if(log.isDebugEnabled()) log.debug("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); + + if (log.isTraceEnabled()) + log.trace("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); OperationMetaData opMetaData = ctx.getOperationMetaData(); if (opMetaData == null) @@ -178,7 +180,7 @@ { WSSecurityConfiguration config = ctx.getEndpointMetaData().getServiceMetaData().getSecurityConfiguration(); if (config == null) - throw new WSException("Cannot obtatin security configuration from message context"); + throw new WSException("Cannot obtain security configuration from message context"); return config; } @@ -232,7 +234,8 @@ Config operationConfig = getConfig(config, port, operation); - if(log.isDebugEnabled()) log.debug("WS-Security config:" + operationConfig); + log.debug("WS-Security config: " + operationConfig); + // Nothing to process if (operationConfig == null) return; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -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.extensions.security.jaxrpc; // $Id$ @@ -99,34 +99,25 @@ EndpointMetaData epMetaData = ((SOAPMessageContextJAXRPC)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory + WSSecurityConfiguration config = serviceMetaData.getSecurityConfiguration(); + if (config == null) // might be set through ServiceObjectFactory { - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - boolean successful = false; - - WSSecurityConfiguration config = null; - try { WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName()); - if(config!=null) successful = true; - } catch (IOException e) { - successful = false; + throw new WSException("Cannot obtain security config: " + getConfigResourceName()); } - if(!successful) - throw new WSException("Cannot obtain security config: " +getConfigResourceName()); - // it's required further down the processing chain serviceMetaData.setSecurityConfiguration(config); } - return serviceMetaData.getSecurityConfiguration(); - + return config; } protected abstract String getConfigResourceName(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -39,7 +39,7 @@ */ public class ResourceLoaderAdapter implements UnifiedVirtualFile { - private URL location; + private URL resourceURL; private ClassLoader loader; public ResourceLoaderAdapter() @@ -52,9 +52,9 @@ this.loader = loader; } - private ResourceLoaderAdapter(ClassLoader loader, URL location) + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) { - this.location = location; + this.resourceURL = resourceURL; this.loader = loader; } @@ -110,13 +110,8 @@ public URL toURL() { - if (null == this.location) + if (null == this.resourceURL) throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return location; + return resourceURL; } - - public ClassLoader getResourceLoader() - { - return loader; - } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -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.wsse; // $Id: $ @@ -27,6 +27,7 @@ import java.net.URL; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; @@ -48,51 +49,47 @@ { WSSecurityConfiguration config = null; - URL location = getResource(vfsRoot, "WEB-INF/" + resourceName); - if(null == location) - location = getResource(vfsRoot, "META-INF/" + resourceName); + URL location = getResource(vfsRoot, "WEB-INF/" + resourceName, false); + if (null == location) + location = getResource(vfsRoot, "META-INF/" + resourceName, false); if (location != null) { - if(log.isDebugEnabled()) log.debug("createConfiguration from: " + location); + log.debug("createConfiguration from: " + location); config = WSSecurityOMFactory.newInstance().parse(location); // Get and set deployment path to the keystore file if (config.getKeyStoreFile() != null) { - location = getResource(vfsRoot, config.getKeyStoreFile()); - if (location != null) - { - if(log.isDebugEnabled()) log.debug("Add keystore: " + location); - config.setKeyStoreURL(location); - } + location = getResource(vfsRoot, config.getKeyStoreFile(), true); + log.debug("Add keystore: " + location); + config.setKeyStoreURL(location); } if (config.getTrustStoreFile() != null) { - location = getResource(vfsRoot, config.getTrustStoreFile()); - if (location != null) - { - if(log.isDebugEnabled()) log.debug("Add truststore: " + location); - config.setTrustStoreURL(location); - } + location = getResource(vfsRoot, config.getTrustStoreFile(), true); + log.debug("Add truststore: " + location); + config.setTrustStoreURL(location); } } return config; } - private URL getResource(UnifiedVirtualFile vfsRoot, String resource) + private URL getResource(UnifiedVirtualFile vfsRoot, String resource, boolean failOnNotFound) { + URL resourceURL = null; try { UnifiedVirtualFile child = vfsRoot.findChild(resource); - return child.toURL(); + resourceURL = child.toURL(); } - catch (Exception e) + catch (IOException ex) { - return null; + if (failOnNotFound) + throw new WSException("Cannot find required security resource: " + resource); } + return resourceURL; } - } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -170,7 +170,7 @@ URL orgURL = locs.get(nsURI); URL resURL = resolveNamespaceURI(resolver, nsURI); URL url = resURL != null ? resURL : orgURL; - if(log.isDebugEnabled()) log.debug("Load schema: " + nsURI + "=" + url); + log.debug("Load schema: " + nsURI + "=" + url); XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null); InputSource tmpSrc = resolver.resolveEntity(null, url.toExternalForm()); @@ -178,6 +178,9 @@ inputSource.setByteStream(in); SchemaGrammar grammar = (SchemaGrammar)loader.loadGrammar(inputSource); + if (grammar == null) + throw new IllegalStateException("Cannot load grammar: " + url); + gs[index++] = grammar; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -61,22 +61,14 @@ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> <pathelement location="${thirdparty.dir}/jboss-common.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/getopt.jar"/> - <pathelement location="${thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> </target> Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-05 20:41:17 UTC (rev 2282) @@ -7,7 +7,7 @@ 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] -jbossws.integration.target=jboss50 +jbossws.integration.target=jboss42 # The JBoss server instance jboss.server.instance=default @@ -18,8 +18,8 @@ tomcat.manager.password=manager # JBoss Repository -jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository -#jboss.repository=http://repository.jboss.com +#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository +jboss.repository=http://repository.jboss.com # Force thirdparty HTTP get #force.thirdparty.get=true Modified: trunk/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -149,8 +149,8 @@ <target name="common-classpath" depends="prepare,thirdparty"> - <!-- The combined compile classpath --> - <path id="jbossws.jars.classpath"> + <path id="jbossws.classpath"> + <pathelement location="${tests.lib.dir}/jbossws-core.jar"/> <pathelement location="${tests.lib.dir}/jbossws-client.jar"/> <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/> @@ -164,7 +164,7 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="core.classpath"/> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> @@ -182,7 +182,7 @@ <!-- The test client classpath --> <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -201,7 +201,7 @@ <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> @@ -220,10 +220,13 @@ </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + + <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> + <!-- The test client classpath --> <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> - <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <path refid="jbossws.classpath"/> + <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> </target> @@ -320,7 +323,7 @@ <!-- generate mapping artifacts --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> - <classpath location="${tests.lib.dir}/jbossws-client.jar"/> + <classpath refid="jbossws.classpath"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> @@ -405,8 +408,8 @@ <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> @@ -446,8 +449,8 @@ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <!-- http://jira.jboss.com/jira/browse/JBWS-917 - <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> @@ -455,8 +458,8 @@ --> <!-- HTTPS hostname wrong: should be <localhost> --> <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> Modified: trunk/jbossws-docs/user-guide/project/en/modules/wssecurity/wssecurity.xml =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/wssecurity/wssecurity.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-docs/user-guide/project/en/modules/wssecurity/wssecurity.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -349,7 +349,7 @@ </para> <para> - Where you put the jar is up to mostly up to you, although with jdk1.4 the best + Where you put the jar is mostly up to you, although with jdk1.4 the best (and in some cases only) place to have it is in $JAVA_HOME/jre/lib/ext. Under Windows there will normally be a JRE and a JDK install of Java if you think you have installed it correctly and it still doesn't work chances are you have added the provider to the installation not being used. Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -2601,32 +2601,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_ResponseStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - - <!-- jaxrpc-wsse-account-signup-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> @@ -2665,8 +2639,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-rpc-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2683,8 +2655,6 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-rpc-none-client --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2725,8 +2695,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-simple-encrypt-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2768,8 +2736,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-sign-fault-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2811,8 +2777,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-sign-encrypt-fault-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2856,8 +2820,6 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar --> <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -256,16 +256,12 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01"> - <include name="jboss-web.xml"/> - </webinf> </war> <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> - <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> @@ -274,9 +270,6 @@ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03"> - <include name="jboss-web.xml"/> - </webinf> </war> <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/build.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -116,18 +116,6 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - <!-- Define the jbossws.core.jar --> - <condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <property name="jbossws.core.jar" value="${jboss40.output.lib.dir}/jbossws14-core.jar"/> - - <!-- Define the jbossws.client.jar --> - <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <property name="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"/> - <!-- Define excluded tests --> <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> <or> @@ -156,10 +144,14 @@ <target name="common-classpath" depends="prepare,thirdparty"> - <!-- The combined compile classpath --> - <path id="jbossws.jars.classpath"> - <pathelement location="${jbossws.core.jar}"/> - <pathelement location="${jbossws.client.jar}"/> + <condition property="jbossws.classpath" value="jbossws.classpath.jdk15"> + <isset property="HAVE_JDK_1.5"/> + </condition> + <property name="jbossws.classpath" value="jbossws.classpath.jdk14"/> + + <path id="jbossws.classpath.jdk15"> + <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/> + <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> @@ -168,11 +160,20 @@ <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/> <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/> </path> - + + <path id="jbossws.classpath.jdk14"> + <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-client.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws14-core.jar"/> + </path> + <path id="jbossws.classpath" refid="${jbossws.classpath}"/> + <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="core.classpath"/> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> @@ -190,7 +191,7 @@ <!-- The test client classpath --> <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -209,7 +210,7 @@ <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> @@ -228,9 +229,12 @@ </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + + <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> + <!-- The test client classpath --> <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> @@ -350,10 +354,7 @@ <!-- generate mapping artifacts --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> - <classpath location="${jbossws.core.jar}"/> - <classpath location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> - <classpath location="${core.output.lib.dir}/jboss-jaxws.jar"/> - <classpath location="${core.output.lib.dir}/jboss-saaj.jar"/> + <classpath refid="jbossws.classpath"/> <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> @@ -458,8 +459,8 @@ <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> @@ -500,8 +501,8 @@ <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <!-- http://jira.jboss.com/jira/browse/JBWS-917 - <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/> <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> @@ -509,8 +510,8 @@ --> <!-- HTTPS hostname wrong: should be <localhost> --> <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> Modified: trunk/jbossws-tests/src/main/README_XERCES =================================================================== --- trunk/jbossws-tests/src/main/README_XERCES 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/README_XERCES 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,4 +1,6 @@ -This is a xerces bug. The problem is that the latest version of ant only bundles 2.6.2, you need at least 2.7.0 for this not to happen. So all you need to do is update your version of ant. I actually use the one in jboss-head/tools, although you have to drop log4j.jar in jboss-head/tools/lib. +This is a xerces bug. The problem is that the latest version of ant only bundles 2.6.2, you need at least 2.7.0 for this not to happen. +So all you need to do is update your version of ant. I actually use the one in jboss-head/tools, although you have to drop log4j.jar +in jboss-head/tools/lib. -Jason Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -169,7 +169,7 @@ integrationTarget = jbossVersion; } } - catch (Exception ex) + catch (Throwable th) { // ignore, we are not running on jboss-4.2 or greater } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -74,12 +74,6 @@ public void testWebService() throws Exception { - if (isTargetJBoss50() == false) - { - System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); - return; - } - OrderStatus result = orderMgmtWS.prepareOrder(ORDER); assertNotNull("Result was null", result); assertEquals("Prepared", result.getStatus()); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -40,7 +40,7 @@ */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/jsr181", urlPattern="/*") +@WebContext(urlPattern="/*") public class EJB21Bean01 implements SessionBean { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -42,7 +42,7 @@ */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/jsr181", urlPattern="/*") +@WebContext(urlPattern="/*") public class EJB21Bean02 implements SessionBean { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -37,7 +37,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") -@WebContext(contextRoot="/jsr181", urlPattern="/*") +@WebContext(urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -41,7 +41,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") -@WebContext(contextRoot="/jsr181", urlPattern="/*") +@WebContext(urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -36,7 +36,7 @@ * @since 29-Apr-2005 */ @WebService(targetNamespace = "http://foo") -@WebContext(contextRoot="/jsr181", urlPattern="/*") +@WebContext(urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointInterface03 extends Remote { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.samples.webservice; +//$Id$ + import java.net.MalformedURLException; import java.net.URL; import java.rmi.RemoteException; @@ -29,69 +31,54 @@ import javax.xml.ws.Service; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -// $Id$ - /** - * Base testing class for &#064;WebService + * Base testing class for @WebService * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ */ public class JSR181WebServiceBase extends JBossWSTest { - private EndpointInterface getPort() throws MalformedURLException + private EndpointInterface getPort(String context) throws MalformedURLException { QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(EndpointInterface.class); } - private EndpointInterface03 getPort03() throws MalformedURLException + private EndpointInterface03 getPort03(String context) throws MalformedURLException { QName serviceName = new QName("http://foo", "TestService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(EndpointInterface03.class); } - private void sayHello() throws RemoteException, MalformedURLException + private void sayHello(String context) throws RemoteException, MalformedURLException { - assertWSDLAccess(); String helloWorld = "Hello world!"; - Object retObj = getPort().echo(helloWorld); + Object retObj = getPort(context).echo(helloWorld); assertEquals(helloWorld, retObj); } - public void webServiceTest() throws Exception + public void webServiceTest(String context) throws Exception { - sayHello(); + sayHello(context); } - public void webServiceWsdlLocationTest() throws Exception + public void webServiceWsdlLocationTest(String context) throws Exception { - sayHello(); + sayHello(context); } - public void webServiceEndpointInterfaceTest() throws Exception + public void webServiceEndpointInterfaceTest(String context) throws Exception { - assertWSDLAccess(); String helloWorld = "Hello Interface!"; - Object retObj = getPort03().echo(helloWorld); + Object retObj = getPort03(context).echo(helloWorld); assertEquals(helloWorld, retObj); } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } \ No newline at end of file Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -64,7 +64,7 @@ deploy("jaxws-samples-webservice01-ejb3.jar"); try { - webServiceTest(); + webServiceTest("jaxws-samples-webservice01-ejb3"); } finally { @@ -77,7 +77,7 @@ deploy("jaxws-samples-webservice02-ejb3.jar"); try { - webServiceWsdlLocationTest(); + webServiceWsdlLocationTest("jaxws-samples-webservice02-ejb3"); } finally { @@ -90,7 +90,7 @@ deploy("jaxws-samples-webservice03-ejb3.jar"); try { - webServiceEndpointInterfaceTest(); + webServiceEndpointInterfaceTest("jaxws-samples-webservice03-ejb3"); } finally { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceJSETestCase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -44,7 +44,7 @@ deploy("jaxws-samples-webservice01-jse.war"); try { - webServiceTest(); + webServiceTest("jaxws-samples-webservice01-jse"); } finally { @@ -57,7 +57,7 @@ deploy("jaxws-samples-webservice02-jse.war"); try { - webServiceWsdlLocationTest(); + webServiceWsdlLocationTest("jaxws-samples-webservice02-jse"); } finally { @@ -70,7 +70,7 @@ deploy("jaxws-samples-webservice03-jse.war"); try { - webServiceEndpointInterfaceTest(); + webServiceEndpointInterfaceTest("jaxws-samples-webservice03-jse"); } finally { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -72,12 +72,6 @@ public void testEJB3Client() throws Exception { - if (isTargetJBoss50() == false) - { - System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); - return; - } - deploy("jaxws-samples-webserviceref-ejb3-client.jar"); try { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-02-05 20:41:17 UTC (rev 2282) @@ -73,12 +73,6 @@ public void testServletClient() throws Exception { - if (isTargetJBoss50() == false) - { - System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); - return; - } - deploy("jaxws-samples-webserviceref-servlet-client.war"); try { Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/keystore.password =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore (from rev 2280, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.keystore) =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore (from rev 2280, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsse/wsse.truststore) =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF01/jboss-web.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-web> - <context-root>/jsr181</context-root> -</jboss-web> - Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF02/jboss-web.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-web> - <context-root>/jsr181</context-root> -</jboss-web> - Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webservice/WEB-INF03/jboss-web.xml 2007-02-05 20:41:17 UTC (rev 2282) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-web> - <context-root>/jsr181</context-root> -</jboss-web> - Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-02-05 20:41:17 UTC (rev 2282) @@ -6,4 +6,5 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* +org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-02-05 20:41:17 UTC (rev 2282) @@ -5,5 +5,5 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-05 17:09:51 UTC (rev 2281) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-05 20:41:17 UTC (rev 2282) @@ -11,6 +11,7 @@ org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/** org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/webserviceref/** # JBoss excludes @@ -23,3 +24,7 @@ # [JBWS-1471] - Remove unwanted tomcat excludes org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* org/jboss/test/ws/jaxws/samples/wseventing/** + +# [JBWS-1503] - Support XOP samples in tomcat +org/jboss/test/ws/jaxrpc/samples/xop/** +org/jboss/test/ws/jaxws/samples/xop/**