May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3055 - in trunk: build/ant-import and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 01:49:15 -0400 (Sat, 12 May 2007) New Revision: 3055 Modified: trunk/build/ trunk/build/ant-import/build-setup.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/version.properties trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties trunk/jbossws-spi/ant-import/build-thirdparty.xml trunk/jbossws-spi/build.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/sunri-jboss50/ant-import/build-thirdparty.xml trunk/sunri-jboss50/build.xml trunk/sunri-jboss50/src/main/etc/default.mf trunk/sunri-jboss50/version.properties Log: Fix duplicate references to thirdparty Property changes on: trunk/build ___________________________________________________________________ Name: svn:ignore - output thirdparty ant.properties version.properties.md5 clipboard.* + output thirdparty ant.properties version.properties.md5 clipboard.* output* Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/build/ant-import/build-setup.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -21,11 +21,9 @@ <property name="spi.dir" value="${basedir}/../jbossws-spi"/> <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="testsuite.dir" value="${basedir}/../jbossws-tests"/> - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> - <property file="${basedir}/version.properties"/> <property name="jbws.jboss50.dir" value="${basedir}/../jbws-jboss50"/> <property name="jbws.jboss42.dir" value="${basedir}/../jbws-jboss42"/> @@ -82,18 +80,6 @@ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <checksum file="${basedir}/version.properties" fileext=".md5"/> - - <condition property="force.thirdparty.get"> - <or> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> - <isfalse value="${checksum.ok}"/> - </or> - </condition> - <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/build/ant.properties.example 2007-05-12 05:49:15 UTC (rev 3055) @@ -17,7 +17,7 @@ tomcat.manager.password=manager # JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/repository.jboss.org +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository jboss.repository=http://repository.jboss.org # Hudson QA Environment Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/build/build.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS-Build"> +<project default="main" basedir="../build" name="JBossWS-Build"> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> @@ -26,8 +26,8 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}" target="spi.jars"/> - <ant antfile="${core.dir}/build.xml" dir="${core.dir}" target="core.jars"/> + <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}" target="spi-jars"/> + <ant antfile="${core.dir}/build.xml" dir="${core.dir}" target="core-jars"/> </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/build/version.properties 2007-05-12 05:49:15 UTC (rev 3055) @@ -7,3 +7,17 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT + +implementation.title=JBoss Web Services +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jboss-common-core=2.0.2.GA +jboss-common-logging-log4j=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-jbossxb=2.0.0.CR2 +jboss-microcontainer=2.0.0.Beta3 +sun-jaxws=2.1.1 +sun-servlet=2.5 Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -21,7 +21,7 @@  - <target name="tests-init" depends="tests-prepare,thirdparty-classpath"> + <target name="tests-init" depends="tests-prepare,core-thirdparty-classpath"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -34,8 +34,8 @@  <path id="javac.classpath"> - <path refid="core.classpath"/> <path refid="jbossws.classpath"/> + <path refid="core.thirdparty.classpath"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -12,115 +12,130 @@  <project> - + + <property file="${core.dir}/version.properties"/> +    - <target name="thirdparty" depends="prepare,thirdparty-get,thirdparty-classpath"> + <target name="core-thirdparty" depends="core-thirdparty-init,core-thirdparty-get,core-thirdparty-classpath"> </target> + <target name="core-thirdparty-init" depends="prepare"> + + <property name="core.thirdparty.dir" value="${core.dir}/thirdparty"/> + <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="core.force.thirdparty"> + <or> + <not> + <available file="${core.thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + </target> +  - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="core-thirdparty-get" if="core.force.thirdparty" description="Gets the thirdparty libraries"> - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> - <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> + <mkdir dir="${core.thirdparty.dir}"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${core.thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${core.thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${core.thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${core.thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${core.thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${core.thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${core.thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${core.thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${core.thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${core.thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${core.thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${core.thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${core.thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${core.thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${core.thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${core.thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${core.thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${core.thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${core.thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${core.thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${core.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${core.thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${core.thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${core.thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${core.thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${core.thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${core.thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${core.thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${core.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${core.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${core.thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${core.thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${core.thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${core.thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${core.thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${core.thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${core.thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${core.thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${core.thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${core.thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${core.thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${core.thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${core.thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${core.thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${core.thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${core.thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${core.thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${core.thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${core.thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${core.thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${core.thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${core.thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> - <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> - <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> + <mkdir dir="${core.thirdparty.dir}/jbpm-bpel"/> + <unzip dest="${core.thirdparty.dir}/jbpm-bpel" src="${core.thirdparty.dir}/jbpm-bpel.sar"/> + <unzip dest="${core.thirdparty.dir}" src="${core.thirdparty.dir}/ejb3.deployer.zip"/> + + <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" > + <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-thirdparty-classpath">  - <path id="core.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <path id="core.thirdparty.classpath"> + <path refid="spi.thirdparty.classpath"/> + <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${core.thirdparty.dir}/activation.jar"/> + <pathelement location="${core.thirdparty.dir}/getopt.jar"/> + <pathelement location="${core.thirdparty.dir}/javassist.jar"/> + <pathelement location="${core.thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${core.thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${core.thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-j2ee.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-remoting.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${core.thirdparty.dir}/jbosssx-client.jar"/> + <pathelement location="${core.thirdparty.dir}/mail.jar"/> + <pathelement location="${core.thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${core.thirdparty.dir}/stax-api.jar"/> + <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${core.thirdparty.dir}/wstx.jar"/> + <pathelement location="${core.thirdparty.dir}/xmlsec.jar"/> + <pathelement location="${core.thirdparty.dir}/xercesImpl.jar"/> + <pathelement location="${core.thirdparty.dir}/xalan.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/getopt.jar"/> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-core.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}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> </target> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-core/build.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -31,7 +31,7 @@ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - <target name="core-init" depends="prepare, thirdparty"> + <target name="core-init" depends="prepare,core-thirdparty"> </target>  @@ -58,7 +58,7 @@ failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> - <classpath refid="core.classpath"/> + <classpath refid="core.thirdparty.classpath"/> </javac>  @@ -71,7 +71,7 @@ <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> <classpath path="${core.output.classes14.dir}"/> - <classpath refid="core.classpath"/> + <classpath refid="core.thirdparty.classpath"/> </javac> </target> @@ -86,7 +86,6 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> </target> Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-core/version.properties 2007-05-12 05:49:15 UTC (rev 3055) @@ -1,26 +1,14 @@ # $Id$ -implementation.title=JBoss Web Services - JBossWS -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - # Thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 -jboss-jbossws-spi=SNAPSHOT jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.0.3jboss stax-api=1.0 -# Build and Tomcat -jboss-jbossxb=1.0.0.CR10 -jboss-microcontainer=2.0.0.Beta3 -jboss-remoting=2.0.0.GA - # Thirdparty library versions apache-ant=1.6.5 apache-collections=3.1 @@ -34,17 +22,11 @@ gnu-getopt=1.0.10 hibernate=3.2.1.GA jaxen=1.1-beta-10 -jboss-backport-concurrent=2.1.0.GA -jboss-common-core=2.0.2.GA -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-jaxr=1.2.0.GA -jboss-jbossretro=1.0.4.GA +jboss-remoting=2.0.0.GA jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 -jbossws-jboss42=SNAPSHOT -jbossws-jboss50=SNAPSHOT jbossas-core-libs=4.0.5.GA junit=3.8.1 oswego-concurrent=1.3.4 @@ -52,7 +34,7 @@ sun-hudson=1.93 sun-jaf=1.1 sun-javamail=1.4 -sun-servlet=2.4 +sun-jaxb=2.1.3 woodstox=3.1.1 wscommons-policy=1.0 xmlunit=1.0 Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -17,43 +17,60 @@   - <target name="thirdparty" depends="prepare,thirdparty-get,spi-classpath"> + <target name="spi-thirdparty" depends="spi-thirdparty-init,spi-thirdparty-get,spi-thirdparty-classpath"> </target> - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="spi-thirdparty-init" depends="prepare"> + + <property name="spi.thirdparty.dir" value="${spi.dir}/thirdparty"/> + <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="spi.force.thirdparty"> + <or> + <not> + <available file="${spi.thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + </target> + + <target name="spi-thirdparty-get" if="spi.force.thirdparty" description="Gets the thirdparty libraries"> - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <mkdir dir="${spi.thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${spi.thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${spi.thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${spi.thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${spi.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${spi.thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${spi.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${spi.thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${spi.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${spi.thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${spi.thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${spi.thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${spi.thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${spi.thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${spi.thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${build.dir}/version.properties" fileext=".md5"/> </target> - <target name="spi-classpath" > + <target name="spi-thirdparty-classpath" depends="spi-thirdparty-init">  - <path id="spi.classpath"> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <path id="spi.thirdparty.classpath"> + <pathelement location="${spi.thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${spi.thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${spi.thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${spi.thirdparty.dir}/servlet-api.jar"/> </path> </target> Modified: trunk/jbossws-spi/build.xml =================================================================== --- trunk/jbossws-spi/build.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbossws-spi/build.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -36,7 +36,7 @@   - <target name="spi-init" depends="prepare,thirdparty"> + <target name="spi-init" depends="prepare,spi-thirdparty"> </target>  @@ -51,7 +51,7 @@ | documentation compiles. --> - <target name="spi-compile" depends="spi-init,spi-classpath,spi-compile-classes,spi-compile-etc" + <target name="spi-compile" depends="spi-init,spi-compile-classes,spi-compile-etc" description="Compile all source files."/>  @@ -62,7 +62,7 @@ <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="org/jboss/ws/**"/> - <classpath refid="spi.classpath"/> + <classpath refid="spi.thirdparty.classpath"/> </javac> </target> @@ -80,7 +80,6 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-spi-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> </target> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -13,13 +13,29 @@ <project> + <property file="${basedir}/version.properties"/> +    - <target name="thirdparty" depends="prepare,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> </target> + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + </or> + </condition> + </target> +  @@ -53,17 +69,14 @@ <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> </target> - <target name="thirdparty-classpath" > + <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath">  <path id="jboss50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - + <path refid="core.thirdparty.classpath"/> + <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes14"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> Modified: trunk/sunri-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -13,13 +13,29 @@ <project> + <property file="${basedir}/version.properties"/> +    - <target name="thirdparty" depends="prepare,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> </target> + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + </or> + </condition> + </target> +  @@ -61,14 +77,16 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" > + <target name="thirdparty-classpath" depends="spi-thirdparty-classpath">  <path id="sunri50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - + <path refid="spi.thirdparty.classpath"/> + <pathelement location="${spi.dir}/output/classes"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> Modified: trunk/sunri-jboss50/build.xml =================================================================== --- trunk/sunri-jboss50/build.xml 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/sunri-jboss50/build.xml 2007-05-12 05:49:15 UTC (rev 3055) @@ -20,7 +20,7 @@ <import file="${basedir}/ant-import/build-testsuite.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${core.dir}/build.xml"/> + <import file="${spi.dir}/build.xml"/>   @@ -40,7 +40,7 @@   - <target name="sunri50-init" depends="prepare, thirdparty"> + <target name="sunri50-init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> Modified: trunk/sunri-jboss50/src/main/etc/default.mf =================================================================== --- trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-12 05:49:15 UTC (rev 3055) @@ -3,7 +3,7 @@ Specification-Title: @specification.title@ Specification-Version: @specification.version@ Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ +Implementation-Title: @sunri.implementation.title@ Implementation-URL: @implementation.url@ Implementation-Version: @implementation.version@ (build=(a)build.id@) Implementation-Vendor: @implementation.vendor@ Modified: trunk/sunri-jboss50/version.properties =================================================================== --- trunk/sunri-jboss50/version.properties 2007-05-12 04:03:30 UTC (rev 3054) +++ trunk/sunri-jboss50/version.properties 2007-05-12 05:49:15 UTC (rev 3055) @@ -1,26 +1,11 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.1 +sunri.implementation.title=JBoss Web Services - JBossWS/SunRI -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS/SunRI -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - # Thirdparty library versions -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA jboss-jaxr=1.2.0.GA jboss-jbossws-spi=SNAPSHOT -jboss-jbossxb=2.0.0.CR2 -jboss-microcontainer=2.0.0.Beta3 jboss-security-spi=2.0.0.Beta sun-jaxb=2.1.3 sun-jaxws=2.1.1

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3053 - in branches/dlofthouse/JBWS-1648: jbossws-core/src/java/org/jboss/ws/core/jaxws/binding and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-11 14:28:00 -0400 (Fri, 11 May 2007) New Revision: 3053 Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java Log: Fix test regressions. Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -549,8 +549,14 @@ Iterator bodyChildren = soapBody.getChildElements(); SOAPBodyElement soapBodyElement = null; - if (bodyChildren.hasNext() != false) - soapBodyElement = (SOAPBodyElement)bodyChildren.next(); + while (bodyChildren.hasNext() && soapBodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -23,10 +23,12 @@ // $Id$ +import java.util.Iterator; import java.util.List; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; import javax.xml.ws.handler.Handler; @@ -93,7 +95,18 @@ SOAPMessage reqMessage = (SOAPMessage)payload; SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody(); - SOAPContentElement bodyElement = (SOAPContentElement)body.getFirstChild(); + + SOAPContentElement bodyElement = null; + Iterator bodyChildren = body.getChildElements(); + while (bodyChildren.hasNext() && bodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPContentElement) + { + bodyElement = (SOAPContentElement)next; + } + } + Source source = bodyElement.getXMLFragment().getSource(); if (source == null) Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -27,6 +27,7 @@ import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; import java.util.HashMap; +import java.util.Iterator; import javax.activation.DataHandler; import javax.management.MBeanException; @@ -344,9 +345,21 @@ { String faultString; SOAPBody soapBody = soapMessage.getSOAPBody(); - if (soapBody.getChildElements().hasNext()) + + Iterator bodyChildren = soapBody.getChildElements(); + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement != null) + { Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -28,6 +28,7 @@ import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -37,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -115,7 +117,7 @@ String xmlStr = "<?xml version='1.0' encoding='UTF-8' ?>" + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://uri.jboss.org'>" + " <env:Body>" + - " <tns:testMessage><![CDATA[ Hello ]]></tns:testMessage>" + + " <tns:myMessage><![CDATA[ Hello ]]></tns:myMessage>" + " </env:Body>" + "</env:Envelope>"; @@ -185,8 +187,10 @@ SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next(); + Name name = new NameImpl("myMessage", "tns", "http://uri.jboss.org"); + SOAPElement soapElement = (SOAPElement)soapBody.getChildElements(name).next(); + StringBuffer builder = new StringBuffer(); NodeList nlist = soapElement.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -22,12 +22,14 @@ package org.jboss.test.ws.jaxws.handlerlifecycle; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -186,8 +188,32 @@ String testMethod; try { - SOAPElement soapElement = (SOAPElement)((SOAPMessageContext)msgContext).getMessage().getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); + + SOAPMessage message = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = null; + Iterator it = message.getSOAPBody().getChildElements(); + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + + it = soapElement.getChildElements(); + soapElement = null; + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + testMethod = soapElement.getValue(); } catch (SOAPException e) Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-11 14:55:35 UTC (rev 3052) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-11 18:28:00 UTC (rev 3053) @@ -31,6 +31,7 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; @@ -45,6 +46,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -131,7 +133,9 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - Element child = (Element)resEnv.getBody().getChildElements().next(); + Name name = new NameImpl("user", "ns1", "http://org.jboss.ws/provider"); + Element child = (Element)resEnv.getBody().getChildElements(name).next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child));

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3052 - in branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core: soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-11 10:55:35 -0400 (Fri, 11 May 2007) New Revision: 3052 Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java Log: ClassCastException fixes. Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-11 14:54:59 UTC (rev 3051) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-11 14:55:35 UTC (rev 3052) @@ -67,6 +67,7 @@ import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPHeaderElementImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; @@ -229,10 +230,10 @@ log.debug("Add unboundHeader element: " + soapName); SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName); contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData)); - + if (soapHeader == null) soapHeader = soapEnvelope.addHeader(); - + soapHeader.addChildElement(contentElement); contentElement.setObjectValue(value); } @@ -291,7 +292,18 @@ SOAPElement soapBodyElement = soapBody; if (style == Style.RPC) { - soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + soapBodyElement = null; + + Iterator it = soapBody.getChildElements(); + while (soapBodyElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapBodyElement = (SOAPElement)current; + } + } + Name elName = soapBodyElement.getElementName(); QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix()); @@ -804,8 +816,14 @@ Iterator childElements = soapElement.getChildElements(); while (childElements.hasNext()) { - SOAPElementImpl childElement = (SOAPElementImpl)childElements.next(); + Object child = childElements.next(); + if (child instanceof TextImpl) + { + continue; + } + SOAPElementImpl childElement = (SOAPElementImpl)child; + // If this message was manipulated by a handler the child may not be a content element if (!(childElement instanceof SOAPContentElement)) childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-11 14:54:59 UTC (rev 3051) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-11 14:55:35 UTC (rev 3052) @@ -68,7 +68,8 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction); + if (log.isDebugEnabled()) + log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -87,8 +88,19 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); Iterator bodyChildren = soapBody.getChildElements(); - if (bodyChildren.hasNext() == false) + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement == null) + { if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); @@ -97,7 +109,8 @@ { if (opAux.getParameters().size() == 0) { - if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body"); + if (log.isDebugEnabled()) + log.debug("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -105,7 +118,6 @@ } else { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next(); Name soapName = soapBodyElement.getElementName(); QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName()); opMetaData = epMetaData.getOperation(xmlElementName); @@ -119,14 +131,16 @@ { if (opAux.isMessageEndpoint()) { - if(log.isDebugEnabled()) log.debug("Use generic message style dispatch"); + if (log.isDebugEnabled()) + log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + if (log.isDebugEnabled()) + log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3051 - branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-11 10:54:59 -0400 (Fri, 11 May 2007) New Revision: 3051 Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java Log: Rollback changes to testcase. Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-11 14:38:19 UTC (rev 3050) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-11 14:54:59 UTC (rev 3051) @@ -24,13 +24,10 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.net.URL; -import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; -import javax.xml.soap.Name; -import javax.xml.soap.Node; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPElement; @@ -41,7 +38,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.core.soap.NameImpl; /** * The prefix "xsi" for attribute "xsi:nil" is not bound @@ -106,33 +102,24 @@ public void testMessageAccess() throws Exception { MessageFactory factory = MessageFactory.newInstance(); - + // The xsi namespace is declared on the envelope String reqStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <env:Body>" + - " <ns1:echo xmlns:ns1='http://org.jboss.test.ws/jbws1186'>" + - " <String_1 xsi:nil='1'/>" + - " <UserType_2>" + - " <name xsi:nil='1'/>" + - " </UserType_2>" + - " </ns1:echo>" + - " </env:Body>" + + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <env:Body>" + + " <ns1:echo xmlns:ns1='http://org.jboss.test.ws/jbws1186'>" + + " <String_1 xsi:nil='1'/>" + + " <UserType_2>" + + " <name xsi:nil='1'/>" + + " </UserType_2>" + + " </ns1:echo>" + + " </env:Body>" + "</env:Envelope>"; - + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1186"); SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - Name headerName = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); - - Iterator it = soapElement.getChildElements(); - while (it.hasNext()) - { - Object currentNode = (Node)it.next(); - System.out.println(currentNode.getClass().getName()); - } - soapElement = (SOAPElement)soapElement.getChildElements().next(); assertEquals("1", soapElement.getAttribute("xsi:nil")); }

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3050 - in branches/dlofthouse/JBWS-1648: jbossws-tests/src/java/org/jboss/test/ws/common/soap and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-11 10:38:19 -0400 (Fri, 11 May 2007) New Revision: 3050 Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java Log: Initial fix and test case modifications. Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -63,14 +63,28 @@ String bodyStr = DOMWriter.printNode(soapBody, true); log.debug("Begin processHRefs:\n" + bodyStr); - SOAPBodyElement bodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPBodyElement bodyElement = null; + Iterator children = soapBody.getChildElements(); + while (bodyElement == null && children.hasNext()) + { + Object currentChild = children.next(); + if (currentChild instanceof SOAPBodyElement) + { + bodyElement = (SOAPBodyElement)currentChild; + } + } + processElement(bodyElement); - + Iterator it = soapBody.getChildElements(); while (it.hasNext()) { + Object currentChild = it.next(); + if (currentChild instanceof TextImpl) + continue; + // Remove id elements - SOAPElement soapElement = (SOAPElement)it.next(); + SOAPElement soapElement = (SOAPElement)currentChild; if ((soapElement instanceof SOAPBodyElement) == false) soapBody.removeChild(soapElement); } Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -143,7 +143,7 @@ } public SOAPElement setElementQNameInternal(QName qname) throws SOAPException - { + { elementName = new NameImpl(qname); Document owner = domNode.getOwnerDocument(); @@ -153,7 +153,6 @@ return this.completeNamespaceDeclaration(); } - /** * Adds an attribute with the specified name and value to this SOAPElement object. * @@ -465,9 +464,7 @@ } else if (node instanceof Text) { - String value = node.getNodeValue(); - if (value.trim().length() > 0) - list.add(node); + list.add(node); } } return list.iterator(); @@ -835,7 +832,14 @@ } else if (node instanceof TextImpl) { + boolean comment = node.getNodeType() == Node.COMMENT_NODE; + if (comment) + out.write(""); } else { Modified: branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -58,7 +58,7 @@ /** Add a SOAPHeaderElement as a child of this SOAPHeader instance. */ public SOAPElement addChildElement(SOAPElement child) throws SOAPException - { + { QName qname = child.getElementQName(); if (qname == null || qname.getNamespaceURI().length() == 0) throw new SOAPException("Invalid SOAPHeaderElement name: " + qname); @@ -111,8 +111,12 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + list.add(shElement); + } } return list.iterator(); } @@ -129,9 +133,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + list.add(shElement); + } } return list.iterator(); } @@ -149,9 +157,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) + list.add(shElement); + } } return list.iterator(); } @@ -163,9 +175,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - removeChild(shElement); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + removeChild(shElement); + list.add(shElement); + } } return list.iterator(); } @@ -180,11 +196,15 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) { - removeChild(shElement); - list.add(shElement); + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + { + removeChild(shElement); + list.add(shElement); + } } } return list.iterator(); Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -28,18 +28,19 @@ import java.io.IOException; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.DOMWriter; import org.w3c.dom.Element; @@ -82,7 +83,9 @@ assertEquals("env:Envelope", env.getNodeName()); assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); - SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next(); + Name name = new NameImpl("businessList", null, "urn:uddi-org:api_v2"); + SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements(name).next(); + assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI()); } @@ -225,4 +228,38 @@ //System.out.println(wasXML); assertEquals(expXML, wasXML); } -} \ No newline at end of file + + public void testWriteToPreserveFormatting() throws Exception + { + String expMessage = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " <soapenv:Header></soapenv:Header>" + + " <soapenv:Body>" + + " " + + " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " " + + " <firstName>Joe</firstName>" + + " <surname>Bloggs</surname>" + + " " + + " </typ:lookup>" + + " " + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + MessageFactoryImpl factory = new MessageFactoryImpl(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMessage.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + soapMsg.writeTo(outputStream); + + String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); + + //System.out.println("A - " + expMessage); + //System.out.println("B - " + DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), false)); + //System.out.println("C - " + actualMessage); + + assertEquals(expMessage, actualMessage); + } + +} Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -33,6 +33,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPElement @@ -114,8 +115,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes())); SOAPFactory soapFactory = SOAPFactory.newInstance(); - SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + Name name = new NameImpl("bear", "np", "http://northpole.net"); + SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements(name).next(); + assertEquals(2, getIteratorCount(bearElement.getAllAttributes())); Iterator it = bearElement.getAllAttributes(); Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -38,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; /** @@ -76,7 +77,10 @@ MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next(); + + Name name = new NameImpl("Fault", "env", "http://schemas.xmlsoap.org/soap/envelope/"); + SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(name).next(); + assertEquals("env:Client", soapFault.getFaultCode()); assertEquals("Some fault message", soapFault.getFaultString()); assertEquals("Some fault actor", soapFault.getFaultActor()); Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -61,9 +61,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertEquals("BradPitt", shElement.getActor()); @@ -86,9 +87,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertTrue(shElement.getMustUnderstand()); Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -206,7 +206,7 @@ assertEquals("SomeHeaderValue", foo.getValue()); assertEquals("SomeOtherValue", bar.getValue()); - assertFalse(soapHeader.getChildElements().hasNext()); + assertFalse(soapHeader.examineAllHeaderElements().hasNext()); } public void testExtractHeaderElements() throws Exception @@ -234,7 +234,7 @@ assertEquals("SomeOtherValue", bar.getValue()); - Iterator childElements = soapHeader.getChildElements(); + Iterator childElements = soapHeader.examineAllHeaderElements(); SOAPHeaderElement foo = (SOAPHeaderElement)childElements.next(); Name fooName = new NameImpl("Foo", "ns1", "http://org.jboss.ws/header"); Modified: branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-11 14:36:21 UTC (rev 3049) +++ branches/dlofthouse/JBWS-1648/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-11 14:38:19 UTC (rev 3050) @@ -24,10 +24,13 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.net.URL; +import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; +import javax.xml.soap.Node; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPElement; @@ -38,6 +41,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; /** * The prefix "xsi" for attribute "xsi:nil" is not bound @@ -102,24 +106,33 @@ public void testMessageAccess() throws Exception { MessageFactory factory = MessageFactory.newInstance(); - + // The xsi namespace is declared on the envelope String reqStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + - " <env:Body>" + - " <ns1:echo xmlns:ns1='http://org.jboss.test.ws/jbws1186'>" + - " <String_1 xsi:nil='1'/>" + - " <UserType_2>" + - " <name xsi:nil='1'/>" + - " </UserType_2>" + - " </ns1:echo>" + - " </env:Body>" + + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + + " <env:Body>" + + " <ns1:echo xmlns:ns1='http://org.jboss.test.ws/jbws1186'>" + + " <String_1 xsi:nil='1'/>" + + " <UserType_2>" + + " <name xsi:nil='1'/>" + + " </UserType_2>" + + " </ns1:echo>" + + " </env:Body>" + "</env:Envelope>"; - + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1186"); SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + Name headerName = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + + Iterator it = soapElement.getChildElements(); + while (it.hasNext()) + { + Object currentNode = (Node)it.next(); + System.out.println(currentNode.getClass().getName()); + } + soapElement = (SOAPElement)soapElement.getChildElements().next(); assertEquals("1", soapElement.getAttribute("xsi:nil")); }

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3049 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-11 10:36:21 -0400 (Fri, 11 May 2007) New Revision: 3049 Added: branches/dlofthouse/JBWS-1648/ Log: Branch to work on JBWS-1648. Copied: branches/dlofthouse/JBWS-1648 (from rev 3048, branches/jbossws-2.0)

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3048 - trunk/jbossws-core/src/java/org/jboss/ws/core/server.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-11 00:35:04 -0400 (Fri, 11 May 2007) New Revision: 3048 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/RequestHandlerImpl.java Log: Use HttpRequestHandler Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-11 04:31:34 UTC (rev 3047) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-11 04:35:04 UTC (rev 3048) @@ -24,19 +24,14 @@ // $Id$ import java.io.IOException; -import java.io.Writer; import javax.management.ObjectName; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.rpc.JAXRPCException; -import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.RequestHandler; @@ -52,9 +47,6 @@ */ public abstract class AbstractServiceEndpointServlet extends HttpServlet { - // provide logging - private static final Logger log = Logger.getLogger(AbstractServiceEndpointServlet.class); - protected Endpoint endpoint; protected EndpointRegistry epRegistry; @@ -64,11 +56,6 @@ epRegistry = EndpointRegistryFactory.getEndpointRegistry(); } - public void destroy() - { - super.destroy(); - } - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { if (endpoint == null) @@ -76,87 +63,11 @@ String contextPath = req.getContextPath(); initServiceEndpoint(contextPath); } - super.service(req, res); - } - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - // Process a WSDL request - if (req.getParameter("wsdl") != null || req.getParameter("WSDL") != null) - { - res.setContentType("text/xml"); - ServletOutputStream out = res.getOutputStream(); - try - { - RequestHandler requestHandler = endpoint.getRequestHandler(); - ServletRequestContext context = new ServletRequestContext(getServletContext(), req, res); - requestHandler.handleWSDLRequest(endpoint, out, context); - } - catch (Exception ex) - { - handleException(ex); - } - finally - { - try - { - out.close(); - } - catch (IOException ioex) - { - log.error("Cannot close output stream"); - } - } - } - else - { - res.setStatus(405); - res.setContentType("text/plain"); - Writer out = res.getWriter(); - out.write("HTTP GET not supported"); - out.close(); - } + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); } - public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - log.debug("doPost: " + req.getRequestURI()); - - ServletInputStream in = req.getInputStream(); - ServletOutputStream out = res.getOutputStream(); - try - { - RequestHandler requestHandler = endpoint.getRequestHandler(); - ServletRequestContext context = new ServletRequestContext(getServletContext(), req, res); - requestHandler.handleRequest(endpoint, in, out, context); - } - catch (Exception ex) - { - handleException(ex); - } - finally - { - try - { - out.close(); - } - catch (IOException ioex) - { - log.error("Cannot close output stream"); - } - } - } - - private void handleException(Exception ex) throws ServletException - { - log.error("Error processing web service request", ex); - - if (ex instanceof JAXRPCException) - throw (JAXRPCException)ex; - - throw new ServletException(ex); - } - /** Initialize the service endpoint */ protected void initServiceEndpoint(String contextPath) Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/RequestHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/RequestHandlerImpl.java 2007-05-11 04:31:34 UTC (rev 3047) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/RequestHandlerImpl.java 2007-05-11 04:35:04 UTC (rev 3048) @@ -27,6 +27,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.io.Writer; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -34,9 +35,13 @@ import javax.activation.DataHandler; import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.namespace.QName; +import javax.xml.rpc.JAXRPCException; import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPEnvelope; @@ -92,8 +97,91 @@ // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - public void handleRequest(Endpoint endpoint, InputStream inputStream, OutputStream outputStream, InvocationContext context) + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { + String method = req.getMethod(); + if (method.equals("POST")) + { + doPost(endpoint, req, res, context); + } + else if (method.equals("GET")) + { + doGet(endpoint, req, res, context); + } + else + { + throw new WSException("Unsupported method: " + method); + } + } + + private void doGet(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + // Process a WSDL request + if (req.getParameter("wsdl") != null || req.getParameter("WSDL") != null) + { + res.setContentType("text/xml"); + ServletOutputStream out = res.getOutputStream(); + try + { + ServletRequestContext reqContext = new ServletRequestContext(context, req, res); + handleWSDLRequest(endpoint, out, reqContext); + } + catch (Exception ex) + { + handleException(ex); + } + finally + { + try + { + out.close(); + } + catch (IOException ioex) + { + log.error("Cannot close output stream"); + } + } + } + else + { + res.setStatus(405); + res.setContentType("text/plain"); + Writer out = res.getWriter(); + out.write("HTTP GET not supported"); + out.close(); + } + } + + private void doPost(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + log.debug("doPost: " + req.getRequestURI()); + + ServletInputStream in = req.getInputStream(); + ServletOutputStream out = res.getOutputStream(); + try + { + ServletRequestContext reqContext = new ServletRequestContext(context, req, res); + handleRequest(endpoint, in, out, reqContext); + } + catch (Exception ex) + { + handleException(ex); + } + finally + { + try + { + out.close(); + } + catch (IOException ioex) + { + log.error("Cannot close output stream"); + } + } + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { log.debug("handleRequest: " + endpoint.getName()); ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class); @@ -139,7 +227,7 @@ try { - MessageAbstraction resMessage = processRequest(endpoint, headerSource, reqContext, inputStream); + MessageAbstraction resMessage = processRequest(endpoint, headerSource, reqContext, inStream); // Replace the message context with the response context msgContext = MessageContextAssociation.peekMessageContext(); @@ -172,7 +260,7 @@ } } - sendResponse(outputStream, msgContext, isFault); + sendResponse(outStream, msgContext, isFault); } catch (Exception ex) { @@ -406,4 +494,14 @@ throw new WSException(ex); } } + + private void handleException(Exception ex) throws ServletException + { + log.error("Error processing web service request", ex); + + if (ex instanceof JAXRPCException) + throw (JAXRPCException)ex; + + throw new ServletException(ex); + } }

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3047 - in projects/wsintegration: jbossws-spi/trunk/ant-import and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-11 00:31:34 -0400 (Fri, 11 May 2007) New Revision: 3047 Added: projects/wsintegration/jbossws-spi/trunk/ant-import/ projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java Removed: projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml projects/wsintegration/jbossws-spi/trunk/src/main/etc/ant-import/ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointHandler.java Modified: projects/wsintegration/jbossws-spi/trunk/.classpath projects/wsintegration/jbossws-spi/trunk/build.xml projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandler.java projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/RequestHandler.java projects/wsintegration/jbossws-spi/trunk/version.properties projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml Log: Use HttpRequestHandler Modified: projects/wsintegration/jbossws-spi/trunk/.classpath =================================================================== --- projects/wsintegration/jbossws-spi/trunk/.classpath 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/.classpath 2007-05-11 04:31:34 UTC (rev 3047) @@ -13,5 +13,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Copied: projects/wsintegration/jbossws-spi/trunk/ant-import (from rev 3033, projects/wsintegration/jbossws-spi/trunk/src/main/etc/ant-import) Deleted: projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-10 03:28:26 UTC (rev 3033) +++ projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml 2007-05-11 04:31:34 UTC (rev 3047) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="thirdparty" name="JBossWS-Thirdparty"> - -  -  -  - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-get" if="force.thirdparty.get" - description="Gets the thirdparty libraries"> - - <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - </target> - - <target name="thirdparty-classpath" > - -  - <path id="core.classpath"> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - </path> - - </target> - -</project> Copied: projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml (from rev 3036, projects/wsintegration/jbossws-spi/trunk/src/main/etc/ant-import/build-thirdparty.xml) =================================================================== --- projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml (rev 0) +++ projects/wsintegration/jbossws-spi/trunk/ant-import/build-thirdparty.xml 2007-05-11 04:31:34 UTC (rev 3047) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="thirdparty" name="JBossWS-Thirdparty"> + +  +  +  + + <target name="thirdparty" depends="prepare,thirdparty-get,thirdparty-classpath"> + </target> + + <target name="thirdparty-get" if="force.thirdparty.get" + description="Gets the thirdparty libraries"> + + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + </target> + + <target name="thirdparty-classpath" > + +  + <path id="spi.classpath"> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + </path> + + </target> + +</project> Modified: projects/wsintegration/jbossws-spi/trunk/build.xml =================================================================== --- projects/wsintegration/jbossws-spi/trunk/build.xml 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/build.xml 2007-05-11 04:31:34 UTC (rev 3047) @@ -13,8 +13,8 @@ <project default="main" basedir="." name="JBossWS SPI"> - <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/>   Deleted: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointHandler.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointHandler.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/EndpointHandler.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -1,68 +0,0 @@ -/* - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - */ -package org.jboss.ws.integration; - -// $Id$ - -/** - * A general endpoint handler. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface EndpointHandler -{ -} Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandler.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandler.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/LifecycleHandler.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -61,7 +61,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public interface LifecycleHandler extends EndpointHandler +public interface LifecycleHandler { /** Handle the create step of an endpoint */ void create(Endpoint endpoint); Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/RequestHandler.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/RequestHandler.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/RequestHandler.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -57,9 +57,15 @@ // $Id$ +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.jboss.ws.integration.invocation.InvocationContext; /** @@ -68,11 +74,15 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public interface RequestHandler extends EndpointHandler +public interface RequestHandler { + /** Handle a web service http request + */ + void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException; + /** Handle a web service request */ - void handleRequest(Endpoint endpoint, InputStream inputStream, OutputStream outputStream, InvocationContext context); + void handleRequest(Endpoint endpoint, InputStream inputStream, OutputStream outputStream, InvocationContext context) throws IOException; /** Handle a wsdl request */ - void handleWSDLRequest(Endpoint endpoint, OutputStream output, InvocationContext context); + void handleWSDLRequest(Endpoint endpoint, OutputStream output, InvocationContext context) throws IOException; } Modified: projects/wsintegration/jbossws-spi/trunk/version.properties =================================================================== --- projects/wsintegration/jbossws-spi/trunk/version.properties 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/jbossws-spi/trunk/version.properties 2007-05-11 04:31:34 UTC (rev 3047) @@ -21,6 +21,7 @@ jboss-jbossxb=1.0.0.CR10 jboss-microcontainer=2.0.0.Beta3 sun-jaxws=2.1.1 +sun-servlet=2.5 @@ -32,7 +33,6 @@ - apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 Modified: projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt 2007-05-11 04:31:34 UTC (rev 3047) @@ -1,6 +1,11 @@ -# $Id:$ +# $Id$ -WSServletContextListener is final and loads sun-jaxws.xml from context classloader. +* WSServletContextListener is final and loads sun-jaxws.xml from context classloader. We need to provide sun-jaxws.xml dynamically. -WSServletException is package protected \ No newline at end of file +* WSServletException is package protected + +* WSServlet is final + +* WSServletDelegate is final + Modified: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml 2007-05-11 04:31:34 UTC (rev 3047) @@ -33,6 +33,11 @@ <include name="jaxb-impl.jar"/> </fileset> </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-spi"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer" src="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -23,9 +23,11 @@ //$Id$ +import org.jboss.metadata.WebMetaData; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.utils.ObjectNameFactory; /** * A deployer that assigns the complete name to the Endpoint @@ -38,10 +40,24 @@ @Override public void create(Deployment dep) { + String contextRoot = null; + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + contextRoot = webMetaData.getContextRoot(); + + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + if (contextRoot.startsWith("/")) + contextRoot = contextRoot.substring(1); + for (Endpoint ep : dep.getService().getEndpoints()) { - //ObjectName sepID = ObjectNameFactory; - //ep.setName(sepID); + StringBuilder name = new StringBuilder(ep.getName().getCanonicalName()); + if (ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT) == null) + name.append("," + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot); + + ep.setName(ObjectNameFactory.create(name.toString())); } } } \ No newline at end of file Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -23,15 +23,25 @@ //$Id$ +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.RequestHandler; import org.jboss.ws.integration.invocation.InvocationContext; +import com.sun.xml.ws.transport.http.servlet.WSServlet; +import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; + /** * A request handler * @@ -43,15 +53,39 @@ // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - public void handleRequest(Endpoint endpoint, InputStream inputStream, OutputStream outputStream, InvocationContext context) + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { - log.debug("handleRequest: " + endpoint.getName()); + WSServletDelegate delegate = (WSServletDelegate)context.getAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); + String method = req.getMethod(); + if (method.equals("POST")) + { + delegate.doPost(req, res, context); + } + else if (method.equals("GET")) + { + delegate.doGet(req, res, context); + } + else if (method.equals("PUT")) + { + delegate.doPut(req, res, context); + } + else if (method.equals("DELETE")) + { + delegate.doDelete(req, res, context); + } + else + { + throw new WebServiceException("Unsupported method: " + method); + } + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { throw new NotImplementedException(); } - public void handleWSDLRequest(Endpoint endpoint, OutputStream outputStream, InvocationContext context) + public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) { - log.debug("handleWSDLRequest: " + endpoint.getName()); throw new NotImplementedException(); } } Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -26,8 +26,6 @@ import java.util.ArrayList; import java.util.Iterator; -import javax.jws.WebService; - import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.metadata.web.ServletMapping; @@ -51,7 +49,7 @@ DDEndpoints dd = new DDEndpoints(); for (Endpoint ep : dep.getService().getEndpoints()) { - String name = getName(ep); + String name = getName(dep, ep); String implementation = ep.getEndpointImpl().getName(); String urlPattern = getUrlPattern(dep, ep); @@ -62,23 +60,22 @@ dep.getContext().addAttachment(DDEndpoints.class, dd); } - private String getName(Endpoint ep) + private String getName(Deployment dep, Endpoint ep) { String name = null; - Class impl = ep.getEndpointImpl(); - if (impl.isAnnotationPresent(WebService.class)) + String impl = ep.getEndpointImpl().getName(); + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) { - WebService anWebService = (WebService)impl.getAnnotation(WebService.class); - if (anWebService.name().length() > 0) - name = anWebService.name(); + for (Servlet servlet : webMetaData.getServlets()) + { + String servletClass = servlet.getServletClass(); + if (impl.equals(servletClass)) + { + name = servlet.getName(); + } + } } - // Fall back - if (name == null) - { - name = impl.getName(); - name = name.substring(name.lastIndexOf(".") + 1); - } - return name; } Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -0,0 +1,98 @@ +/* + * 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.sunri; + +// $Id$ + +import java.io.IOException; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.RequestHandler; +import org.jboss.ws.integration.management.EndpointRegistry; +import org.jboss.ws.integration.management.EndpointRegistryFactory; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * The JAX-WS dispatcher servlet. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSEndpointServlet extends HttpServlet +{ + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + if (endpoint == null) + { + String contextPath = req.getContextPath(); + initServiceEndpoint(contextPath); + } + + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + String servletName = getServletName(); + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = epRegistry.getEndpoint(sepId); + break; + } + } + + if (endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java 2007-05-11 04:31:34 UTC (rev 3047) @@ -108,6 +108,7 @@ { ServletResourceLoader resourceLoader = new ServletResourceLoader(context); ServletAdapterList adapterList = new ServletAdapterList(); + // Parse the descriptor file and build endpoint infos DeploymentDescriptorParser<ServletAdapter> parser = new DeploymentDescriptorParser<ServletAdapter>(classLoader, resourceLoader, container, adapterList); @@ -126,7 +127,6 @@ delegate = new WSServletDelegate(adapters, context); context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate); - } catch (Throwable e) { Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 22:06:59 UTC (rev 3046) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-11 04:31:34 UTC (rev 3047) @@ -130,7 +130,7 @@ <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.sunri.ModifyWebMetaDataDeployer"> <property name="listenerClass">org.jboss.ws.integration.jboss50.sunri.WSServletContextListener</property> - <property name="servletClass">com.sun.xml.ws.transport.http.servlet.WSServlet</property> + <property name="servletClass">org.jboss.ws.integration.jboss50.sunri.WSEndpointServlet</property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss50.common.UnifiedDeploymentInfoDeployer"/>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3046 - projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-10 18:06:59 -0400 (Thu, 10 May 2007) New Revision: 3046 Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/InvocationHandlerJSE.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java Log: Fisr JSE test passes Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/InvocationHandlerJSE.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/InvocationHandlerJSE.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/InvocationHandlerJSE.java 2007-05-10 22:06:59 UTC (rev 3046) @@ -0,0 +1,56 @@ +/* + * 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.sunri; + +// $Id$ + +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.invocation.InvocationContext; +import org.jboss.ws.integration.invocation.InvocationHandler; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerJSE implements InvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerJSE.class); + + private Endpoint endpoint; + + /** Initialize the service endpoint */ + public void init(Endpoint endpoint) + { + this.endpoint = endpoint; + } + + /** Invoke the the service endpoint */ + public void invoke(InvocationContext reqContext) throws Exception + { + throw new NotImplementedException(); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/InvocationHandlerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java 2007-05-10 22:06:59 UTC (rev 3046) @@ -0,0 +1,48 @@ +/* + * 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.sunri; + +//$Id$ + +import org.jboss.ws.integration.BasicLifecycleHandler; +import org.jboss.ws.integration.Endpoint; + +/** + * A lifecycle handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class LifecycleHandlerImpl extends BasicLifecycleHandler +{ + public void start(Endpoint ep) + { + super.start(ep); + log.info("WebService started: " + ep.getName()); + } + + public void stop(Endpoint ep) + { + super.stop(ep); + log.info("WebService stoped: " + ep.getName()); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java 2007-05-10 22:06:59 UTC (rev 3046) @@ -0,0 +1,57 @@ +/* + * 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.sunri; + +//$Id$ + +import java.io.InputStream; +import java.io.OutputStream; + +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.RequestHandler; +import org.jboss.ws.integration.invocation.InvocationContext; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + public void handleRequest(Endpoint endpoint, InputStream inputStream, OutputStream outputStream, InvocationContext context) + { + log.debug("handleRequest: " + endpoint.getName()); + throw new NotImplementedException(); + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outputStream, InvocationContext context) + { + log.debug("handleWSDLRequest: " + endpoint.getName()); + throw new NotImplementedException(); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java 2007-05-10 22:06:59 UTC (rev 3046) @@ -0,0 +1,67 @@ +/* + * 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.sunri; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Set; + +import javax.servlet.ServletContext; + +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.ResourceLoader; + +/** + * Parses {@code sun-jaxws.xml} and sets up + * {@link HttpAdapter}s for all deployed endpoints. + * + * <p> + * This code is the entry point at the server side. + * + * @author WS Development Team + */ +final class ServletResourceLoader implements ResourceLoader +{ + private final ServletContext context; + + public ServletResourceLoader(ServletContext context) + { + this.context = context; + } + + public URL getResource(String path) throws MalformedURLException + { + return context.getResource(path); + } + + public URL getCatalogFile() throws MalformedURLException + { + return getResource("/WEB-INF/jax-ws-catalog.xml"); + } + + public Set<String> getResourcePaths(String path) + { + return context.getResourcePaths(path); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java 2007-05-10 22:06:59 UTC (rev 3046) @@ -0,0 +1,180 @@ +/* + * 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.sunri; + +// $Id$ + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.xml.ws.WebServiceException; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.server.BoundEndpoint; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.Module; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; +import com.sun.xml.ws.transport.http.servlet.WSServlet; +import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; + +/** + * Parses {@code sun-jaxws.xml} and sets up + * {@link HttpAdapter}s for all deployed endpoints. + * + * <p> + * This code is the entry point at the server side. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class WSServletContextListener implements ServletContextAttributeListener, ServletContextListener +{ + public static final String SUN_JAXWS_URL = "sun-jaxws-url"; + + private WSServletDelegate delegate; + + public void attributeAdded(ServletContextAttributeEvent event) + { + } + + public void attributeRemoved(ServletContextAttributeEvent event) + { + } + + public void attributeReplaced(ServletContextAttributeEvent event) + { + } + + public void contextDestroyed(ServletContextEvent event) + { + if (delegate != null) + { // the deployment might have failed. + delegate.destroy(); + } + + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_DESTROY()); + } + } + + public void contextInitialized(ServletContextEvent event) + { + if (logger.isLoggable(Level.INFO)) + { + logger.info(WsservletMessages.LISTENER_INFO_INITIALIZE()); + } + ServletContext context = event.getServletContext(); + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) + { + classLoader = getClass().getClassLoader(); + } + + ServletContainer container = new ServletContainer(context); + try + { + ServletResourceLoader resourceLoader = new ServletResourceLoader(context); + ServletAdapterList adapterList = new ServletAdapterList(); + // Parse the descriptor file and build endpoint infos + DeploymentDescriptorParser<ServletAdapter> parser = new DeploymentDescriptorParser<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + + URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME); + if (sunJaxWsXml == null) + { + String urlStr = context.getInitParameter(SUN_JAXWS_URL); + if (urlStr != null && urlStr.length() > 0) + sunJaxWsXml = new URL(urlStr); + } + if (sunJaxWsXml == null) + throw new WebServiceException(WsservletMessages.NO_SUNJAXWS_XML(JAXWS_RI_RUNTIME)); + + List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream()); + + delegate = new WSServletDelegate(adapters, context); + + context.setAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO, delegate); + + } + catch (Throwable e) + { + logger.log(Level.SEVERE, WsservletMessages.LISTENER_PARSING_FAILED(e), e); + context.removeAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); + throw new WebServiceException("listener.parsingFailed", e); + } + } + + /** + * Provides access to {@link ServletContext} via {@link Container}. Pipes + * can get ServletContext from Container and use it to load some resources. + */ + private static class ServletContainer extends Container + { + private final ServletContext servletContext; + + private final Module module = new Module() + { + private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); + + public @NotNull + List<BoundEndpoint> getBoundEndpoints() + { + return endpoints; + } + }; + + ServletContainer(ServletContext servletContext) + { + this.servletContext = servletContext; + } + + public <T> T getSPI(Class<T> spiType) + { + if (spiType == ServletContext.class) + { + return (T)servletContext; + } + if (spiType == Module.class) + { + return spiType.cast(module); + } + return null; + } + } + + private static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml"; + + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3045 - in projects/wsintegration: jbws-jboss50/trunk and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-10 17:55:16 -0400 (Thu, 10 May 2007) New Revision: 3045 Added: projects/wsintegration/jbws-jboss50/trunk/ant-import/ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt projects/wsintegration/sunri-jboss50/trunk/ant-import/ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java Removed: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/ Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java projects/wsintegration/jbws-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/.classpath projects/wsintegration/sunri-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml projects/wsintegration/sunri-jboss50/trunk/version.properties Log: SunRI first JSE test passes Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.LifecycleHandler; import org.jboss.ws.integration.Service; /** @@ -38,7 +39,9 @@ public void create(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) - ep.getLifecycleHandler().create(ep); + { + getLifecycleHandler(ep, true).create(ep); + } } @Override @@ -46,7 +49,7 @@ { for (Endpoint ep : dep.getService().getEndpoints()) { - ep.getLifecycleHandler().start(ep); + getLifecycleHandler(ep, true).start(ep); } } @@ -58,7 +61,9 @@ { for (Endpoint ep : service.getEndpoints()) { - ep.getLifecycleHandler().stop(ep); + LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false); + if (lifecycleHandler != null) + lifecycleHandler.stop(ep); } } } @@ -71,8 +76,19 @@ { for (Endpoint ep : service.getEndpoints()) { - ep.getLifecycleHandler().destroy(ep); + LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false); + if (lifecycleHandler != null) + lifecycleHandler.destroy(ep); } } } + + private LifecycleHandler getLifecycleHandler(Endpoint ep, boolean assertHandler) + { + LifecycleHandler lifecycleHandler = ep.getLifecycleHandler(); + if (lifecycleHandler == null && assertHandler) + throw new IllegalStateException("LifecycleHandler not initialised"); + + return lifecycleHandler; + } } Copied: projects/wsintegration/jbws-jboss50/trunk/ant-import (from rev 3041, projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import) Deleted: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project name="JBossWS-Deploy"> - -  -  -  - -  - <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-resources"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-core"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-spi"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}/jbossws-core"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <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"/> - - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbossws-context.war" overwrite="true"/> - </target> - -</project> Copied: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml (from rev 3042, projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml) =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml (rev 0) +++ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project name="JBossWS-Deploy"> + +  +  +  + +  + <target name="deploy" depends="jboss50-jars,remove-jbossws,remove-jbosswsri" description="Deploy jbossws"> + + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-resources"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-spi"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <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"/> + <copy file="${jboss50.output.lib.dir}/jbossws50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + </target> + +  + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + </target> + +  + <target name="remove-jbosswsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + +</project> Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -13,9 +13,9 @@ <project default="main" basedir="." name="JBossWS-JBoss50"> - <import file="${basedir}/src/main/etc/ant-import/build-deploy.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/>   Modified: projects/wsintegration/sunri-jboss50/trunk/.classpath =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/.classpath 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/.classpath 2007-05-10 21:55:16 UTC (rev 3045) @@ -15,5 +15,20 @@ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> + <classpathentry kind="lib" path="thirdparty/http.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/> + <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> + <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> + <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Added: projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,6 @@ +# $Id:$ + +WSServletContextListener is final and loads sun-jaxws.xml from context classloader. +We need to provide sun-jaxws.xml dynamically. + +WSServletException is package protected \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project name="JBossWS-Deploy"> + +  +  +  + +  + <target name="deploy" depends="jboss50-jars,remove-jbossws" description="Deploy jbossws"> + + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer" src="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar" src="${jboss50.output.lib.dir}/jbosswsri50.sar"/> + <copy file="${jboss50.output.lib.dir}/jbosswsri50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + </target> + +  + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="release" name="JBossWS Release"> + +  + <target name="release" depends="jboss50-jars" + description="Release to jboss.local.repository"> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50.jar"/> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> + <include name="jbossws50-src.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jboss50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="thirdparty" name="JBossWS-Thirdparty"> + +  +  +  + + <target name="thirdparty" depends="prepare,jbossws-spi-get,thirdparty-get,thirdparty-classpath"> + </target> + +  + <target name="jbossws-spi-get" if="force.thirdparty.get" + description="Gets the jbossws-core libraries"> + <mkdir dir="${thirdparty.dir}/jbossws-spi"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + </target> + +  + <target name="thirdparty-get" if="force.thirdparty.get" + description="Gets the thirdparty libraries"> + + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + </target> + + <target name="thirdparty-classpath" > + +  + <path id="jboss50.integration.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> + <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-system.jar"/> + <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.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"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + </path> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -13,9 +13,9 @@ <project default="main" basedir="." name="JBossWS-SunRI-JBoss50"> - <import file="${basedir}/src/main/etc/ant-import/build-deploy.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/>   @@ -170,6 +170,7 @@ <include name="jsr173_api.jar"/> <include name="jsr181-api.jar"/> <include name="jsr250-api.jar"/> + <include name="resolver.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> <include name="sjsxp.jar"/> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -23,14 +23,14 @@ //$Id$ -import java.util.Iterator; - -import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.Listener; import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.Endpoint; +import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that modifies the web.xml meta data @@ -59,6 +59,20 @@ WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { + Listener listener = new Listener(); + listener.setListenerClass(listenerClass); + webMetaData.addListener(listener); + + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws == null) + throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); + + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(WSServletContextListener.SUN_JAXWS_URL); + ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + for (Servlet servlet : webMetaData.getServlets()) { String orgServletClass = servlet.getServletClass(); @@ -70,17 +84,24 @@ continue; } - // Nothing to do if we have an <init-param> - if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) + if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) { servlet.setServletClass(servletClass); - NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); - servlet.addInitParam(initParam); } } } } + @Override + public void destroy(Deployment dep) + { + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws != null) + { + ddSunJaxws.destroyFileURL(); + } + } + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) { boolean isServlet = false; @@ -102,16 +123,4 @@ } return isServlet; } - - private boolean isAlreadyModified(Servlet servlet) - { - Iterator itParams = servlet.getInitParams().iterator(); - while (itParams.hasNext()) - { - NameValuePair pair = (NameValuePair)itParams.next(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) - return true; - } - return false; - } } \ No newline at end of file Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -23,9 +23,19 @@ //$Id$ +import java.util.ArrayList; +import java.util.Iterator; + +import javax.jws.WebService; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoint; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that generates sun-jaxws.xml @@ -38,10 +48,72 @@ @Override public void create(Deployment dep) { + DDEndpoints dd = new DDEndpoints(); for (Endpoint ep : dep.getService().getEndpoints()) { - //ObjectName sepID = ObjectNameFactory; - //ep.setName(sepID); + String name = getName(ep); + String implementation = ep.getEndpointImpl().getName(); + String urlPattern = getUrlPattern(dep, ep); + + DDEndpoint ddep = new DDEndpoint(name, implementation, urlPattern); + log.info("Add " + ddep); + dd.addEndpoint(ddep); } + dep.getContext().addAttachment(DDEndpoints.class, dd); } + + private String getName(Endpoint ep) + { + String name = null; + Class impl = ep.getEndpointImpl(); + if (impl.isAnnotationPresent(WebService.class)) + { + WebService anWebService = (WebService)impl.getAnnotation(WebService.class); + if (anWebService.name().length() > 0) + name = anWebService.name(); + } + // Fall back + if (name == null) + { + name = impl.getName(); + name = name.substring(name.lastIndexOf(".") + 1); + } + + return name; + } + + private String getUrlPattern(Deployment dep, Endpoint ep) + { + String urlPattern = null; + String impl = ep.getEndpointImpl().getName(); + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String name = servlet.getName(); + String servletClass = servlet.getServletClass(); + if (impl.equals(servletClass)) + { + ServletMapping mapping = getServletMapping(webMetaData, name); + ArrayList<String> urlPatterns = mapping.getUrlPatterns(); + if (urlPatterns.size() > 0) + urlPattern = urlPatterns.get(0); + } + } + } + return urlPattern; + } + + private ServletMapping getServletMapping(WebMetaData webMetaData, String name) + { + Iterator it = webMetaData.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping mapping = (ServletMapping)it.next(); + if (name.equals(mapping.getName())) + return mapping; + } + throw new IllegalStateException("Cannot obtian mapping for: " + name); + } } \ No newline at end of file Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,192 @@ +/* + * 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.sunri.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; + +import javax.xml.namespace.QName; +import javax.xml.ws.soap.SOAPBinding; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDEndpoint +{ + // Name of the endpoint + private String name; + // Primary wsdl file location in the WAR file. + private String wsdl; + //QName of WSDL service. + private QName service; + //QName of WSDL port. + private QName port; + // Endpoint implementation class name. + private String implementation; + // Should match <url-pattern> in web.xml + private String urlPattern; + // Binding id defined in the JAX-WS API + private String binding; + // Enables MTOM optimization. + private boolean enableMTOM; + // Optional handler chain + private DDHandlerChain handlerChain; + + public DDEndpoint(String name, String impl, String urlPattern) + { + if (name == null || name.length() == 0) + throw new IllegalArgumentException("name cannot be null"); + if (impl == null || impl.length() == 0) + throw new IllegalArgumentException("implementation cannot be null"); + if (urlPattern == null || urlPattern.length() == 0) + throw new IllegalArgumentException("urlPattern cannot be null"); + + this.name = name; + this.implementation = impl; + this.urlPattern = urlPattern; + this.binding = SOAPBinding.SOAP11HTTP_BINDING; + } + + public String getName() + { + return name; + } + + public String getImplementation() + { + return implementation; + } + + public String getUrlPattern() + { + return urlPattern; + } + + public String getBinding() + { + return binding; + } + + public void setBinding(String binding) + { + if (!SOAPBinding.SOAP11HTTP_BINDING.equals(binding) && !SOAPBinding.SOAP12HTTP_BINDING.equals(binding)) + throw new IllegalArgumentException("Invalid binding: " + binding); + + this.binding = binding; + } + + public boolean isEnableMTOM() + { + return enableMTOM; + } + + public void setEnableMTOM(boolean enableMTOM) + { + this.enableMTOM = enableMTOM; + } + + public QName getPort() + { + return port; + } + + public void setPort(QName port) + { + this.port = port; + } + + public QName getService() + { + return service; + } + + public void setService(QName service) + { + this.service = service; + } + + public String getWsdl() + { + return wsdl; + } + + public void setWsdl(String wsdl) + { + this.wsdl = wsdl; + } + + public DDHandlerChain getHandlerChain() + { + return handlerChain; + } + + public void setHandlerChain(DDHandlerChain handlerChain) + { + this.handlerChain = handlerChain; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<endpoint"); + writer.write(" name='" + name + "'"); + writer.write(" implementation='" + implementation + "'"); + writer.write(" url-pattern='" + urlPattern + "'"); + if (service != null) + writer.write(" service='" + service + "'"); + if (port != null) + writer.write(" port='" + port + "'"); + if (wsdl != null) + writer.write(" wsdl='" + wsdl + "'"); + if (binding != null) + writer.write(" binding='" + binding + "'"); + writer.write(" enable-mtom='" + enableMTOM + "'"); + writer.write(">"); + + if (handlerChain != null) + handlerChain.writeTo(writer); + + writer.write("</endpoint>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Endpoint"); + str.append("\n name=" + name); + str.append("\n implementation=" + implementation); + str.append("\n url-pattern=" + urlPattern); + if (service != null) + str.append("\n service=" + service); + if (port != null) + str.append("\n port=" + port); + if (wsdl != null) + str.append("\n wsdl=" + wsdl); + if (binding != null) + str.append("\n binding=" + binding); + str.append("\n enable-mtom=" + enableMTOM); + return str.toString(); + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,100 @@ +/* + * 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.sunri.metadata.sunjaxws; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.management.ServerConfig; +import org.jboss.ws.integration.management.ServerConfigFactory; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDEndpoints +{ + private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); + private File tmpFile; + + public List<DDEndpoint> getEndpoints() + { + return endpoints; + } + + public void addEndpoint(DDEndpoint ep) + { + endpoints.add(ep); + } + + public URL createFileURL() + { + destroyFileURL(); + + ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); + try + { + tmpFile = File.createTempFile("jbossws-sun-jaxws", ".xml", tmpDir); + Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); + writeTo(writer); + writer.close(); + + return tmpFile.toURL(); + } + catch (IOException ex) + { + throw new WSDeploymentException(ex); + } + } + + public void destroyFileURL() + { + if (tmpFile != null) + { + tmpFile.delete(); + tmpFile = null; + } + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'>"); + for (DDEndpoint ep : endpoints) + { + ep.writeTo(writer); + } + writer.write("</endpoints>"); + } + +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -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.jboss50.sunri.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDHandler +{ + private String handlerName; + private String handlerClass; + + public DDHandler(String handlerName, String handlerClass) + { + this.handlerName = handlerName; + this.handlerClass = handlerClass; + } + + public String getHandlerName() + { + return handlerName; + } + + public String getHandlerClass() + { + return handlerClass; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<handler>"); + writer.write("<handler-name>" + handlerName + "</handler-name>"); + writer.write("<handler-class>" + handlerClass + "</handler-class>"); + writer.write("</handler>"); + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,74 @@ +/* + * 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.sunri.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDHandlerChain +{ + // Name of the endpoint + private String name; + + private List<DDHandler> handlers = new ArrayList<DDHandler>(); + + public DDHandlerChain(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public List<DDHandler> getEndpoints() + { + return handlers; + } + + public void addEndpoint(DDHandler handler) + { + handlers.add(handler); + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<handler-chain>"); + writer.write("<handler-chain-name>" + name + "</handler-chain-name>"); + for (DDHandler handler : handlers) + { + handler.writeTo(writer); + } + writer.write("</handler-chain>"); + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -89,8 +89,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSModifyWebMetaDataDeployer"/> <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> </list> </property> </bean> @@ -117,14 +117,11 @@ Each handles a single aspect of web service deployment --> <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <property name="requestHandler">org.jboss.ws.integration.jboss50.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.integration.jboss50.sunri.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss50.common.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.common.InvocationHandlerEJB3</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.jboss50.sunri.InvocationHandlerJSE</value></entry> </map> </property> </bean> @@ -132,7 +129,7 @@ <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.jboss50.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">com.sun.xml.ws.transport.http.servlet.WSServletContextListener</property> + <property name="listenerClass">org.jboss.ws.integration.jboss50.sunri.WSServletContextListener</property> <property name="servletClass">com.sun.xml.ws.transport.http.servlet.WSServlet</property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> Modified: projects/wsintegration/sunri-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 21:55:16 UTC (rev 3045) @@ -24,5 +24,5 @@ jboss-security-spi=2.0.0.Beta sun-jaxb=2.1.3 sun-jaxws=2.1.1 -sun-servlet=2.4 +sun-servlet=2.5

18 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007