[jbossws-commits] JBossWS SVN: r1975 - in trunk: integration-jboss42 and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-15 15:34:13 -0500 (Mon, 15 Jan 2007) New Revision: 1975 Modified: trunk/integration-jboss40/.classpath trunk/integration-jboss40/build.xml trunk/integration-jboss42/.classpath trunk/integration-jboss42/build.xml trunk/integration-jboss50/.classpath trunk/integration-jboss50/build.xml trunk/integration-tomcat/.classpath trunk/integration-tomcat/build.xml trunk/jbossws-core/.classpath trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java trunk/jbossws-tests/.classpath Log: Modified: trunk/integration-jboss40/.classpath =================================================================== --- trunk/integration-jboss40/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss40/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -17,7 +17,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -28,7 +27,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss40/build.xml 2007-01-15 20:34:13 UTC (rev 1975) @@ -282,6 +282,7 @@ <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -293,6 +294,7 @@ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> Modified: trunk/integration-jboss42/.classpath =================================================================== --- trunk/integration-jboss42/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss42/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -17,7 +17,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -26,12 +25,12 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/> <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss42/build.xml 2007-01-15 20:34:13 UTC (rev 1975) @@ -140,6 +140,7 @@ <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -147,6 +148,7 @@ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> Modified: trunk/integration-jboss50/.classpath =================================================================== --- trunk/integration-jboss50/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss50/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -18,7 +18,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -27,7 +26,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> @@ -36,5 +34,6 @@ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3.jar" sourcepath="/home/tdiesler/svn/jbossas/trunk/ejb3/src/main"/> <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3x.jar"/> <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-jboss50/build.xml 2007-01-15 20:34:13 UTC (rev 1975) @@ -146,6 +146,7 @@ <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> @@ -153,6 +154,7 @@ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> Modified: trunk/integration-tomcat/.classpath =================================================================== --- trunk/integration-tomcat/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-tomcat/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -27,7 +26,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/integration-tomcat/build.xml 2007-01-15 20:34:13 UTC (rev 1975) @@ -137,15 +137,30 @@ <!-- Deploy to Tomcat --> <target name="deploy-tomcat" depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat"> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mail.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/endorsed"> + <fileset dir="${thirdparty.dir}"> + <include name="serializer.jar"/> + <include name="xalan.jar"/> + <include name="xercesImpl.jar"/> + </fileset> + </copy> + <copy todir="${tomcat.common.dir}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${tomcat.output.lib.dir}"> + <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws-thirdparty.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> + <include name="log4j.jar"/> + <include name="mail.jar"/> + </fileset> + </copy> <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/> <delete dir="${tomcat.webapps.dir}/jbossws"/> </target> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/jbossws-core/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -15,7 +15,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-src.zip"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-1_5_2.zip"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -26,9 +25,10 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> + <classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java 2007-01-15 20:34:13 UTC (rev 1975) @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; +import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.spi.Provider; import javax.xml.ws.wsaddressing.W3CEndpointReference; @@ -97,7 +98,15 @@ **/ public static Endpoint create(Object implementor) { - return create(null, implementor); + if (implementor == null) + throw new IllegalArgumentException("Implementor cannot be null"); + + String bindingId = SOAPBinding.SOAP11HTTP_BINDING; + BindingType anBindingType = implementor.getClass().getAnnotation(BindingType.class); + if (anBindingType != null) + bindingId = anBindingType.value(); + + return create(bindingId, implementor); } /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-01-15 20:34:13 UTC (rev 1975) @@ -69,11 +69,13 @@ public EndpointImpl(String bindingId, Object implementor) { + log.debug("new EndpointImpl(bindingId=" + bindingId + ",implementor=" + implementor + ")"); + + if (implementor == null) + throw new IllegalArgumentException("Implementor cannot be null"); + this.implementor = implementor; this.bindingProvider = new BindingProviderImpl(bindingId); - - if (implementor == null) - throw new WebServiceException("Implementor cannot be null"); } @Override @@ -98,6 +100,8 @@ @Override public void publish(String address) { + log.debug("publish: " + address); + URI addrURI; try { @@ -133,6 +137,8 @@ @Override public void publish(Object context) { + log.debug("publish: " + context); + if (isDestroyed) throw new IllegalStateException("Endpoint already destroyed"); @@ -151,6 +157,8 @@ @Override public void stop() { + log.debug("stop"); + if (serverContext == null || isPublished == false) log.error("Endpoint not published"); Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-01-15 19:18:45 UTC (rev 1974) +++ trunk/jbossws-tests/.classpath 2007-01-15 20:34:13 UTC (rev 1975) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/main/java"/> + <classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/> <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> @@ -25,7 +25,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> @@ -36,10 +35,10 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> <classpathentry kind="output" path="output-eclipse"/> </classpath>