jbossws-commits May 2007

jbossws-commits@lists.jboss.org

1 participants
395 discussions

JBossWS SVN: r3167 - in trunk: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 38 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 16:59:35 -0400 (Mon, 21 May 2007) New Revision: 3167 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java trunk/testsuite/src/resources/jaxws/samples/ trunk/testsuite/src/resources/jaxws/samples/asynchronous/ trunk/testsuite/src/resources/jaxws/samples/context/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/ trunk/testsuite/src/resources/jaxws/samples/exception/ trunk/testsuite/src/resources/jaxws/samples/handlerchain/ trunk/testsuite/src/resources/jaxws/samples/httpbinding/ trunk/testsuite/src/resources/jaxws/samples/jsr181ejb/ trunk/testsuite/src/resources/jaxws/samples/jsr181pojo/ trunk/testsuite/src/resources/jaxws/samples/logicalhandler/ trunk/testsuite/src/resources/jaxws/samples/oneway/ trunk/testsuite/src/resources/jaxws/samples/provider/ trunk/testsuite/src/resources/jaxws/samples/retail/ trunk/testsuite/src/resources/jaxws/samples/soapbinding/ trunk/testsuite/src/resources/jaxws/samples/webmethod/ trunk/testsuite/src/resources/jaxws/samples/webparam/ trunk/testsuite/src/resources/jaxws/samples/webresult/ trunk/testsuite/src/resources/jaxws/samples/webservice/ trunk/testsuite/src/resources/jaxws/samples/webserviceref/ trunk/testsuite/src/resources/jaxws/samples/wsaddressing/ trunk/testsuite/src/resources/jaxws/samples/wseventing/ trunk/testsuite/src/resources/jaxws/samples/wssecurity/ trunk/testsuite/src/resources/jaxws/samples/xop/ Removed: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/ trunk/jbossws-core/src/test/resources/jaxws/samples/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/ trunk/testsuite/src/resources/jaxws/eardeployment/ trunk/testsuite/src/resources/jaxws/samples/asynchronous/ trunk/testsuite/src/resources/jaxws/samples/context/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/ trunk/testsuite/src/resources/jaxws/samples/exception/ trunk/testsuite/src/resources/jaxws/samples/handlerchain/ trunk/testsuite/src/resources/jaxws/samples/httpbinding/ trunk/testsuite/src/resources/jaxws/samples/jsr181ejb/ trunk/testsuite/src/resources/jaxws/samples/jsr181pojo/ trunk/testsuite/src/resources/jaxws/samples/logicalhandler/ trunk/testsuite/src/resources/jaxws/samples/oneway/ trunk/testsuite/src/resources/jaxws/samples/provider/ trunk/testsuite/src/resources/jaxws/samples/retail/ trunk/testsuite/src/resources/jaxws/samples/soapbinding/ trunk/testsuite/src/resources/jaxws/samples/webmethod/ trunk/testsuite/src/resources/jaxws/samples/webparam/ trunk/testsuite/src/resources/jaxws/samples/webresult/ trunk/testsuite/src/resources/jaxws/samples/webservice/ trunk/testsuite/src/resources/jaxws/samples/webserviceref/ trunk/testsuite/src/resources/jaxws/samples/wsaddressing/ trunk/testsuite/src/resources/jaxws/samples/wseventing/ trunk/testsuite/src/resources/jaxws/samples/wssecurity/ trunk/testsuite/src/resources/jaxws/samples/xop/ Modified: trunk/build/version.properties trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/src/test/resources/excludes-jboss50.txt trunk/integration/spi/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/integration/sunri/version.properties trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/src/test/resources/excludes-jboss50.txt trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java trunk/jbossws-core/version.properties trunk/testsuite/.classpath trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/ant-import/build-testsuite.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml Log: Migrate jaxws samples to testsuite Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/build/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -23,6 +23,7 @@ jboss-microcontainer=2.0.0.Beta3 junit=3.8.1 sun-jaf=1.1 +sun-jaxb=2.1.3 sun-jaxrpc=1.1 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -57,7 +57,7 @@ { for (String role : anRolesAllowed.value()) { - webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); + webApp.addElement("security-role").addElement("role-name").addText(role); } } } Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,36 +10,22 @@ <project> - <property name="tests.dir" value="${int.jbws.dir}/src/test"/> - <property name="tests.output.dir" value="${int.jbws.dir}/output-tests"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> -  - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> +  + <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition>  - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> - -  <target name="tests-init" depends="tests-prepare"> <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/> @@ -50,56 +36,30 @@  <path id="javac.classpath"> <path refid="jbossws.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path>  <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <path refid="javac.classpath"/> </path> </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.jbws.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/jbws/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/jbws/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jbws/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,12 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/context/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wssecurity/** Modified: trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -54,6 +54,9 @@ <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}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.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-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/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-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,81 @@ +/* + * 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.wsf.spi.handler; + +// $Id: $ + +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; + +/** + * A generic jaxws handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericHandler implements Handler +{ + private String handlerName; + + public String getHandlerName() + { + return handlerName; + } + + public void setHandlerName(String handlerName) + { + this.handlerName = handlerName; + } + + public boolean handleMessage(MessageContext msgContext) + { + Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + if (outbound == null) + throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); + } + + protected boolean handleOutbound(MessageContext msgContext) + { + return true; + } + + protected boolean handleInbound(MessageContext msgContext) + { + return true; + } + + public boolean handleFault(MessageContext messagecontext) + { + return true; + } + + public void close(MessageContext messageContext) + { + } + + public String toString() + { + return (handlerName != null ? handlerName : super.toString()); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.handler; + +// $Id$ + +import javax.xml.ws.handler.LogicalHandler; +import javax.xml.ws.handler.LogicalMessageContext; + +/** + * A generic jaxws logical handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler +{ +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,58 @@ +/* + * 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.wsf.spi.handler; + +// $Id: $ + +import java.util.HashSet; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.ws.handler.LogicalMessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; + + +/** + * A generic jaxws soap handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler +{ + // The header blocks that can be processed by this Handler instance + private Set<QName> headers = new HashSet<QName>(); + + /** Gets the header blocks that can be processed by this Handler instance. + */ + public Set<QName> getHeaders() + { + return headers; + } + + /** Sets the header blocks that can be processed by this Handler instance. + */ + public void setHeaders(Set<QName> headers) + { + this.headers = headers; + } +} Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,29 +10,16 @@ <project> - <property name="tests.dir" value="${int.sunri.dir}/src/test"/> - <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + +  + <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> - -  - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> -    @@ -63,53 +50,25 @@ <path id="javac.classpath"> <path refid="sunri.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path>  <path id="tests.client.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> </path> </target> -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.sunri.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,24 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,6 @@ jboss-jaxr=1.2.0.GA jboss-jbossws-spi=SNAPSHOT jboss-security-spi=2.0.0.Beta -sun-jaxb=2.1.3 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,29 +10,16 @@ <project> - <property name="tests.dir" value="${int.xfire.dir}/src/test"/> - <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + +  + <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> - -  - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> -    @@ -88,10 +75,15 @@  <path id="javac.classpath"> <path refid="xfire.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path>  @@ -108,34 +100,4 @@ </target> -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.xfire.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,24 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Deleted: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,472 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="build-samples-jaxws" description="Build the jaxws sample deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="wsse.*"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" - webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="wsdl/*"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> - </manifest> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - -  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> - </classes> - </war> - -  - - </target> - -</project> \ No newline at end of file Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -57,7 +57,6 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> @@ -241,7 +240,6 @@ <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id: $ - -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; - -/** - * A generic jaxws handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericHandler implements Handler -{ - private String handlerName; - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerName(String handlerName) - { - this.handlerName = handlerName; - } - - public boolean handleMessage(MessageContext msgContext) - { - Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (outbound == null) - throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); - } - - protected boolean handleOutbound(MessageContext msgContext) - { - return true; - } - - protected boolean handleInbound(MessageContext msgContext) - { - return true; - } - - public boolean handleFault(MessageContext messagecontext) - { - return true; - } - - public void close(MessageContext messageContext) - { - } - - public String toString() - { - return (handlerName != null ? handlerName : super.toString()); - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id$ - -import javax.xml.ws.handler.LogicalHandler; -import javax.xml.ws.handler.LogicalMessageContext; - -/** - * A generic jaxws logical handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler -{ -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id: $ - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; - -/** - * A generic jaxws soap handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler -{ - // The header blocks that can be processed by this Handler instance - private Set<QName> headers = new HashSet<QName>(); - - /** Gets the header blocks that can be processed by this Handler instance. - */ - public Set<QName> getHeaders() - { - return headers; - } - - /** Sets the header blocks that can be processed by this Handler instance. - */ - public void setHeaders(Set<QName> headers) - { - this.headers = headers; - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -49,6 +49,8 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.wsf.spi.handler.GenericHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -33,8 +33,8 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A client side handler that reads/writes the addressing properties Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -34,10 +34,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A server side handler that reads/writes the addressing properties Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -35,7 +35,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.integration.UnifiedVirtualFile; @@ -43,6 +42,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * An abstract JAXWS handler that delegates to the WSSecurityDispatcher Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws; - -// $Id$ - -import java.awt.Image; -import java.awt.Toolkit; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.xml.transform.stream.StreamSource; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @since 22-Sep-2006 - */ -public class XOPTestSupport -{ - - public static byte[] getBytesFromFile(File file) throws IOException - { - InputStream is = new FileInputStream(file); - - long length = file.length(); - byte[] bytes = new byte[(int)length]; - - int offset = 0; - int numRead = 0; - while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) - { - offset += numRead; - } - - is.close(); - return bytes; - } - - public static Image createTestImage(File imgFile) - { - Image image = null; - try - { - URL url = imgFile.toURL(); - - image = null; - try - { - image = Toolkit.getDefaultToolkit().createImage(url); - } - catch (Throwable th) - { - //log.warn("Cannot create Image: " + th); - } - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - - return image; - } - - public static StreamSource createTestSource() - { - return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); - } - - public static DataHandler createDataHandler(File imgFile) - { - try - { - URL url = imgFile.toURL(); - return new DataHandler(url); - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java (from rev 3165, trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.xop; + +// $Id$ + +import java.awt.Image; +import java.awt.Toolkit; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.xml.transform.stream.StreamSource; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @since 22-Sep-2006 + */ +public class XOPTestSupport +{ + + public static byte[] getBytesFromFile(File file) throws IOException + { + InputStream is = new FileInputStream(file); + + long length = file.length(); + byte[] bytes = new byte[(int)length]; + + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; + } + + is.close(); + return bytes; + } + + public static Image createTestImage(File imgFile) + { + Image image = null; + try + { + URL url = imgFile.toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler(File imgFile) + { + try + { + URL url = imgFile.toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } +} Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -29,7 +29,7 @@ import javax.xml.transform.Source; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -30,7 +30,7 @@ import javax.xml.transform.Source; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A client side handler Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; public class ProtocolHandler extends GenericSOAPHandler { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -21,9 +21,9 @@ */ package org.jboss.test.ws.jaxws.wsdd; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,6 @@ javassist=3.5.0.CR1 jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.1.3 stax-api=1.0 # Thirdparty library versions Modified: trunk/testsuite/.classpath =================================================================== --- trunk/testsuite/.classpath 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/.classpath 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,5 +10,8 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -20,20 +20,48 @@ <mkdir dir="${tests.output.dir}/libs"/> +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> + </fileset> + </jar> +  - <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -42,7 +70,7 @@ <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> @@ -51,11 +79,430 @@ <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar> +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> + <include name="jboss-wsse-server.xml"/> + <include name="wsse.*"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" + webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="wsdl/*"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + </manifest> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> + <include name="wsdl/jboss-web.xml"/> + <include name="wsdl/sysmon.wsdl"/> + <include name="wsdl/ws-eventing.wsdl"/> + <include name="wsdl/ws-eventing.xsd"/> + <include name="wsdl/ws-addr.xsd"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + +  + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> +  </target> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -5,36 +5,26 @@ <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <property name="excludesfile" value="${testsuite.dir}/src/resources/dummy-excludes.txt"/> +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition>  <target name="tests-init" depends="tests-prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> -  - <path id="javac.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <path refid="spi.thirdparty.classpath"/> - </path> - </target>    - <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> - - <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> @@ -49,7 +39,7 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${basedir}/src"/> + <copy-test-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples (from rev 3165, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment (from rev 3165, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -// Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/earejb3") -@Stateless -public class EJB3Bean -{ - private static Logger log = Logger.getLogger(EJB3Bean.class); - - @WebMethod - public String echo(String input) - { - log.info("echo: " + input); - return input; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +// Test that the wsdl can be read from the nested deployment +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(contextRoot = "/earejb3") +@Stateless +public class EJB3Bean +{ + private static Logger log = Logger.getLogger(EJB3Bean.class); + + @WebMethod + @WebResult(name = "return") + public String echo(@WebParam(name = "arg0") String input) + { + log.info("echo: " + input); + return input; + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import java.net.URL; - -import javax.xml.namespace.QName; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestHelper; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test ear deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-Dec-2006 - */ -public class EarTestCase extends JBossWSTest -{ - public static Test suite() - { - String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); - return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); - } - - public void testEJB3Endpoint() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testJSEEndpoint() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earjse/JSEBean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestHelper; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test ear deployment + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-Dec-2006 + */ +public class EarTestCase extends JBossWSTest +{ + public static Test suite() + { + String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); + return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); + } + + public void testEJB3Endpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testJSEEndpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; - -//Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class JSEBean -{ - private static Logger log = Logger.getLogger(JSEBean.class); - - @WebMethod - public String echo(String input) - { - log.info("echo: " + input); - return input; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +//Test that the wsdl can be read from the nested deployment +@WebService(name="TestEndpoint", serviceName="TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class JSEBean +{ + private static Logger log = Logger.getLogger(JSEBean.class); + + @WebMethod + @WebResult(name="return") + public String echo(@WebParam(name="arg0") String input) + { + log.info("echo: " + input); + return input; + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,34 +0,0 @@ - -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,34 @@ + +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 + * Generated source version: 2.1 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,67 +0,0 @@ - -package org.jboss.test.ws.jaxws.eardeployment; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; - - static { - URL url = null; - try { - url = new URL("file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - TESTENDPOINTSERVICE_WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService")); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class); - } - - /** - * - * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class, features); - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,66 @@ + +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 + * Generated source version: 2.1 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService")); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class); + } + + /** + * TDI: commented out because WebServiceFeature is not part of xfire-jsr181-api (xfire-1.2.6) + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns TestEndpoint + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { + return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class, features); + } + */ +} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/exception) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding) Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -39,8 +39,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; @@ -64,9 +62,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-payload?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181pojo) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler) Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; -import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.handler.GenericLogicalHandler; public class LogicalJAXBHandler extends GenericLogicalHandler { Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webparam) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webresult) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity) Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,40 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * JBossWS Generated Source + * + * Generation Date: Mon May 21 19:38:54 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Hello { + + + /** + * + * @param user + * @return + * returns org.jboss.test.ws.jaxws.samples.wssecurity.UserType + */ + @WebMethod + @WebResult(partName = "return") + public UserType echoUserType( + @WebParam(name = "user", partName = "user") + UserType user); + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,59 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * JBossWS Generated Source + * + * Generation Date: Mon May 21 19:38:54 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebServiceClient(name = "HelloService", targetNamespace = "http://org.jboss.ws/samples/wssecurity", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl") +public class HelloService + extends Service +{ + + private final static URL HELLOSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + HELLOSERVICE_WSDL_LOCATION = url; + } + + public HelloService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public HelloService() { + super(HELLOSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/wssecurity", "HelloService")); + } + + /** + * + * @return + * returns Hello + */ + @WebEndpoint(name = "HelloPort") + public Hello getHelloPort() { + return (Hello)super.getPort(new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort"), Hello.class); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for UserType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="UserType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="msg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "UserType", propOrder = { + "msg" +}) +public class UserType { + + protected String msg; + + /** + * Gets the value of the msg property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMsg() { + return msg; + } + + /** + * Sets the value of the msg property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMsg(String value) { + this.msg = value; + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/xop) Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.xop; + +// $Id$ + +import java.awt.Image; +import java.awt.Toolkit; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.xml.transform.stream.StreamSource; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @since 22-Sep-2006 + */ +public class XOPTestSupport +{ + + public static byte[] getBytesFromFile(File file) throws IOException + { + InputStream is = new FileInputStream(file); + + long length = file.length(); + byte[] bytes = new byte[(int)length]; + + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; + } + + is.close(); + return bytes; + } + + public static Image createTestImage(File imgFile) + { + Image image = null; + try + { + URL url = imgFile.toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler(File imgFile) + { + try + { + URL url = imgFile.toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -31,7 +31,7 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxws.samples.xop.XOPTestSupport; /** * User: hbraun Copied: trunk/testsuite/src/resources/jaxws/samples (from rev 3165, trunk/jbossws-core/src/test/resources/jaxws/samples) Copied: trunk/testsuite/src/resources/jaxws/samples/asynchronous (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/asynchronous) Copied: trunk/testsuite/src/resources/jaxws/samples/context (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/context) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment (from rev 3165, trunk/testsuite/src/resources/jaxws/eardeployment) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF (from rev 3166, trunk/testsuite/src/resources/jaxws/eardeployment/META-INF) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF (from rev 3166, trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF) Modified: trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.eardeployment.JSEBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean</servlet-class> </servlet> <servlet-mapping> Copied: trunk/testsuite/src/resources/jaxws/samples/exception (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/exception) Copied: trunk/testsuite/src/resources/jaxws/samples/handlerchain (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/handlerchain) Copied: trunk/testsuite/src/resources/jaxws/samples/httpbinding (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/httpbinding) Copied: trunk/testsuite/src/resources/jaxws/samples/jsr181ejb (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/jsr181ejb) Copied: trunk/testsuite/src/resources/jaxws/samples/jsr181pojo (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/jsr181pojo) Copied: trunk/testsuite/src/resources/jaxws/samples/logicalhandler (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/logicalhandler) Copied: trunk/testsuite/src/resources/jaxws/samples/oneway (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/oneway) Copied: trunk/testsuite/src/resources/jaxws/samples/provider (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/provider) Copied: trunk/testsuite/src/resources/jaxws/samples/retail (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/retail) Copied: trunk/testsuite/src/resources/jaxws/samples/soapbinding (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/soapbinding) Copied: trunk/testsuite/src/resources/jaxws/samples/webmethod (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webmethod) Copied: trunk/testsuite/src/resources/jaxws/samples/webparam (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webparam) Copied: trunk/testsuite/src/resources/jaxws/samples/webresult (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webresult) Copied: trunk/testsuite/src/resources/jaxws/samples/webservice (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webservice) Copied: trunk/testsuite/src/resources/jaxws/samples/webserviceref (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webserviceref) Copied: trunk/testsuite/src/resources/jaxws/samples/wsaddressing (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wsaddressing) Copied: trunk/testsuite/src/resources/jaxws/samples/wseventing (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wseventing) Copied: trunk/testsuite/src/resources/jaxws/samples/wssecurity (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity) Copied: trunk/testsuite/src/resources/jaxws/samples/xop (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/xop)

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3166 - in trunk: integration and 34 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 13:48:34 -0400 (Mon, 21 May 2007) New Revision: 3166 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java trunk/integration/xfire/ trunk/integration/xfire/.classpath trunk/integration/xfire/IntegrationIssues.txt trunk/integration/xfire/ant-import/ trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-release.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/ trunk/integration/xfire/src/main/ trunk/integration/xfire/src/main/etc/ trunk/integration/xfire/src/main/etc/component-info.xml trunk/integration/xfire/src/main/java/ trunk/integration/xfire/src/main/java/org/ trunk/integration/xfire/src/main/java/org/jboss/ trunk/integration/xfire/src/main/java/org/jboss/wsf/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java trunk/integration/xfire/src/main/resources/ trunk/integration/xfire/src/main/resources/jbossws-context.war/ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/integration/xfire/src/test/ trunk/integration/xfire/src/test/java/ trunk/integration/xfire/src/test/resources/ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt trunk/integration/xfire/src/test/resources/excludes-jboss50.txt trunk/integration/xfire/version.properties Removed: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java trunk/integration/xfire/.classpath trunk/integration/xfire/IntegrationIssues.txt trunk/integration/xfire/ant-import/ trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-release.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/ trunk/integration/xfire/src/main/ trunk/integration/xfire/src/main/etc/ trunk/integration/xfire/src/main/etc/component-info.xml trunk/integration/xfire/src/main/java/ trunk/integration/xfire/src/main/java/org/ trunk/integration/xfire/src/main/java/org/jboss/ trunk/integration/xfire/src/main/java/org/jboss/wsf/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java trunk/integration/xfire/src/main/resources/ trunk/integration/xfire/src/main/resources/jbossws-context.war/ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/integration/xfire/src/test/ trunk/integration/xfire/src/test/java/ trunk/integration/xfire/src/test/resources/ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt trunk/integration/xfire/src/test/resources/excludes-jboss50.txt trunk/integration/xfire/version.properties Modified: trunk/build/ant-import/build-setup.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl Log: Add support for XFire Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/build/ant-import/build-setup.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -25,6 +25,7 @@ <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> <property name="int.jbws.dir" value="${basedir}/integration/jbws"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> + <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -26,6 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -53,8 +54,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); Service service = dep.getService(); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -29,6 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -59,8 +60,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); Service service = dep.getService(); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -30,6 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -54,8 +55,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); Service service = dep.getService(); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -34,6 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -58,8 +59,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -53,8 +53,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -64,6 +64,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <delete> <fileset dir="${jboss50.home}/client"> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.spi.deployment; +import org.jboss.ws.integration.UnifiedVirtualFile; + //$Id$ @@ -36,6 +38,8 @@ { // The context for this deployment dep private DeploymentContext context; + // The root file for this deployment + private UnifiedVirtualFile rootFile; // A deployment has one service private Service service; // The type of this deployment @@ -62,6 +66,16 @@ this.context = context; } + public UnifiedVirtualFile getRootFile() + { + return rootFile; + } + + public void setRootFile(UnifiedVirtualFile rootFile) + { + this.rootFile = rootFile; + } + public void setClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -21,7 +21,9 @@ */ package org.jboss.wsf.spi.deployment; +import org.jboss.ws.integration.UnifiedVirtualFile; + // $Id$ @@ -45,6 +47,12 @@ UNDEFINED, CREATED, STARTED, STOPED, DESTROYED }; + /** Get the root file for this deployment */ + UnifiedVirtualFile getRootFile(); + + /** Set the root file for this deployment */ + void setRootFile(UnifiedVirtualFile root); + /** Get the class loader for this deployment */ ClassLoader getClassLoader(); Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java (from rev 3165, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,51 @@ +/* + * 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.wsf.spi.deployment; + +// $Id$ + + +/** + * Associates the endpoint meta data with the current thead. + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public final class EndpointAssociation +{ + private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); + + public static void setEndpoint(Endpoint ep) + { + endpoint.set(ep); + } + + public static Endpoint getEndpoint() + { + return endpoint.get(); + } + + public static void removeEndpoint() + { + endpoint.remove(); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java (from rev 3165, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,106 @@ +/* + * 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.wsf.spi.invocation; + +// $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.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * The JAX-WS dispatcher servlet. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class EndpointServlet 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); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** 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); + } + } +} Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -21,6 +21,7 @@ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/build.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -153,7 +153,7 @@ </metainf> </jar> -  +  <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> @@ -166,7 +166,7 @@ </fileset> </zip> -  +  <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" > <fileset dir="${sunri.java.dir}"/> </zip> Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.sunri; - -// $Id$ - -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * Associates the endpoint meta data with the current thead. - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public final class EndpointAssociation -{ - private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); - - public static void setEndpoint(Endpoint ep) - { - endpoint.set(ep); - } - - public static Endpoint getEndpoint() - { - return endpoint.get(); - } - - public static void removeEndpoint() - { - endpoint.remove(); - } -} Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -30,6 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.EndpointInvocation; import org.jboss.wsf.spi.invocation.InvocationHandler; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -30,6 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.EndpointInvocation; import org.jboss.wsf.spi.invocation.InvocationHandler; Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.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.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * The JAX-WS dispatcher servlet. - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSEndpointServletJBWS 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); - } - - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** 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); - } - } -} Modified: trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -157,7 +157,7 @@ <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl"> <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> - <property name="servletClass">org.jboss.wsf.stack.sunri.WSEndpointServletJBWS</property> + <property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property> </bean> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> Copied: trunk/integration/xfire (from rev 3165, branches/tdiesler/trunk/integration/xfire) Property changes on: trunk/integration/xfire ___________________________________________________________________ Name: svn:ignore + thirdparty output* version.properties.md5 Deleted: trunk/integration/xfire/.classpath =================================================================== --- branches/tdiesler/trunk/integration/xfire/.classpath 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/.classpath 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <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/servlet-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> - <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="thirdparty/xfire-all.jar" sourcepath="thirdparty/xfire-distribution-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/> - <classpathentry kind="output" path="output-eclipse"/> -</classpath> Copied: trunk/integration/xfire/.classpath (from rev 3165, branches/tdiesler/trunk/integration/xfire/.classpath) =================================================================== --- trunk/integration/xfire/.classpath (rev 0) +++ trunk/integration/xfire/.classpath 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <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/servlet-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> + <classpathentry kind="lib" path="thirdparty/xfire-all.jar" sourcepath="thirdparty/xfire-distribution-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Deleted: trunk/integration/xfire/IntegrationIssues.txt =================================================================== --- branches/tdiesler/trunk/integration/xfire/IntegrationIssues.txt 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/IntegrationIssues.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,11 +0,0 @@ -# $Id$ - -* WSServletContextListener is final and loads sun-jaxws.xml from context classloader. -We need to provide sun-jaxws.xml dynamically. - -* WSServletException is package protected - -* WSServlet is final - -* WSServletDelegate is final - Copied: trunk/integration/xfire/IntegrationIssues.txt (from rev 3165, branches/tdiesler/trunk/integration/xfire/IntegrationIssues.txt) =================================================================== --- trunk/integration/xfire/IntegrationIssues.txt (rev 0) +++ trunk/integration/xfire/IntegrationIssues.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,11 @@ +# $Id$ + +* WSServletContextListener is final and loads sun-jaxws.xml from context classloader. +We need to provide sun-jaxws.xml dynamically. + +* WSServletException is package protected + +* WSServlet is final + +* WSServletDelegate is final + Copied: trunk/integration/xfire/ant-import (from rev 3165, branches/tdiesler/trunk/integration/xfire/ant-import) Deleted: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> - - <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - - <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> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.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="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="${xfire.output.lib.dir}/jbossws-xfire50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${xfire.output.lib.dir}/jbossws-context.war" overwrite="true"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - </target> - -</project> Copied: trunk/integration/xfire/ant-import/build-deploy.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml) =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> + + <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + + <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> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.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="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="${xfire.output.lib.dir}/jbossws-xfire50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${xfire.output.lib.dir}/jbossws-context.war" overwrite="true"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + </target> + +</project> Deleted: trunk/integration/xfire/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-release.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/ant-import/build-release.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jars" - description="Release to jboss.local.repository"> - - - </target> - -</project> Copied: trunk/integration/xfire/ant-import/build-release.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/ant-import/build-release.xml) =================================================================== --- trunk/integration/xfire/ant-import/build-release.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-release.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <target name="release" depends="jars" + description="Release to jboss.local.repository"> + + + </target> + +</project> Deleted: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <property name="tests.dir" value="${int.xfire.dir}/src/test"/> - <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> - -  - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> - -  -  -  - -  - <target name="tests-init" depends="tests-prepare,thirdparty"> - -  - - <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-xml-binding.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - </path> - - <path id="sunri.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - </path> - - <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jdom.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - -  - <path id="javac.classpath"> - <path refid="xfire.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - </path> - -  - <path id="tests.client.classpath"> - <path refid="sunri.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.xfire.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - -</project> Copied: trunk/integration/xfire/ant-import/build-testsuite.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml) =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property name="tests.dir" value="${int.xfire.dir}/src/test"/> + <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> + + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  + <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> + <target name="tests-prepare-jboss50"> + <property name="jboss.home" value="${jboss50.home}"/> + <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"/> + </target> + +  + <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> + <target name="tests-prepare-jboss42"> + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"/> + </target> + +  +  +  + +  + <target name="tests-init" depends="tests-prepare,thirdparty"> + +  + + <path id="jbossws.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-xml-binding.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + </path> + + <path id="sunri.classpath"> + <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> + </path> + + <path id="xfire.classpath"> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jdom.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> + </path> + +  + <path id="javac.classpath"> + <path refid="xfire.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + </path> + +  + <path id="tests.client.classpath"> + <path refid="sunri.classpath"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${int.xfire.dir}/src/test"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + +</project> Deleted: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <property file="${int.xfire.dir}/version.properties"/> - -  -  -  - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${int.xfire.dir}/thirdparty"/> - <checksum file="${int.xfire.dir}/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> - -  - <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty.get" - description="Gets the thirdparty libraries"> - - <mkdir dir="${thirdparty.dir}"/> - <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}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" 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}/xfire/${xfire}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/jdom.jar" dest="${thirdparty.dir}/jdom.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/spring.jar" dest="${thirdparty.dir}/spring.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xbean.jar" dest="${thirdparty.dir}/xbean.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xbean-spring.jar" dest="${thirdparty.dir}/xbean-spring.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> - - <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> - </target> - - <target name="thirdparty-classpath" depends="thirdparty-init"> - -  - <path id="xfire50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-microcontainer.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.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.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}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - - </target> - -</project> Copied: trunk/integration/xfire/ant-import/build-thirdparty.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml) =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <property file="${int.xfire.dir}/version.properties"/> + +  +  +  + + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + </target> + + <target name="thirdparty-init" depends="prepare"> + <property name="thirdparty.dir" value="${int.xfire.dir}/thirdparty"/> + <checksum file="${int.xfire.dir}/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> + +  + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty.get" + description="Gets the thirdparty libraries"> + + <mkdir dir="${thirdparty.dir}"/> + <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}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" 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}/xfire/${xfire}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/jdom.jar" dest="${thirdparty.dir}/jdom.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/spring.jar" dest="${thirdparty.dir}/spring.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xbean.jar" dest="${thirdparty.dir}/xbean.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xbean-spring.jar" dest="${thirdparty.dir}/xbean-spring.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> + </target> + + <target name="thirdparty-classpath" depends="thirdparty-init"> + +  + <path id="xfire50.integration.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss50.lib}/dom4j.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> + <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> + <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-microcontainer.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.lib}/jboss-xml-binding.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-security-spi.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}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> + </path> + + </target> + +</project> Deleted: trunk/integration/xfire/build.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/build.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/build.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50"> - - <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${int.xfire.dir}/ant-import/build-deploy.xml"/> - <import file="${int.xfire.dir}/ant-import/build-release.xml"/> - <import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/> - <import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/> - -  -  -  - - <property name="xfire.dir" value="${int.xfire.dir}"/> - <property name="xfire.src.dir" value="${xfire.dir}/src/main"/> - <property name="xfire.etc.dir" value="${xfire.src.dir}/etc"/> - <property name="xfire.java.dir" value="${xfire.src.dir}/java"/> - <property name="xfire.resources.dir" value="${xfire.src.dir}/resources"/> - <property name="xfire.output.dir" value="${xfire.dir}/output"/> - <property name="xfire.output.classes.dir" value="${xfire.output.dir}/classes"/> - <property name="xfire.output.etc.dir" value="${xfire.output.dir}/etc"/> - <property name="xfire.output.lib.dir" value="${xfire.output.dir}/lib"/> - -  -  -  - - <target name="init" depends="prepare,thirdparty"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> - </target> - -  -  -  - -  - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - -  - <target name="compile-classes" depends="init"> - <mkdir dir="${xfire.output.classes.dir}"/> - <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/xfire/**"/> - <classpath refid="xfire50.integration.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${xfire.output.etc.dir}"/> - <copy todir="${xfire.output.etc.dir}" filtering="yes"> - <fileset dir="${xfire.etc.dir}"> - <include name="component-info.xml"/> - </fileset> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-xfire-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${int.xfire.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> - </target> - -  - <target name="jars-jboss50" depends="compile"> - -  - <mkdir dir="${xfire.output.lib.dir}"/> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.jar" manifest="${xfire.output.etc.dir}/default.mf"> - <fileset dir="${xfire.output.classes.dir}"> - <include name="org/jboss/wsf/stack/xfire/**"/> - </fileset> - </jar> - -  - <war warfile="${xfire.output.lib.dir}/jbossws-context.war" webxml="${xfire.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${xfire.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${xfire.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> -  - <fileset dir="${spi.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxws-api.jar"/> - <include name="jdom.jar"/> - <include name="wsdl4j.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="spring.jar"/> - <include name="xbean.jar"/> - <include name="xbean-spring.jar"/> - <include name="xfire-all.jar"/> - <include name="xfire-jsr181-api.jar"/> - </fileset> - <metainf dir="${xfire.resources.dir}/jbossws-jboss50.sar/META-INF"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${xfire.output.lib.dir}"> - <include name="jbossws-xfire50.jar"/> - </fileset> - <fileset dir="${xfire.resources.dir}/jbossws-jboss50.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> - -  - <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > - <fileset dir="${xfire.java.dir}"/> - </zip> - - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${xfire.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.xfire.dir}/output-tests"/> - <delete dir="${int.xfire.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="most,tests-main"> - </target> - -</project> Copied: trunk/integration/xfire/build.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/build.xml) =================================================================== --- trunk/integration/xfire/build.xml (rev 0) +++ trunk/integration/xfire/build.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50"> + + <import file="${basedir}/build/ant-import/build-setup.xml"/> + + <import file="${int.xfire.dir}/ant-import/build-deploy.xml"/> + <import file="${int.xfire.dir}/ant-import/build-release.xml"/> + <import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/> + +  +  +  + + <property name="xfire.dir" value="${int.xfire.dir}"/> + <property name="xfire.src.dir" value="${xfire.dir}/src/main"/> + <property name="xfire.etc.dir" value="${xfire.src.dir}/etc"/> + <property name="xfire.java.dir" value="${xfire.src.dir}/java"/> + <property name="xfire.resources.dir" value="${xfire.src.dir}/resources"/> + <property name="xfire.output.dir" value="${xfire.dir}/output"/> + <property name="xfire.output.classes.dir" value="${xfire.output.dir}/classes"/> + <property name="xfire.output.etc.dir" value="${xfire.output.dir}/etc"/> + <property name="xfire.output.lib.dir" value="${xfire.output.dir}/lib"/> + +  +  +  + + <target name="init" depends="prepare,thirdparty"> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> + </target> + +  +  +  + +  + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + +  + <target name="compile-classes" depends="init"> + <mkdir dir="${xfire.output.classes.dir}"/> + <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/xfire/**"/> + <classpath refid="xfire50.integration.classpath"/> + </javac> + </target> + +  + <target name="compile-etc" depends="init"> + <mkdir dir="${xfire.output.etc.dir}"/> + <copy todir="${xfire.output.etc.dir}" filtering="yes"> + <fileset dir="${xfire.etc.dir}"> + <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-xfire-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${int.xfire.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> + </target> + +  + <target name="jars-jboss50" depends="compile"> + +  + <mkdir dir="${xfire.output.lib.dir}"/> + <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.jar" manifest="${xfire.output.etc.dir}/default.mf"> + <fileset dir="${xfire.output.classes.dir}"> + <include name="org/jboss/wsf/stack/xfire/**"/> + </fileset> + </jar> + +  + <war warfile="${xfire.output.lib.dir}/jbossws-context.war" webxml="${xfire.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${xfire.resources.dir}/jbossws-context.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${xfire.resources.dir}/jbossws-context.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> +  + <fileset dir="${spi.dir}/thirdparty"> + <include name="jaxrpc-api.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxws-api.jar"/> + <include name="jdom.jar"/> + <include name="wsdl4j.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="spring.jar"/> + <include name="xbean.jar"/> + <include name="xbean-spring.jar"/> + <include name="xfire-all.jar"/> + <include name="xfire-jsr181-api.jar"/> + </fileset> + <metainf dir="${xfire.resources.dir}/jbossws-jboss50.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${xfire.output.lib.dir}"> + <include name="jbossws-xfire50.jar"/> + </fileset> + <fileset dir="${xfire.resources.dir}/jbossws-jboss50.deployer"> + <include name="META-INF/jbossws-deployer-beans.xml"/> + </fileset> + </zip> + +  + <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > + <fileset dir="${xfire.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${xfire.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${int.xfire.dir}/output-tests"/> + <delete dir="${int.xfire.dir}/thirdparty"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="most,tests-main"> + </target> + +</project> Copied: trunk/integration/xfire/src (from rev 3165, branches/tdiesler/trunk/integration/xfire/src) Copied: trunk/integration/xfire/src/main (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main) Copied: trunk/integration/xfire/src/main/etc (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/etc) Deleted: trunk/integration/xfire/src/main/etc/component-info.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/etc/component-info.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/etc/component-info.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-xfire50"> - - <component id="jboss/jbossws-xfire50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbosswsri50.jar"/> - <artifact id="jbosswsri50.sar"/> - <artifact id="jbosswsri50-deployer.zip"/> - <artifact id="jbosswsri50-src.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> - </import> - <import componentref="sun-jaxws"> - <compatible version="@sun-jaxws@"/> - </import> - - <export> - </export> - - </component> - -</project> Copied: trunk/integration/xfire/src/main/etc/component-info.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/etc/component-info.xml) =================================================================== --- trunk/integration/xfire/src/main/etc/component-info.xml (rev 0) +++ trunk/integration/xfire/src/main/etc/component-info.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-xfire50"> + + <component id="jboss/jbossws-xfire50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbosswsri50.jar"/> + <artifact id="jbosswsri50.sar"/> + <artifact id="jbosswsri50-deployer.zip"/> + <artifact id="jbosswsri50-src.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jboss-jbossws-spi@"/> + </import> + <import componentref="sun-jaxws"> + <compatible version="@sun-jaxws@"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/integration/xfire/src/main/java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java) Copied: trunk/integration/xfire/src/main/java/org (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org) Copied: trunk/integration/xfire/src/main/java/org/jboss (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss) Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf) Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack) Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire) Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.codehaus.xfire.MessageContext; -import org.codehaus.xfire.fault.XFireFault; -import org.codehaus.xfire.service.invoker.Invoker; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.EndpointInvocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -/** - * An XFire invoker for EJB3 - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class InvokerEJB3 implements Invoker -{ - public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault - { - Endpoint ep = EndpointAssociation.getEndpoint(); - InvocationHandler invHandler = ep.getInvocationHandler(); - - EndpointInvocation inv = invHandler.createInvocation(); - inv.getInvocationContext().addAttachment(MessageContext.class, context); - inv.setJavaMethod(m); - inv.setArgs(params); - - Object retObj = null; - try - { - invHandler.invoke(ep, null, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } - - return retObj; - } - - private void handleException(Exception ex) throws XFireFault - { - if (ex instanceof InvocationTargetException) - throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); - - throw XFireFault.createFault(ex); - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,76 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.codehaus.xfire.MessageContext; +import org.codehaus.xfire.fault.XFireFault; +import org.codehaus.xfire.service.invoker.Invoker; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * An XFire invoker for EJB3 + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerEJB3 implements Invoker +{ + public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + EndpointInvocation inv = invHandler.createInvocation(); + inv.getInvocationContext().addAttachment(MessageContext.class, context); + inv.setJavaMethod(m); + inv.setArgs(params); + + Object retObj = null; + try + { + invHandler.invoke(ep, null, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws XFireFault + { + if (ex instanceof InvocationTargetException) + throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + + throw XFireFault.createFault(ex); + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.codehaus.xfire.MessageContext; -import org.codehaus.xfire.fault.XFireFault; -import org.codehaus.xfire.service.invoker.Invoker; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.EndpointInvocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -/** - * An XFire invoker for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class InvokerJSE implements Invoker -{ - public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault - { - Endpoint ep = EndpointAssociation.getEndpoint(); - InvocationHandler invHandler = ep.getInvocationHandler(); - - EndpointInvocation inv = invHandler.createInvocation(); - inv.getInvocationContext().addAttachment(MessageContext.class, context); - inv.setJavaMethod(m); - inv.setArgs(params); - - Object retObj = null; - try - { - Object targetBean = getTargetBean(ep); - invHandler.invoke(ep, targetBean, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } - - return retObj; - } - - private Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException - { - Class beanClass = ep.getTargetBeanClass(); - return beanClass.newInstance(); - } - - private void handleException(Exception ex) throws XFireFault - { - if (ex instanceof InvocationTargetException) - throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); - - throw XFireFault.createFault(ex); - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.xfire; + +//$Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.codehaus.xfire.MessageContext; +import org.codehaus.xfire.fault.XFireFault; +import org.codehaus.xfire.service.invoker.Invoker; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * An XFire invoker for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerJSE implements Invoker +{ + public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + EndpointInvocation inv = invHandler.createInvocation(); + inv.getInvocationContext().addAttachment(MessageContext.class, context); + inv.setJavaMethod(m); + inv.setArgs(params); + + Object retObj = null; + try + { + Object targetBean = getTargetBean(ep); + invHandler.invoke(ep, targetBean, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException + { + Class beanClass = ep.getTargetBeanClass(); + return beanClass.newInstance(); + } + + private void handleException(Exception ex) throws XFireFault + { + if (ex instanceof InvocationTargetException) + throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + + throw XFireFault.createFault(ex); + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import org.jboss.wsf.spi.deployment.BasicLifecycleHandler; -import org.jboss.wsf.spi.deployment.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()); - } -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -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.wsf.stack.xfire; + +//$Id$ + +import org.jboss.wsf.spi.deployment.BasicLifecycleHandler; +import org.jboss.wsf.spi.deployment.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()); + } +} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.management.BasicEndpointRegistry; - -/** - * A Service Endpoint Registry - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-May-2007 - */ -public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean -{ - // provide logging - private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); - - public String getImplementationTitle() - { - return getClass().getPackage().getImplementationTitle(); - } - - public String getImplementationVersion() - { - return getClass().getPackage().getImplementationVersion(); - } - - public void create() throws Exception - { - log.info(getImplementationTitle()); - log.info(getImplementationVersion()); - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.registerMBean(this, OBJECT_NAME); - } - } - - public void destroy() throws Exception - { - log.debug("Destroy service endpoint manager"); - MBeanServer server = getMBeanServer(); - if (server != null) - { - server.unregisterMBean(OBJECT_NAME); - } - } - - private MBeanServer getMBeanServer() - { - MBeanServer server = null; - ArrayList servers = MBeanServerFactory.findMBeanServer(null); - if (servers.size() > 0) - { - server = (MBeanServer)servers.get(0); - } - return server; - } -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,86 @@ +/* + * 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.wsf.stack.xfire; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.management.BasicEndpointRegistry; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); + + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + public String getImplementationVersion() + { + return getClass().getPackage().getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + log.debug("Destroy service endpoint manager"); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -import org.jboss.wsf.spi.management.EndpointRegistry; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedEndpointRegistryMBean extends EndpointRegistry -{ - String getImplementationTitle(); - - String getImplementationVersion(); -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistryMBean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,35 @@ +/* + * 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.wsf.stack.xfire; + +import org.jboss.wsf.spi.management.EndpointRegistry; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedEndpointRegistryMBean extends EndpointRegistry +{ + String getImplementationTitle(); + + String getImplementationVersion(); +} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.ParamValue; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mai-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - @Override - public void create(Deployment dep) - { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans == null) - throw new IllegalStateException("Cannot obtain services.xml meta data"); - - // Add the path to sun-jaxws.xml - ParamValue ctxParam = new ParamValue(); - ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); - ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); - webMetaData.addContextParam(ctxParam); - - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) - { - servlet.setServletClass(servletClass); - } - } - } - } - - @Override - public void destroy(Deployment dep) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans != null) - { - ddbeans.destroyFileURL(); - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,121 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Mai-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private String servletClass; + + public String getServletClass() + { + return servletClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) + throw new IllegalStateException("Cannot obtain services.xml meta data"); + + // Add the path to sun-jaxws.xml + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); + ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) + { + servlet.setServletClass(servletClass); + } + } + } + } + + @Override + public void destroy(Deployment dep) + { + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans != null) + { + ddbeans.destroyFileURL(); + } + } + + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) + { + boolean isServlet = false; + if (loader != null) + { + try + { + Class servletClass = loader.loadClass(orgServletClass); + isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); + if (isServlet == true) + { + log.info("Ignore servlet: " + orgServletClass); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + orgServletClass); + } + } + return isServlet; + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$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.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.RequestHandler; - -/** - * A request handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class RequestHandlerImpl implements RequestHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - - public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException - { - XFireServletController controller = ep.getAttachment(XFireServletController.class); - if (controller == null) - throw new IllegalStateException("Cannot obtain XFire servlet controller"); - - controller.doService(req, res); - } - - public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) - { - throw new NotImplementedException(); - } - - public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) - { - throw new NotImplementedException(); - } -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,71 @@ +/* + * 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.wsf.stack.xfire; + +//$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.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + XFireServletController controller = ep.getAttachment(XFireServletController.class); + if (controller == null) + throw new IllegalStateException("Cannot obtain XFire servlet controller"); + + controller.doService(req, res); + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } +} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,122 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -import java.util.Iterator; - -import org.dom4j.Document; -import org.dom4j.Element; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; - -/** - * Modifies web.xml for jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2006 - */ -public class WebAppDesciptorModifierImpl implements WebAppDesciptorModifier -{ - // logging support - private static Logger log = Logger.getLogger(WebAppDesciptorModifierImpl.class); - - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - - Element root = webXml.getRootElement(); - - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans == null) - throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - - Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); - contextParam.addElement("param-value").addText(ddbeans.createFileURL().toExternalForm()); - - for (Iterator it = root.elementIterator("servlet"); it.hasNext();) - { - Element servlet = (Element)it.next(); - String linkName = servlet.element("servlet-name").getTextTrim(); - - // find the servlet-class - Element classElement = servlet.element("servlet-class"); - - // JSP - if (classElement == null) - continue; - - String orgServletClassName = classElement.getTextTrim(); - - // Get the servlet class - Class orgServletClass = null; - try - { - ClassLoader loader = dep.getClassLoader(); - orgServletClass = loader.loadClass(orgServletClassName); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + orgServletClassName); - } - - String targetBeanName = null; - - // Check if it is a real servlet that we can ignore - if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass)) - { - log.info("Ignore servlet: " + orgServletClassName); - continue; - } - else if (orgServletClassName.endsWith("Servlet")) - { - log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); - continue; - } - - classElement.setText(servletClass); - targetBeanName = orgServletClassName; - - if (targetBeanName == null) - throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); - - // remember the target bean name - results.sepTargetMap.put(linkName, targetBeanName); - } - - return results; - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,122 @@ +/* + * 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.wsf.stack.xfire; + +import java.util.Iterator; + +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; + +/** + * Modifies web.xml for jbossws + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2006 + */ +public class WebAppDesciptorModifierImpl implements WebAppDesciptorModifier +{ + // logging support + private static Logger log = Logger.getLogger(WebAppDesciptorModifierImpl.class); + + private String servletClass; + + public String getServletClass() + { + return servletClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException + { + RewriteResults results = new RewriteResults(); + + Element root = webXml.getRootElement(); + + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) + throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); + + Element contextParam = root.addElement("context-param"); + contextParam.addElement("param-name").addText(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); + contextParam.addElement("param-value").addText(ddbeans.createFileURL().toExternalForm()); + + for (Iterator it = root.elementIterator("servlet"); it.hasNext();) + { + Element servlet = (Element)it.next(); + String linkName = servlet.element("servlet-name").getTextTrim(); + + // find the servlet-class + Element classElement = servlet.element("servlet-class"); + + // JSP + if (classElement == null) + continue; + + String orgServletClassName = classElement.getTextTrim(); + + // Get the servlet class + Class orgServletClass = null; + try + { + ClassLoader loader = dep.getClassLoader(); + orgServletClass = loader.loadClass(orgServletClassName); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + orgServletClassName); + } + + String targetBeanName = null; + + // Check if it is a real servlet that we can ignore + if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass)) + { + log.info("Ignore servlet: " + orgServletClassName); + continue; + } + else if (orgServletClassName.endsWith("Servlet")) + { + log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); + continue; + } + + classElement.setText(servletClass); + targetBeanName = orgServletClassName; + + if (targetBeanName == null) + throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); + + // remember the target bean name + results.sepTargetMap.put(linkName, targetBeanName); + } + + return results; + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,145 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -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.codehaus.xfire.XFire; -import org.codehaus.xfire.transport.http.XFireConfigurableServlet; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * An extension to the XFire servlet - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireConfigurableServletExt extends XFireConfigurableServlet -{ - public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; - - private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; - - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - - // Init the Endpoint - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - String contextPath = servletConfig.getServletContext().getContextPath(); - initServiceEndpoint(contextPath); - endpoint.addAttachment(XFireServletController.class, controller); - } - - public XFire createXFire() throws ServletException - { - XFire xfire; - try - { - // #1 Load services.xml from default location - ServletContext context = getServletContext(); - URL servicesURL = context.getResource(CONFIG_FILE); - - // #1 Load services.xml from init parameter - if (servicesURL == null) - { - String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); - if (paramValue != null) - servicesURL = new URL(paramValue); - } - - xfire = loadConfig(servicesURL.getFile()); - } - catch (Exception e) - { - throw new ServletException(e); - } - - return xfire; - } - - public XFireServletController createController() throws ServletException - { - return new XFireServletControllerExt(xfire, getServletContext()); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** 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); - } - } -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,145 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +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.codehaus.xfire.XFire; +import org.codehaus.xfire.transport.http.XFireConfigurableServlet; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * An extension to the XFire servlet + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireConfigurableServletExt extends XFireConfigurableServlet +{ + public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; + + private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; + + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + + // Init the Endpoint + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + String contextPath = servletConfig.getServletContext().getContextPath(); + initServiceEndpoint(contextPath); + endpoint.addAttachment(XFireServletController.class, controller); + } + + public XFire createXFire() throws ServletException + { + XFire xfire; + try + { + // #1 Load services.xml from default location + ServletContext context = getServletContext(); + URL servicesURL = context.getResource(CONFIG_FILE); + + // #1 Load services.xml from init parameter + if (servicesURL == null) + { + String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); + if (paramValue != null) + servicesURL = new URL(paramValue); + } + + xfire = loadConfig(servicesURL.getFile()); + } + catch (Exception e) + { + throw new ServletException(e); + } + + return xfire; + } + + public XFireServletController createController() throws ServletException + { + return new XFireServletControllerExt(xfire, getServletContext()); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** 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); + } + } +} Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.stack.xfire.metadata.services.DDBean; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; -import org.jboss.wsf.stack.xfire.metadata.services.DDService; - -/** - * A deployer that generates xfire services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class XFireServicesDeployer extends AbstractDeployer -{ - private String serviceFactory; - private String invokerEJB3; - private String invokerJSE; - - public void setServiceFactory(String serviceFactory) - { - this.serviceFactory = serviceFactory; - } - - public void setInvokerEJB3(String invokerEJB3) - { - this.invokerEJB3 = invokerEJB3; - } - - public void setInvokerJSE(String invokerJSE) - { - this.invokerJSE = invokerJSE; - } - - @Override - public void create(Deployment dep) - { - DeploymentType depType = dep.getType(); - if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) - throw new IllegalStateException("Unsupported deployment type: " + depType); - - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String epName = ep.getShortName(); - String targetBean = ep.getTargetBean(); - - DDService ddser = new DDService(epName, targetBean); - ddser.setServiceFactory(serviceFactory); - - if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) - { - String beanName = "InvokerBeanEJB3"; - dd.addBean(new DDBean(beanName, invokerEJB3)); - ddser.setInvoker("#" + beanName); - } - - if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) - { - String beanName = "InvokerBeanJSE"; - dd.addBean(new DDBean(beanName, invokerJSE)); - ddser.setInvoker("#" + beanName); - } - - log.info("Add " + ddser); - dd.addService(ddser); - } - dep.getContext().addAttachment(DDBeans.class, dd); - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,96 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.stack.xfire.metadata.services.DDBean; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.services.DDService; + +/** + * A deployer that generates xfire services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class XFireServicesDeployer extends AbstractDeployer +{ + private String serviceFactory; + private String invokerEJB3; + private String invokerJSE; + + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + + public void setInvokerEJB3(String invokerEJB3) + { + this.invokerEJB3 = invokerEJB3; + } + + public void setInvokerJSE(String invokerJSE) + { + this.invokerJSE = invokerJSE; + } + + @Override + public void create(Deployment dep) + { + DeploymentType depType = dep.getType(); + if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) + throw new IllegalStateException("Unsupported deployment type: " + depType); + + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String epName = ep.getShortName(); + String targetBean = ep.getTargetBean(); + + DDService ddser = new DDService(epName, targetBean); + ddser.setServiceFactory(serviceFactory); + + if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) + { + String beanName = "InvokerBeanEJB3"; + dd.addBean(new DDBean(beanName, invokerEJB3)); + ddser.setInvoker("#" + beanName); + } + + if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) + { + String beanName = "InvokerBeanJSE"; + dd.addBean(new DDBean(beanName, invokerJSE)); + ddser.setInvoker("#" + beanName); + } + + log.info("Add " + ddser); + dd.addService(ddser); + } + dep.getContext().addAttachment(DDBeans.class, dd); + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,127 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.codehaus.xfire.XFire; -import org.codehaus.xfire.service.Service; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; - -/** - * An extension to the XFire servlet controller - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireServletControllerExt extends XFireServletController -{ - private static Logger log = Logger.getLogger(XFireServletControllerExt.class); - - public XFireServletControllerExt(XFire xfire, ServletContext servletContext) - { - super(xfire, servletContext); - } - - protected String getService(HttpServletRequest request) - { - Endpoint ep = EndpointAssociation.getEndpoint(); - String serviceName = ep.getShortName(); - return serviceName; - } - - protected void generateWSDL(HttpServletResponse response, String service) throws ServletException, IOException - { - Service userService = getXFire().getServiceRegistry().getService(service); - Object value = userService.getProperty(Service.DISABLE_WSDL_GENERATION); - boolean isWSDLDisabled = "true".equalsIgnoreCase((value != null ? value.toString() : null)); - if (isWSDLDisabled) - { - log.warn("WSDL generation disabled for service :" + service); - response.sendError(404, "No wsdl is avaiable for this service"); - return; - } - - response.setStatus(200); - response.setContentType("text/xml"); - - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - try - { - Endpoint ep = EndpointAssociation.getEndpoint(); - UnifiedVirtualFile rootFile = ep.getService().getDeployment().getRootFile(); - Thread.currentThread().setContextClassLoader(new VirtualFileClassLoader(rootFile, ctxLoader)); - getXFire().generateWSDL(service, response.getOutputStream()); - } - finally - { - Thread.currentThread().setContextClassLoader(ctxLoader); - } - } - - /* - * For some reason WebAppClassLoader.getResource("WEB-INF/wsdl/TestEndpoint.wsdl") - * fails when the war is deployed as part of an ear deployment. - * - * This ClassLoader falls back to the VFS to find the resource URL. - */ - static class VirtualFileClassLoader extends ClassLoader - { - private UnifiedVirtualFile vFile; - - public VirtualFileClassLoader(UnifiedVirtualFile file, ClassLoader parent) - { - super(parent); - vFile = file; - } - - @Override - public URL getResource(String name) - { - URL url = super.getResource(name); - if (url == null) - { - try - { - url = vFile.findChild(name).toURL(); - } - catch (IOException e) - { - // ignore - } - } - return url; - } - } -} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,127 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.codehaus.xfire.XFire; +import org.codehaus.xfire.service.Service; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; + +/** + * An extension to the XFire servlet controller + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireServletControllerExt extends XFireServletController +{ + private static Logger log = Logger.getLogger(XFireServletControllerExt.class); + + public XFireServletControllerExt(XFire xfire, ServletContext servletContext) + { + super(xfire, servletContext); + } + + protected String getService(HttpServletRequest request) + { + Endpoint ep = EndpointAssociation.getEndpoint(); + String serviceName = ep.getShortName(); + return serviceName; + } + + protected void generateWSDL(HttpServletResponse response, String service) throws ServletException, IOException + { + Service userService = getXFire().getServiceRegistry().getService(service); + Object value = userService.getProperty(Service.DISABLE_WSDL_GENERATION); + boolean isWSDLDisabled = "true".equalsIgnoreCase((value != null ? value.toString() : null)); + if (isWSDLDisabled) + { + log.warn("WSDL generation disabled for service :" + service); + response.sendError(404, "No wsdl is avaiable for this service"); + return; + } + + response.setStatus(200); + response.setContentType("text/xml"); + + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + Endpoint ep = EndpointAssociation.getEndpoint(); + UnifiedVirtualFile rootFile = ep.getService().getDeployment().getRootFile(); + Thread.currentThread().setContextClassLoader(new VirtualFileClassLoader(rootFile, ctxLoader)); + getXFire().generateWSDL(service, response.getOutputStream()); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + + /* + * For some reason WebAppClassLoader.getResource("WEB-INF/wsdl/TestEndpoint.wsdl") + * fails when the war is deployed as part of an ear deployment. + * + * This ClassLoader falls back to the VFS to find the resource URL. + */ + static class VirtualFileClassLoader extends ClassLoader + { + private UnifiedVirtualFile vFile; + + public VirtualFileClassLoader(UnifiedVirtualFile file, ClassLoader parent) + { + super(parent); + vFile = file; + } + + @Override + public URL getResource(String name) + { + URL url = super.getResource(name); + if (url == null) + { + try + { + url = vFile.findChild(name).toURL(); + } + catch (IOException e) + { + // ignore + } + } + return url; + } + } +} Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata) Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services) Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.metadata.services; - -//$Id$ - -import java.io.IOException; -import java.io.Writer; - -/** - * Metadata model for services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDBean -{ - // This will be the name bean. Required. - private String beanName; - // The class name of the bean. Required. - private String beanClass; - - public DDBean(String beanName, String beanClass) - { - this.beanName = beanName; - this.beanClass = beanClass; - } - - public String getBeanName() - { - return beanName; - } - - public void setBeanName(String beanName) - { - this.beanName = beanName; - } - - public String getBeanClass() - { - return beanClass; - } - - public void setBeanClass(String beanClass) - { - this.beanClass = beanClass; - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<bean"); - writer.write(" name='" + beanName + "'"); - writer.write(" class='" + beanClass + "'"); - writer.write("></bean>"); - } - - public String toString() - { - StringBuilder str = new StringBuilder("Bean"); - str.append("\n name=" + beanName); - str.append("\n class=" + beanClass); - return str.toString(); - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.xfire.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBean +{ + // This will be the name bean. Required. + private String beanName; + // The class name of the bean. Required. + private String beanClass; + + public DDBean(String beanName, String beanClass) + { + this.beanName = beanName; + this.beanClass = beanClass; + } + + public String getBeanName() + { + return beanName; + } + + public void setBeanName(String beanName) + { + this.beanName = beanName; + } + + public String getBeanClass() + { + return beanClass; + } + + public void setBeanClass(String beanClass) + { + this.beanClass = beanClass; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<bean"); + writer.write(" name='" + beanName + "'"); + writer.write(" class='" + beanClass + "'"); + writer.write("></bean>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Bean"); + str.append("\n name=" + beanName); + str.append("\n class=" + beanClass); + return str.toString(); + } +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.metadata.services; - -//$Id$ - -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.wsf.spi.deployment.WSDeploymentException; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; - -//$Id$ - -/** - * Metadata model for xfire services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDBeans -{ - // The Required services. - private List<DDService> services = new ArrayList<DDService>(); - // Optional additional beans. - private List<DDBean> beans = new ArrayList<DDBean>(); - // The derived temp file - private File tmpFile; - - public List<DDService> getServices() - { - return services; - } - - public void addService(DDService service) - { - services.add(service); - } - - public List<DDBean> getBeans() - { - return beans; - } - - public void addBean(DDBean bean) - { - beans.add(bean); - } - - public URL createFileURL() - { - destroyFileURL(); - - ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); - File tmpDir = serverConfig.getServerTempDir(); - try - { - tmpFile = File.createTempFile("jbossws-xfire-services", ".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("<beans xmlns='http://xfire.codehaus.org/config/1.0'>"); - for (DDService service : services) - { - service.writeTo(writer); - } - for (DDBean bean : beans) - { - bean.writeTo(writer); - } - writer.write("</beans>"); - } - -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,120 @@ +/* + * 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.wsf.stack.xfire.metadata.services; + +//$Id$ + +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.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +//$Id$ + +/** + * Metadata model for xfire services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBeans +{ + // The Required services. + private List<DDService> services = new ArrayList<DDService>(); + // Optional additional beans. + private List<DDBean> beans = new ArrayList<DDBean>(); + // The derived temp file + private File tmpFile; + + public List<DDService> getServices() + { + return services; + } + + public void addService(DDService service) + { + services.add(service); + } + + public List<DDBean> getBeans() + { + return beans; + } + + public void addBean(DDBean bean) + { + beans.add(bean); + } + + public URL createFileURL() + { + destroyFileURL(); + + ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); + try + { + tmpFile = File.createTempFile("jbossws-xfire-services", ".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("<beans xmlns='http://xfire.codehaus.org/config/1.0'>"); + for (DDService service : services) + { + service.writeTo(writer); + } + for (DDBean bean : beans) + { + bean.writeTo(writer); + } + writer.write("</beans>"); + } + +} \ No newline at end of file Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,131 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.metadata.services; - -//$Id$ - -import java.io.IOException; -import java.io.Writer; - -/** - * Metadata model for services.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDService -{ - // This will be the name of the service as exposed to the world. Required. - private String name; - // The class name of the object you wish to make into a service. Required. - private String serviceClass; - // The class name of the implementation which you wish to use when the service is invoked. Optional. - private String implementationClass; - // The ServiceFactory controls how the Service is built and configured. Optional. - private String serviceFactory; - // The invoker element is optional. It can be used to set a non-default Invoker for a service. - private String invoker; - - public DDService(String name, String serviceClass) - { - this.name = name; - this.serviceClass = serviceClass; - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getServiceClass() - { - return serviceClass; - } - - public void setServiceClass(String serviceClass) - { - this.serviceClass = serviceClass; - } - - public String getImplementationClass() - { - return implementationClass; - } - - public void setImplementationClass(String implementationClass) - { - this.implementationClass = implementationClass; - } - - public String getServiceFactory() - { - return serviceFactory; - } - - public void setServiceFactory(String serviceFactory) - { - this.serviceFactory = serviceFactory; - } - - public String getInvoker() - { - return invoker; - } - - public void setInvoker(String invoker) - { - this.invoker = invoker; - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<service>"); - writer.write("<name>" + name + "</name>"); - writer.write("<serviceClass>" + serviceClass + "</serviceClass>"); - if (implementationClass != null) - writer.write("<implementationClass>" + implementationClass + "</implementationClass>"); - if (serviceFactory != null) - writer.write("<serviceFactory>" + serviceFactory + "</serviceFactory>"); - if (invoker != null) - writer.write("<invoker>" + invoker + "</invoker>"); - writer.write("</service>"); - } - - public String toString() - { - StringBuilder str = new StringBuilder("Service"); - str.append("\n name=" + name); - str.append("\n serviceClass=" + serviceClass); - if (implementationClass != null) - str.append("\n implementationClass=" + implementationClass); - if (serviceFactory != null) - str.append("\n serviceFactory=" + serviceFactory); - if (invoker != null) - str.append("\n invoker=" + invoker); - return str.toString(); - } -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java) =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,131 @@ +/* + * 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.wsf.stack.xfire.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDService +{ + // This will be the name of the service as exposed to the world. Required. + private String name; + // The class name of the object you wish to make into a service. Required. + private String serviceClass; + // The class name of the implementation which you wish to use when the service is invoked. Optional. + private String implementationClass; + // The ServiceFactory controls how the Service is built and configured. Optional. + private String serviceFactory; + // The invoker element is optional. It can be used to set a non-default Invoker for a service. + private String invoker; + + public DDService(String name, String serviceClass) + { + this.name = name; + this.serviceClass = serviceClass; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getServiceClass() + { + return serviceClass; + } + + public void setServiceClass(String serviceClass) + { + this.serviceClass = serviceClass; + } + + public String getImplementationClass() + { + return implementationClass; + } + + public void setImplementationClass(String implementationClass) + { + this.implementationClass = implementationClass; + } + + public String getServiceFactory() + { + return serviceFactory; + } + + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + + public String getInvoker() + { + return invoker; + } + + public void setInvoker(String invoker) + { + this.invoker = invoker; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<service>"); + writer.write("<name>" + name + "</name>"); + writer.write("<serviceClass>" + serviceClass + "</serviceClass>"); + if (implementationClass != null) + writer.write("<implementationClass>" + implementationClass + "</implementationClass>"); + if (serviceFactory != null) + writer.write("<serviceFactory>" + serviceFactory + "</serviceFactory>"); + if (invoker != null) + writer.write("<invoker>" + invoker + "</invoker>"); + writer.write("</service>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Service"); + str.append("\n name=" + name); + str.append("\n serviceClass=" + serviceClass); + if (implementationClass != null) + str.append("\n implementationClass=" + implementationClass); + if (serviceFactory != null) + str.append("\n serviceFactory=" + serviceFactory); + if (invoker != null) + str.append("\n invoker=" + invoker); + return str.toString(); + } +} \ No newline at end of file Copied: trunk/integration/xfire/src/main/resources (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources) Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war) Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF) Deleted: trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<!DOCTYPE jboss-web - PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> - -<jboss-web> - -  - <context-root>jbossws</context-root> - -</jboss-web> Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + +  + <context-root>jbossws</context-root> + +</jboss-web> Deleted: trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <display-name>JBossWS</display-name> - - <servlet> - <servlet-name>ContextServlet</servlet-name> - <servlet-class>org.jboss.ws.core.server.ContextServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>PortComponentLinkServlet</servlet-name> - <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class> - </servlet> - -  - - <servlet-mapping> - <servlet-name>ContextServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>PortComponentLinkServlet</servlet-name> - <url-pattern>/pclink</url-pattern> - </servlet-mapping> - -  - <mime-mapping> - <extension>wsdl</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <mime-mapping> - <extension>xsd</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.ws.core.server.ContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortComponentLinkServlet</servlet-name> + <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class> + </servlet> + +  + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortComponentLinkServlet</servlet-name> + <url-pattern>/pclink</url-pattern> + </servlet-mapping> + +  + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Deleted: trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,63 +0,0 @@ -<html><head> -<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> -<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> -<link rel='stylesheet' href='./styles.css'> -</head> -<body> - -<div class='pageHeader'>Welcome to JBoss Web Services</div> - -<div class="pageSection"> -<h2>J2EE compatible web services</h2> -JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. -</div> - -<div class="pageSection"> -<h3>Administration</h3> - -<fieldset> - <legend><b>Runtime information</b></legend> -<ul> - <li><a href="services">View a list of deployed services</a></li> -  - <li><a href="/jmx-console/">Access JMX console</a></li> -</ul> -</fieldset> -</div> - -<div class="pageSection"> -<h3>Project information</h3> - -<fieldset> - <legend><b>Documentation</b></legend> - -<ul> - <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ</a></li> - <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html">User guide</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Community</b></legend> -<ul> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> - <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Source repository</b></legend> -<ul> - <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li> - <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> -</ul> -</fieldset> -</div> - -</body> -</html> Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/index.html 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,63 @@ +<html><head> +<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> +<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> +<link rel='stylesheet' href='./styles.css'> +</head> +<body> + +<div class='pageHeader'>Welcome to JBoss Web Services</div> + +<div class="pageSection"> +<h2>J2EE compatible web services</h2> +JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. +</div> + +<div class="pageSection"> +<h3>Administration</h3> + +<fieldset> + <legend><b>Runtime information</b></legend> +<ul> + <li><a href="services">View a list of deployed services</a></li> +  + <li><a href="/jmx-console/">Access JMX console</a></li> +</ul> +</fieldset> +</div> + +<div class="pageSection"> +<h3>Project information</h3> + +<fieldset> + <legend><b>Documentation</b></legend> + +<ul> + <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ</a></li> + <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html">User guide</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Community</b></legend> +<ul> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Source repository</b></legend> +<ul> + <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li> + <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> +</ul> +</fieldset> +</div> + +</body> +</html> Deleted: trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,186 +0,0 @@ - -/* table for list views */ -.table_list { -} - -/* table for detail views */ -.table_form { -} - -.pageHeader { - font-size: 14pt; - font-weight: BOLD; - color: #ffffff; - border-bottom-width:1px; - border-bottom-style:solid; - border-color:#000066; - margin-bottom:15px; - padding-left:15px; - padding-top:5px; - padding-bottom:5px; - background-color: #aaaadd; - max-width: 900px; -} - -.pageSection { - padding-left:15px; - margin-bottom: 5px; - max-width: 900px; -} - -.metrics -{ - font-size: 6pt; - background-color: #dddddd; - width: 100%; -} - -/* table row header */ -.list_tr_head { - font-family: Verdana, sans-serif; - font-size: 8pt; - font-weight: 600; - text-align: center; - background-color: #aaaadd; -} - -/* table row list view */ -.list_tr { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view odd lines */ -.list_tr_even { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view even lines */ -.list_tr_odd { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; -} - -/* form label */ -.form_label { - font-family: Verdana, sans-serif; - font-weight: 500; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; - padding-top: 2px; - padding-bottom: 2px; -} - -/* form value */ -.form_value { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: baseline; -} - -/* tiny writing */ -.tiny { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #666666; -} - -/* required input fields */ -.inputmust { - background-color: #dddddd; -} - -/* error message */ -.error { - font-family: Courier New; - color: #990000; -} - -/* error message */ -.error_trace { - font-family: Courier New; -} - -/* active tree node */ -.tree_active_label { - font-weight: bold; -} - -body { - font-family: Verdana,, sans-serif; - font-size: 8pt; - color: #000066; - background-color: #ffffff; -} - -/* title style */ -h1 { - font-family: Verdana, sans-serif; - font-size: 14pt; - font-weight: 600; - color: #000066; -} - -h2 { - font-family: Verdana, sans-serif; - font-size: 12pt; - font-weight: 600; - color: #000066; -} - -h3 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 600; - color: #000066; -} - -h4 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 500; - color: #000066; -} - -/* table desk */ -td { - font-family: Verdana, sans-serif; - font-size: 8pt; - padding-left: 5px; - padding-right: 5px; -} - -input, textarea, select, option { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; -} - -a { - font-family: Verdana, sans-serif; - color: #0000dd; - text-decoration: none; -} - -a:hover{ - font-family: Verdana, sans-serif; - color: #cc0000; - text-decoration: none; -} - -pre { - background:#dddddd -} \ No newline at end of file Copied: trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-context.war/styles.css 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,186 @@ + +/* table for list views */ +.table_list { +} + +/* table for detail views */ +.table_form { +} + +.pageHeader { + font-size: 14pt; + font-weight: BOLD; + color: #ffffff; + border-bottom-width:1px; + border-bottom-style:solid; + border-color:#000066; + margin-bottom:15px; + padding-left:15px; + padding-top:5px; + padding-bottom:5px; + background-color: #aaaadd; + max-width: 900px; +} + +.pageSection { + padding-left:15px; + margin-bottom: 5px; + max-width: 900px; +} + +.metrics +{ + font-size: 6pt; + background-color: #dddddd; + width: 100%; +} + +/* table row header */ +.list_tr_head { + font-family: Verdana, sans-serif; + font-size: 8pt; + font-weight: 600; + text-align: center; + background-color: #aaaadd; +} + +/* table row list view */ +.list_tr { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view odd lines */ +.list_tr_even { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view even lines */ +.list_tr_odd { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; +} + +/* form label */ +.form_label { + font-family: Verdana, sans-serif; + font-weight: 500; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; + padding-top: 2px; + padding-bottom: 2px; +} + +/* form value */ +.form_value { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: baseline; +} + +/* tiny writing */ +.tiny { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #666666; +} + +/* required input fields */ +.inputmust { + background-color: #dddddd; +} + +/* error message */ +.error { + font-family: Courier New; + color: #990000; +} + +/* error message */ +.error_trace { + font-family: Courier New; +} + +/* active tree node */ +.tree_active_label { + font-weight: bold; +} + +body { + font-family: Verdana,, sans-serif; + font-size: 8pt; + color: #000066; + background-color: #ffffff; +} + +/* title style */ +h1 { + font-family: Verdana, sans-serif; + font-size: 14pt; + font-weight: 600; + color: #000066; +} + +h2 { + font-family: Verdana, sans-serif; + font-size: 12pt; + font-weight: 600; + color: #000066; +} + +h3 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 600; + color: #000066; +} + +h4 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 500; + color: #000066; +} + +/* table desk */ +td { + font-family: Verdana, sans-serif; + font-size: 8pt; + padding-left: 5px; + padding-right: 5px; +} + +input, textarea, select, option { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; +} + +a { + font-family: Verdana, sans-serif; + color: #0000dd; + text-decoration: none; +} + +a:hover{ + font-family: Verdana, sans-serif; + color: #cc0000; + text-decoration: none; +} + +pre { + background:#dddddd +} \ No newline at end of file Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF) Deleted: trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> - <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> - <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>EJB2xDeployer</depends> - <depends>EJBRegistrationDeployer</depends> - </bean> - -  - <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebAppParsingDeployer</depends> - </bean> - -  - <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> - <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> - <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WarDeployer</depends> - <depends>WebServiceDeployerEJB</depends> - <depends>WebServiceDeployerJSE</depends> - </bean> - -</deployment> Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> + <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> + <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>EJB2xDeployer</depends> + <depends>EJBRegistrationDeployer</depends> + </bean> + +  + <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebAppParsingDeployer</depends> + </bean> + +  + <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> + <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> + <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WarDeployer</depends> + <depends>WebServiceDeployerEJB</depends> + <depends>WebServiceDeployerJSE</depends> + </bean> + +</deployment> Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar) Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF) Deleted: trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,250 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig"> -  - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - -  - </bean> - -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/> - -  -  -  - -  - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - -  - -  - <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> - <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSContextRootDeployer"/> - <inject bean="WSURLPatternDeployer"/> - <inject bean="WSXFireServicesDeployer"/> - <inject bean="WSModifyWebMetaDataDeployer"/> - </list> - </property> - </bean> - <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> - <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSContextRootDeployer"/> - <inject bean="WSURLPatternDeployer"/> - <inject bean="WSXFireServicesDeployer"/> - <inject bean="WSWebAppGeneratorDeployer"/> - <inject bean="WSWebAppDeployerDeployer"/> - </list> - </property> - </bean> - <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> - <inject bean="WSEndpointNameDeployer"/> - <inject bean="WSEndpointHandlerDeployer"/> - <inject bean="WSEndpointRegistryDeployer"/> - <inject bean="WSEndpointLifecycleDeployer"/> - </list> - </property> - </bean> - -  - <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.wsf.stack.xfire.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.xfire.LifecycleHandlerImpl</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> - </map> - </property> - </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> - <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire.ModifyWebMetaDataDeployer"> - <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> - </bean> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> - <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> - <property name="securityRolesHandlerEJB3"><inject bean="WSSecurityRolesHandlerEJB3"/></property> - </bean> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer"> - <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> - <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer"> - <property name="serviceFactory">org.codehaus.xfire.jaxws.JAXWSServiceFactory</property> - <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property> - </bean> - -  - <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> - <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl"> - <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property> - </bean> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> - <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> - </bean> - -  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> - <install bean="WebServiceDeployerJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerJSE</depends> - </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> - </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> - <install bean="WebServiceDeployerJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerJSE</depends> - </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> - <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> - </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> - <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> - <install bean="WebServiceMainDeployer" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceMainDeployer</depends> - </bean> - -</deployment> Copied: trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml) =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,250 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig"> +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/> + +  +  +  + +  + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + +  + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSXFireServicesDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSXFireServicesDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + +  + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.xfire.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.xfire.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire.ModifyWebMetaDataDeployer"> + <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> + </bean> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> + <property name="securityRolesHandlerEJB3"><inject bean="WSSecurityRolesHandlerEJB3"/></property> + </bean> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> + <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer"> + <property name="serviceFactory">org.codehaus.xfire.jaxws.JAXWSServiceFactory</property> + <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property> + <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property> + </bean> + +  + <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> + <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl"> + <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property> + </bean> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <install bean="WebServiceMainDeployer" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceMainDeployer</depends> + </bean> + +</deployment> Copied: trunk/integration/xfire/src/test (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/test) Copied: trunk/integration/xfire/src/test/java (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/test/java) Copied: trunk/integration/xfire/src/test/resources (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/test/resources) Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,2 +0,0 @@ - -# Nothing to exclude Copied: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/test/resources/excludes-jboss42.txt) =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt (rev 0) +++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,2 @@ + +# Nothing to exclude Deleted: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,2 +0,0 @@ - -# Nothing to exclude Copied: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt (from rev 3165, branches/tdiesler/trunk/integration/xfire/src/test/resources/excludes-jboss50.txt) =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt (rev 0) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,2 @@ + +# Nothing to exclude Deleted: trunk/integration/xfire/version.properties =================================================================== --- branches/tdiesler/trunk/integration/xfire/version.properties 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/integration/xfire/version.properties 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,14 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -sunri.implementation.title=JBoss Web Services - JBossWS/SunRI - -# Thirdparty library versions -ibm-wsdl4j=1.6.2 -jboss-jaxr=1.2.0.GA -jboss-jbossws-spi=SNAPSHOT -jboss-security-spi=2.0.0.Beta -sun-jaxb=2.1.3 -sun-servlet=2.5 -xfire=1.2.6 - Copied: trunk/integration/xfire/version.properties (from rev 3165, branches/tdiesler/trunk/integration/xfire/version.properties) =================================================================== --- trunk/integration/xfire/version.properties (rev 0) +++ trunk/integration/xfire/version.properties 2007-05-21 17:48:34 UTC (rev 3166) @@ -0,0 +1,14 @@ + +# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ + +sunri.implementation.title=JBoss Web Services - JBossWS/SunRI + +# Thirdparty library versions +ibm-wsdl4j=1.6.2 +jboss-jaxr=1.2.0.GA +jboss-jbossws-spi=SNAPSHOT +jboss-security-spi=2.0.0.Beta +sun-jaxb=2.1.3 +sun-servlet=2.5 +xfire=1.2.6 + Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -1,28 +1,30 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.eardeployment; import javax.ejb.Stateless; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -30,16 +32,17 @@ import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl") +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/earejb3") +@WebContext(contextRoot = "/earejb3") @Stateless -public class EJB3Bean +public class EJB3Bean { private static Logger log = Logger.getLogger(EJB3Bean.class); @WebMethod - public String echo(String input) + @WebResult(name = "return") + public String echo(@WebParam(name = "arg0") String input) { log.info("echo: " + input); return input; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -24,6 +24,8 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; import junit.framework.Test; @@ -47,11 +49,15 @@ public void testEJB3Endpoint() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); @@ -59,11 +65,15 @@ public void testJSEEndpoint() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earjse/JSEBean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); + String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -22,20 +22,23 @@ package org.jboss.test.ws.jaxws.eardeployment; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; //Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@WebService(name="TestEndpoint", serviceName="TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class JSEBean { private static Logger log = Logger.getLogger(JSEBean.class); @WebMethod - public String echo(String input) + @WebResult(name="return") + public String echo(@WebParam(name="arg0") String input) { log.info("echo: " + input); return input; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -14,7 +14,7 @@ * Generated source version: 2.1 * */ -@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/") +@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws/") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface TestEndpoint { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 17:48:34 UTC (rev 3166) @@ -8,7 +8,6 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; /** @@ -53,15 +52,15 @@ } /** + * TDI: commented out because WebServiceFeature is not part of xfire-jsr181-api (xfire-1.2.6) * * @param features * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. * @return * returns TestEndpoint - */ @WebEndpoint(name = "TestEndpointPort") public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class, features); } - + */ } Modified: trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 17:48:34 UTC (rev 3166) @@ -12,7 +12,7 @@ <servlet-mapping> <servlet-name>TestService</servlet-name> - <url-pattern>/JSEBean</url-pattern> + <url-pattern>/JSEBean/*</url-pattern> </servlet-mapping> </web-app> Modified: trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-05-21 17:48:34 UTC (rev 3166) @@ -6,9 +6,9 @@ $Id$ --> <definitions name="TestEndpointService" - targetNamespace="http://eardeployment.jaxws.ws.test.jboss.org/" + targetNamespace="http://eardeployment.jaxws/" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">  <types> @@ -32,16 +32,16 @@ <operation name="echo"> <soap:operation soapAction=""/> <input> - <soap:body namespace="http://eardeployment.jaxws.ws.test.jboss.org/" use="literal"/> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> </input> <output> - <soap:body namespace="http://eardeployment.jaxws.ws.test.jboss.org/" use="literal"/> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> </output> </operation> </binding> <service name="TestEndpointService"> <port binding="tns:TestEndpointBinding" name="TestEndpointPort"> - <soap:address location="REPLACE_ON_DEPLOY"/> + <soap:address location="http://REPLACE_ON_DEPLOY"/> </port> </service> </definitions> \ No newline at end of file

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3165 - in branches/tdiesler/trunk: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 13:30:28 -0400 (Mon, 21 May 2007) New Revision: 3165 Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java Removed: branches/tdiesler/trunk/integration/xfire/output-eclipse/ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java Log: xfire Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -26,6 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -53,8 +54,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -29,6 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -59,8 +60,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -30,6 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -54,8 +55,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -34,6 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -58,8 +59,9 @@ public Deployment createDeployment(DeploymentInfo unit) { Deployment dep = createDeployment(); + dep.setRootFile(new URLLoaderAdapter(unit.url)); + dep.setClassLoader(unit.annotationsCl); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -53,8 +53,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -56,8 +56,9 @@ public Deployment createDeployment(DeploymentUnit unit) { Deployment dep = createDeployment(); + dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot())); + dep.setClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.spi.deployment; +import org.jboss.ws.integration.UnifiedVirtualFile; + //$Id$ @@ -36,6 +38,8 @@ { // The context for this deployment dep private DeploymentContext context; + // The root file for this deployment + private UnifiedVirtualFile rootFile; // A deployment has one service private Service service; // The type of this deployment @@ -62,6 +66,16 @@ this.context = context; } + public UnifiedVirtualFile getRootFile() + { + return rootFile; + } + + public void setRootFile(UnifiedVirtualFile rootFile) + { + this.rootFile = rootFile; + } + public void setClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -21,7 +21,9 @@ */ package org.jboss.wsf.spi.deployment; +import org.jboss.ws.integration.UnifiedVirtualFile; + // $Id$ @@ -45,6 +47,12 @@ UNDEFINED, CREATED, STARTED, STOPED, DESTROYED }; + /** Get the root file for this deployment */ + UnifiedVirtualFile getRootFile(); + + /** Set the root file for this deployment */ + void setRootFile(UnifiedVirtualFile root); + /** Get the class loader for this deployment */ ClassLoader getClassLoader(); Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -64,7 +64,7 @@ // Add the path to sun-jaxws.xml ParamValue ctxParam = new ParamValue(); ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(XFireConfigurableServletJBWS.PARAM_XFIRE_SERVICES_URL); + ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); webMetaData.addContextParam(ctxParam); Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -64,7 +64,7 @@ throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(XFireConfigurableServletJBWS.PARAM_XFIRE_SERVICES_URL); + contextParam.addElement("param-name").addText(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); contextParam.addElement("param-value").addText(ddbeans.createFileURL().toExternalForm()); for (Iterator it = root.elementIterator("servlet"); it.hasNext();) Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java (from rev 3164, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletExt.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -0,0 +1,145 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +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.codehaus.xfire.XFire; +import org.codehaus.xfire.transport.http.XFireConfigurableServlet; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * An extension to the XFire servlet + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireConfigurableServletExt extends XFireConfigurableServlet +{ + public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; + + private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; + + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + + // Init the Endpoint + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + String contextPath = servletConfig.getServletContext().getContextPath(); + initServiceEndpoint(contextPath); + endpoint.addAttachment(XFireServletController.class, controller); + } + + public XFire createXFire() throws ServletException + { + XFire xfire; + try + { + // #1 Load services.xml from default location + ServletContext context = getServletContext(); + URL servicesURL = context.getResource(CONFIG_FILE); + + // #1 Load services.xml from init parameter + if (servicesURL == null) + { + String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); + if (paramValue != null) + servicesURL = new URL(paramValue); + } + + xfire = loadConfig(servicesURL.getFile()); + } + catch (Exception e) + { + throw new ServletException(e); + } + + return xfire; + } + + public XFireServletController createController() throws ServletException + { + return new XFireServletControllerExt(xfire, getServletContext()); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** 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); + } + } +} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -1,145 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -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.codehaus.xfire.XFire; -import org.codehaus.xfire.transport.http.XFireConfigurableServlet; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * An extension to the XFire servlet - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireConfigurableServletJBWS extends XFireConfigurableServlet -{ - public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; - - private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; - - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - - // Init the Endpoint - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - String contextPath = servletConfig.getServletContext().getContextPath(); - initServiceEndpoint(contextPath); - endpoint.addAttachment(XFireServletController.class, controller); - } - - public XFire createXFire() throws ServletException - { - XFire xfire; - try - { - // #1 Load services.xml from default location - ServletContext context = getServletContext(); - URL servicesURL = context.getResource(CONFIG_FILE); - - // #1 Load services.xml from init parameter - if (servicesURL == null) - { - String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); - if (paramValue != null) - servicesURL = new URL(paramValue); - } - - xfire = loadConfig(servicesURL.getFile()); - } - catch (Exception e) - { - throw new ServletException(e); - } - - return xfire; - } - - public XFireServletController createController() throws ServletException - { - return new XFireServletControllerJBWS(xfire, getServletContext()); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** 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); - } - } -} Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java (from rev 3164, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerExt.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -0,0 +1,127 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.codehaus.xfire.XFire; +import org.codehaus.xfire.service.Service; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; + +/** + * An extension to the XFire servlet controller + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireServletControllerExt extends XFireServletController +{ + private static Logger log = Logger.getLogger(XFireServletControllerExt.class); + + public XFireServletControllerExt(XFire xfire, ServletContext servletContext) + { + super(xfire, servletContext); + } + + protected String getService(HttpServletRequest request) + { + Endpoint ep = EndpointAssociation.getEndpoint(); + String serviceName = ep.getShortName(); + return serviceName; + } + + protected void generateWSDL(HttpServletResponse response, String service) throws ServletException, IOException + { + Service userService = getXFire().getServiceRegistry().getService(service); + Object value = userService.getProperty(Service.DISABLE_WSDL_GENERATION); + boolean isWSDLDisabled = "true".equalsIgnoreCase((value != null ? value.toString() : null)); + if (isWSDLDisabled) + { + log.warn("WSDL generation disabled for service :" + service); + response.sendError(404, "No wsdl is avaiable for this service"); + return; + } + + response.setStatus(200); + response.setContentType("text/xml"); + + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + Endpoint ep = EndpointAssociation.getEndpoint(); + UnifiedVirtualFile rootFile = ep.getService().getDeployment().getRootFile(); + Thread.currentThread().setContextClassLoader(new VirtualFileClassLoader(rootFile, ctxLoader)); + getXFire().generateWSDL(service, response.getOutputStream()); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + + /* + * For some reason WebAppClassLoader.getResource("WEB-INF/wsdl/TestEndpoint.wsdl") + * fails when the war is deployed as part of an ear deployment. + * + * This ClassLoader falls back to the VFS to find the resource URL. + */ + static class VirtualFileClassLoader extends ClassLoader + { + private UnifiedVirtualFile vFile; + + public VirtualFileClassLoader(UnifiedVirtualFile file, ClassLoader parent) + { + super(parent); + vFile = file; + } + + @Override + public URL getResource(String name) + { + URL url = super.getResource(name); + if (url == null) + { + try + { + url = vFile.findChild(name).toURL(); + } + catch (IOException e) + { + // ignore + } + } + return url; + } + } +} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; - -import org.codehaus.xfire.XFire; -import org.codehaus.xfire.transport.http.XFireServletController; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointAssociation; - -/** - * An extension to the XFire servlet controller - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class XFireServletControllerJBWS extends XFireServletController -{ - public XFireServletControllerJBWS(XFire xfire, ServletContext servletContext) - { - super(xfire, servletContext); - } - - protected String getService(HttpServletRequest request) - { - Endpoint ep = EndpointAssociation.getEndpoint(); - String serviceName = ep.getShortName(); - return serviceName; - } -} Modified: branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 17:30:28 UTC (rev 3165) @@ -159,7 +159,7 @@ <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl"> - <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletJBWS</property> + <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property> </bean> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 15:15:49 UTC (rev 3164) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 17:30:28 UTC (rev 3165) @@ -63,10 +63,9 @@ assertEquals(helloWorld, retObj); } - public void _testJSEEndpoint() throws Exception + public void testJSEEndpoint() throws Exception { - //String endpointAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; - String soapAddress = "http://" + getServerHost() + ":8080/jaxws-eardeployment/JSEBean"; + String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class);

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3164 - in branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire: metadata/services and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 11:15:49 -0400 (Mon, 21 May 2007) New Revision: 3164 Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java Log: xfire Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 14:50:29 UTC (rev 3163) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 15:15:49 UTC (rev 3164) @@ -27,6 +27,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.stack.xfire.metadata.services.DDBean; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; import org.jboss.wsf.stack.xfire.metadata.services.DDService; @@ -74,10 +75,18 @@ ddser.setServiceFactory(serviceFactory); if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) - ddser.setInvoker(invokerEJB3); + { + String beanName = "InvokerBeanEJB3"; + dd.addBean(new DDBean(beanName, invokerEJB3)); + ddser.setInvoker("#" + beanName); + } if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) - ddser.setInvoker(invokerJSE); + { + String beanName = "InvokerBeanJSE"; + dd.addBean(new DDBean(beanName, invokerJSE)); + ddser.setInvoker("#" + beanName); + } log.info("Add " + ddser); dd.addService(ddser); Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-05-21 15:15:49 UTC (rev 3164) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.xfire.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBean +{ + // This will be the name bean. Required. + private String beanName; + // The class name of the bean. Required. + private String beanClass; + + public DDBean(String beanName, String beanClass) + { + this.beanName = beanName; + this.beanClass = beanClass; + } + + public String getBeanName() + { + return beanName; + } + + public void setBeanName(String beanName) + { + this.beanName = beanName; + } + + public String getBeanClass() + { + return beanClass; + } + + public void setBeanClass(String beanClass) + { + this.beanClass = beanClass; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<bean"); + writer.write(" name='" + beanName + "'"); + writer.write(" class='" + beanClass + "'"); + writer.write("></bean>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Bean"); + str.append("\n name=" + beanName); + str.append("\n class=" + beanClass); + return str.toString(); + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 14:50:29 UTC (rev 3163) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 15:15:49 UTC (rev 3164) @@ -46,7 +46,11 @@ */ public class DDBeans { + // The Required services. private List<DDService> services = new ArrayList<DDService>(); + // Optional additional beans. + private List<DDBean> beans = new ArrayList<DDBean>(); + // The derived temp file private File tmpFile; public List<DDService> getServices() @@ -59,6 +63,16 @@ services.add(service); } + public List<DDBean> getBeans() + { + return beans; + } + + public void addBean(DDBean bean) + { + beans.add(bean); + } + public URL createFileURL() { destroyFileURL(); @@ -96,6 +110,10 @@ { service.writeTo(writer); } + for (DDBean bean : beans) + { + bean.writeTo(writer); + } writer.write("</beans>"); }

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3163 - in branches/tdiesler/trunk: integration/xfire/ant-import and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 10:50:29 -0400 (Mon, 21 May 2007) New Revision: 3163 Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java Removed: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoints.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandler.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandlerChain.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/ Modified: branches/tdiesler/trunk/integration/xfire/.classpath branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl Log: xfire Modified: branches/tdiesler/trunk/integration/xfire/.classpath =================================================================== --- branches/tdiesler/trunk/integration/xfire/.classpath 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/.classpath 2007-05-21 14:50:29 UTC (rev 3163) @@ -10,5 +10,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="thirdparty/xfire-all.jar" sourcepath="thirdparty/xfire-distribution-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 14:50:29 UTC (rev 3163) @@ -41,7 +41,23 @@ Init the various classpaths --> <target name="tests-init" depends="tests-prepare,thirdparty"> + +  + <path id="jbossws.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.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"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-xml-binding.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + </path> + <path id="sunri.classpath"> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> @@ -59,9 +75,6 @@ <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> </path> -  <path id="xfire.classpath"> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jdom.jar"/> @@ -74,7 +87,7 @@  <path id="javac.classpath"> - <path refid="sunri.classpath"/> + <path refid="xfire.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -0,0 +1,76 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.codehaus.xfire.MessageContext; +import org.codehaus.xfire.fault.XFireFault; +import org.codehaus.xfire.service.invoker.Invoker; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * An XFire invoker for EJB3 + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerEJB3 implements Invoker +{ + public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + EndpointInvocation inv = invHandler.createInvocation(); + inv.getInvocationContext().addAttachment(MessageContext.class, context); + inv.setJavaMethod(m); + inv.setArgs(params); + + Object retObj = null; + try + { + invHandler.invoke(ep, null, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws XFireFault + { + if (ex instanceof InvocationTargetException) + throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + + throw XFireFault.createFault(ex); + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.xfire; + +//$Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import org.codehaus.xfire.MessageContext; +import org.codehaus.xfire.fault.XFireFault; +import org.codehaus.xfire.service.invoker.Invoker; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.EndpointInvocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * An XFire invoker for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerJSE implements Invoker +{ + public Object invoke(Method m, Object[] params, MessageContext context) throws XFireFault + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + EndpointInvocation inv = invHandler.createInvocation(); + inv.getInvocationContext().addAttachment(MessageContext.class, context); + inv.setJavaMethod(m); + inv.setArgs(params); + + Object retObj = null; + try + { + Object targetBean = getTargetBean(ep); + invHandler.invoke(ep, targetBean, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException + { + Class beanClass = ep.getTargetBeanClass(); + return beanClass.newInstance(); + } + + private void handleException(Exception ex) throws XFireFault + { + if (ex instanceof InvocationTargetException) + throw XFireFault.createFault(((InvocationTargetException)ex).getTargetException()); + + throw XFireFault.createFault(ex); + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -29,7 +29,7 @@ import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.wsf.spi.deployment.AbstractDeployer; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; /** * A deployer that modifies the web.xml meta data Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.codehaus.xfire.transport.http.XFireServletController; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.wsf.spi.deployment.Endpoint; @@ -42,16 +43,20 @@ * A request handler * * @author Thomas.Diesler(a)jboss.org - * @since 21-Mai-2007 + * @since 21-May-2007 */ public class RequestHandlerImpl implements RequestHandler { // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { - throw new NotImplementedException(); + XFireServletController controller = ep.getAttachment(XFireServletController.class); + if (controller == null) + throw new IllegalStateException("Cannot obtain XFire servlet controller"); + + controller.doService(req, res); } public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; /** * Modifies web.xml for jbossws Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -23,13 +23,26 @@ //$Id$ +import java.io.IOException; import java.net.URL; +import javax.management.ObjectName; +import javax.servlet.ServletConfig; 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.codehaus.xfire.XFire; import org.codehaus.xfire.transport.http.XFireConfigurableServlet; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; /** * An extension to the XFire servlet @@ -43,6 +56,20 @@ private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + + // Init the Endpoint + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + String contextPath = servletConfig.getServletContext().getContextPath(); + initServiceEndpoint(contextPath); + endpoint.addAttachment(XFireServletController.class, controller); + } + public XFire createXFire() throws ServletException { XFire xfire; @@ -69,4 +96,50 @@ return xfire; } + + public XFireServletController createController() throws ServletException + { + return new XFireServletControllerJBWS(xfire, getServletContext()); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** 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); + } + } } Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -26,8 +26,9 @@ import org.jboss.wsf.spi.deployment.AbstractDeployer; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDService; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.services.DDService; /** * A deployer that generates xfire services.xml @@ -37,9 +38,32 @@ */ public class XFireServicesDeployer extends AbstractDeployer { + private String serviceFactory; + private String invokerEJB3; + private String invokerJSE; + + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + + public void setInvokerEJB3(String invokerEJB3) + { + this.invokerEJB3 = invokerEJB3; + } + + public void setInvokerJSE(String invokerJSE) + { + this.invokerJSE = invokerJSE; + } + @Override public void create(Deployment dep) { + DeploymentType depType = dep.getType(); + if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) + throw new IllegalStateException("Unsupported deployment type: " + depType); + DDBeans dd = new DDBeans(); for (Endpoint ep : dep.getService().getEndpoints()) { @@ -47,6 +71,14 @@ String targetBean = ep.getTargetBean(); DDService ddser = new DDService(epName, targetBean); + ddser.setServiceFactory(serviceFactory); + + if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) + ddser.setInvoker(invokerEJB3); + + if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) + ddser.setInvoker(invokerJSE); + log.info("Add " + ddser); dd.addService(ddser); } Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -0,0 +1,53 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; + +import org.codehaus.xfire.XFire; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; + +/** + * An extension to the XFire servlet controller + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireServletControllerJBWS extends XFireServletController +{ + public XFireServletControllerJBWS(XFire xfire, ServletContext servletContext) + { + super(xfire, servletContext); + } + + protected String getService(HttpServletRequest request) + { + Endpoint ep = EndpointAssociation.getEndpoint(); + String serviceName = ep.getShortName(); + return serviceName; + } +} Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServletControllerJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services (from rev 3156, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws) Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java (from rev 3162, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDBeans.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -0,0 +1,102 @@ +/* + * 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.wsf.stack.xfire.metadata.services; + +//$Id$ + +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.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +//$Id$ + +/** + * Metadata model for xfire services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBeans +{ + private List<DDService> services = new ArrayList<DDService>(); + private File tmpFile; + + public List<DDService> getServices() + { + return services; + } + + public void addService(DDService service) + { + services.add(service); + } + + public URL createFileURL() + { + destroyFileURL(); + + ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); + try + { + tmpFile = File.createTempFile("jbossws-xfire-services", ".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("<beans xmlns='http://xfire.codehaus.org/config/1.0'>"); + for (DDService service : services) + { + service.writeTo(writer); + } + writer.write("</beans>"); + } + +} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoint.java 2007-05-20 11:37:37 UTC (rev 3156) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -1,192 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoints.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java 2007-05-20 11:37:37 UTC (rev 3156) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoints.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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.wsf.spi.deployment.WSDeploymentException; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandler.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandler.java 2007-05-20 11:37:37 UTC (rev 3156) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandler.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandlerChain.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandlerChain.java 2007-05-20 11:37:37 UTC (rev 3156) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDHandlerChain.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java (from rev 3162, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDService.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -0,0 +1,131 @@ +/* + * 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.wsf.stack.xfire.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDService +{ + // This will be the name of the service as exposed to the world. Required. + private String name; + // The class name of the object you wish to make into a service. Required. + private String serviceClass; + // The class name of the implementation which you wish to use when the service is invoked. Optional. + private String implementationClass; + // The ServiceFactory controls how the Service is built and configured. Optional. + private String serviceFactory; + // The invoker element is optional. It can be used to set a non-default Invoker for a service. + private String invoker; + + public DDService(String name, String serviceClass) + { + this.name = name; + this.serviceClass = serviceClass; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getServiceClass() + { + return serviceClass; + } + + public void setServiceClass(String serviceClass) + { + this.serviceClass = serviceClass; + } + + public String getImplementationClass() + { + return implementationClass; + } + + public void setImplementationClass(String implementationClass) + { + this.implementationClass = implementationClass; + } + + public String getServiceFactory() + { + return serviceFactory; + } + + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + + public String getInvoker() + { + return invoker; + } + + public void setInvoker(String invoker) + { + this.invoker = invoker; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<service>"); + writer.write("<name>" + name + "</name>"); + writer.write("<serviceClass>" + serviceClass + "</serviceClass>"); + if (implementationClass != null) + writer.write("<implementationClass>" + implementationClass + "</implementationClass>"); + if (serviceFactory != null) + writer.write("<serviceFactory>" + serviceFactory + "</serviceFactory>"); + if (invoker != null) + writer.write("<invoker>" + invoker + "</invoker>"); + writer.write("</service>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Service"); + str.append("\n name=" + name); + str.append("\n serviceClass=" + serviceClass); + if (implementationClass != null) + str.append("\n implementationClass=" + implementationClass); + if (serviceFactory != null) + str.append("\n serviceFactory=" + serviceFactory); + if (invoker != null) + str.append("\n invoker=" + invoker); + return str.toString(); + } +} \ No newline at end of file Modified: branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 14:50:29 UTC (rev 3163) @@ -149,7 +149,11 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> <property name="mainDeployer"><inject bean="MainDeployer"/></property> </bean> - <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer"/> + <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer"> + <property name="serviceFactory">org.codehaus.xfire.jaxws.JAXWSServiceFactory</property> + <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property> + <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property> + </bean>  <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -1,28 +1,30 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.eardeployment; import javax.ejb.Stateless; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -30,16 +32,17 @@ import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl") +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/earejb3") +@WebContext(contextRoot = "/earejb3") @Stateless -public class EJB3Bean +public class EJB3Bean { private static Logger log = Logger.getLogger(EJB3Bean.class); @WebMethod - public String echo(String input) + @WebResult(name = "return") + public String echo(@WebParam(name = "arg0") String input) { log.info("echo: " + input); return input; Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -24,6 +24,7 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import junit.framework.Test; @@ -48,23 +49,32 @@ public void testEJB3Endpoint() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - Service service = Service.create(wsdlURL, serviceName); + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - public void testJSEEndpoint() throws Exception + public void _testJSEEndpoint() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earjse/JSEBean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - Service service = Service.create(wsdlURL, serviceName); + //String endpointAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; + String soapAddress = "http://" + getServerHost() + ":8080/jaxws-eardeployment/JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -22,20 +22,23 @@ package org.jboss.test.ws.jaxws.eardeployment; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; //Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@WebService(name="TestEndpoint", serviceName="TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class JSEBean { private static Logger log = Logger.getLogger(JSEBean.class); @WebMethod - public String echo(String input) + @WebResult(name="return") + public String echo(@WebParam(name="arg0") String input) { log.info("echo: " + input); return input; Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 14:50:29 UTC (rev 3163) @@ -14,7 +14,7 @@ * Generated source version: 2.1 * */ -@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/") +@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws/") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface TestEndpoint { Modified: branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 14:50:29 UTC (rev 3163) @@ -12,7 +12,7 @@ <servlet-mapping> <servlet-name>TestService</servlet-name> - <url-pattern>/JSEBean</url-pattern> + <url-pattern>/JSEBean/*</url-pattern> </servlet-mapping> </web-app> Modified: branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl =================================================================== --- branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-05-21 10:53:58 UTC (rev 3162) +++ branches/tdiesler/trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2007-05-21 14:50:29 UTC (rev 3163) @@ -6,9 +6,9 @@ $Id$ --> <definitions name="TestEndpointService" - targetNamespace="http://eardeployment.jaxws.ws.test.jboss.org/" + targetNamespace="http://eardeployment.jaxws/" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">  <types> @@ -32,16 +32,16 @@ <operation name="echo"> <soap:operation soapAction=""/> <input> - <soap:body namespace="http://eardeployment.jaxws.ws.test.jboss.org/" use="literal"/> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> </input> <output> - <soap:body namespace="http://eardeployment.jaxws.ws.test.jboss.org/" use="literal"/> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> </output> </operation> </binding> <service name="TestEndpointService"> <port binding="tns:TestEndpointBinding" name="TestEndpointPort"> - <soap:address location="REPLACE_ON_DEPLOY"/> + <soap:address location="http://REPLACE_ON_DEPLOY"/> </port> </service> </definitions> \ No newline at end of file

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3162 - in branches/tdiesler/trunk: integration/spi/src/main/java/org/jboss/wsf/spi/deployment and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-21 06:53:58 -0400 (Mon, 21 May 2007) New Revision: 3162 Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDBeans.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java Removed: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserExt.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointAssociation.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletResourceLoader.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/SunJaxwsDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/VirtualFileResourceLoader.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSEndpointServletJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerExt.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerJBWS.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoint.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandler.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandlerChain.java Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml branches/tdiesler/trunk/integration/sunri/build.xml branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/integration/xfire/ branches/tdiesler/trunk/integration/xfire/.classpath branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/xfire/build.xml branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/integration/xfire/version.properties branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java Log: xfire Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -25,6 +25,7 @@ <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> <property name="int.jbws.dir" value="${basedir}/integration/jbws"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> + <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java (from rev 3156, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointAssociation.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointAssociation.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,51 @@ +/* + * 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.wsf.spi.deployment; + +// $Id$ + + +/** + * Associates the endpoint meta data with the current thead. + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public final class EndpointAssociation +{ + private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); + + public static void setEndpoint(Endpoint ep) + { + endpoint.set(ep); + } + + public static Endpoint getEndpoint() + { + return endpoint.get(); + } + + public static void removeEndpoint() + { + endpoint.remove(); + } +} Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,106 @@ +/* + * 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.wsf.spi.invocation; + +// $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.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * The JAX-WS dispatcher servlet. + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class EndpointServlet 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); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** 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: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration/sunri/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -153,7 +153,7 @@ </metainf> </jar> -  +  <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> @@ -166,7 +166,7 @@ </fileset> </zip> -  +  <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" > <fileset dir="${sunri.java.dir}"/> </zip> Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointAssociation.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.sunri; - -// $Id$ - -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * Associates the endpoint meta data with the current thead. - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public final class EndpointAssociation -{ - private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); - - public static void setEndpoint(Endpoint ep) - { - endpoint.set(ep); - } - - public static Endpoint getEndpoint() - { - return endpoint.get(); - } - - public static void removeEndpoint() - { - endpoint.remove(); - } -} Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -30,6 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.EndpointInvocation; import org.jboss.wsf.spi.invocation.InvocationHandler; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -30,6 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointAssociation; import org.jboss.wsf.spi.invocation.EndpointInvocation; import org.jboss.wsf.spi.invocation.InvocationHandler; Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSEndpointServletJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.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.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * The JAX-WS dispatcher servlet. - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSEndpointServletJBWS 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); - } - - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** 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); - } - } -} Modified: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -157,7 +157,7 @@ <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.sunri.WebAppDesciptorModifierImpl"> <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> - <property name="servletClass">org.jboss.wsf.stack.sunri.WSEndpointServletJBWS</property> + <property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property> </bean> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> Property changes on: branches/tdiesler/trunk/integration/xfire ___________________________________________________________________ Name: svn:ignore + thirdparty output* version.properties.md5 Modified: branches/tdiesler/trunk/integration/xfire/.classpath =================================================================== --- branches/tdiesler/trunk/integration/xfire/.classpath 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/.classpath 2007-05-21 10:53:58 UTC (rev 3162) @@ -3,24 +3,12 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <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/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="lib" path="thirdparty/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> + <classpathentry kind="lib" path="thirdparty/xfire-all.jar" sourcepath="thirdparty/xfire-distribution-sources.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -42,26 +42,39 @@ --> <target name="tests-init" depends="tests-prepare,thirdparty"> + <path id="sunri.classpath"> + <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> + </path> + +  <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/resolver.jar"/> + <pathelement location="${thirdparty.dir}/jdom.jar"/> <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> </path>  <path id="javac.classpath"> - <path refid="xfire.classpath"/> + <path refid="sunri.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> @@ -70,7 +83,7 @@  <path id="tests.client.classpath"> - <path refid="xfire.classpath"/> + <path refid="sunri.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -42,12 +42,23 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <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}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" 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}/xfire/${xfire}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/jdom.jar" dest="${thirdparty.dir}/jdom.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/spring.jar" dest="${thirdparty.dir}/spring.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xbean.jar" dest="${thirdparty.dir}/xbean.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xbean-spring.jar" dest="${thirdparty.dir}/xbean-spring.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> @@ -77,11 +88,10 @@ <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}/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}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/xfire-all.jar"/> + <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> </path> </target> Modified: branches/tdiesler/trunk/integration/xfire/build.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/build.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/build.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -133,27 +133,23 @@ <include name="jaxrpc-api.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="FastInfoset.jar"/> - <include name="http.jar"/> <include name="jaxws-api.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jsr173_api.jar"/> - <include name="jsr181-api.jar"/> - <include name="jsr250-api.jar"/> - <include name="resolver.jar"/> + <include name="jdom.jar"/> + <include name="wsdl4j.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> + <include name="spring.jar"/> + <include name="xbean.jar"/> + <include name="xbean-spring.jar"/> + <include name="xfire-all.jar"/> + <include name="xfire-jsr181-api.jar"/> </fileset> <metainf dir="${xfire.resources.dir}/jbossws-jboss50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> -  +  <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> @@ -166,7 +162,7 @@ </fileset> </zip> -  +  <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > <fileset dir="${xfire.java.dir}"/> </zip> Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserExt.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserExt.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserExt.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,602 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.http.HTTPBinding; -import javax.xml.ws.soap.MTOMFeature; -import javax.xml.ws.soap.SOAPBinding; - -import org.xml.sax.EntityResolver; - -import com.sun.istack.NotNull; -import com.sun.xml.ws.api.BindingID; -import com.sun.xml.ws.api.WSBinding; -import com.sun.xml.ws.api.server.Container; -import com.sun.xml.ws.api.server.InstanceResolver; -import com.sun.xml.ws.api.server.Invoker; -import com.sun.xml.ws.api.server.SDDocumentSource; -import com.sun.xml.ws.api.server.WSEndpoint; -import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory; -import com.sun.xml.ws.binding.WebServiceFeatureList; -import com.sun.xml.ws.handler.HandlerChainsModel; -import com.sun.xml.ws.resources.ServerMessages; -import com.sun.xml.ws.resources.WsservletMessages; -import com.sun.xml.ws.server.EndpointFactory; -import com.sun.xml.ws.server.ServerRtException; -import com.sun.xml.ws.streaming.Attributes; -import com.sun.xml.ws.streaming.TidyXMLStreamReader; -import com.sun.xml.ws.streaming.XMLStreamReaderUtil; -import com.sun.xml.ws.transport.http.HttpAdapter; -import com.sun.xml.ws.transport.http.ResourceLoader; -import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; -import com.sun.xml.ws.util.HandlerAnnotationInfo; -import com.sun.xml.ws.util.exception.LocatableWebServiceException; -import com.sun.xml.ws.util.xml.XmlUtil; - -/** - * A copy of DeploymentDescriptorParser that externalizes - * - * {@link createInvoker(Class)} - * - * - * @author WS Development Team - * @author Kohsuke Kawaguchi - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class DeploymentDescriptorParserExt<A> -{ - private final Container container; - private final ClassLoader classLoader; - private final ResourceLoader loader; - private final AdapterFactory<A> adapterFactory; - - /** - * Endpoint names that are declared. - * Used to catch double definitions. - */ - private final Set<String> names = new HashSet<String>(); - - /** - * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID. - */ - private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>(); - - /** - * - * @param cl - * Used to load service implementations. - * @param loader - * Used to locate resources, in particular WSDL. - * @param container - * Optional {@link Container} that {@link WSEndpoint}s receive. - * @param adapterFactory - * Creates {@link HttpAdapter} (or its derived class.) - */ - public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException - { - classLoader = cl; - this.loader = loader; - this.container = container; - this.adapterFactory = adapterFactory; - - collectDocs("/WEB-INF/wsdl/"); - logger.fine("war metadata=" + docs); - } - - /** - * Parses the {@code sun-jaxws.xml} file and configures - * a set of {@link HttpAdapter}s. - */ - public @NotNull - List<A> parse(String systemId, InputStream is) - { - XMLStreamReader reader = null; - try - { - reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is); - XMLStreamReaderUtil.nextElementContent(reader); - return parseAdapters(reader); - } - finally - { - if (reader != null) - { - try - { - reader.close(); - } - catch (XMLStreamException e) - { - throw new ServerRtException("runtime.parser.xmlReader", e); - } - } - try - { - is.close(); - } - catch (IOException e) - { - // ignore - } - } - } - - /** - * Parses the {@code sun-jaxws.xml} file and configures - * a set of {@link HttpAdapter}s. - */ - public @NotNull - List<A> parse(File f) throws IOException - { - FileInputStream in = new FileInputStream(f); - try - { - return parse(f.getPath(), in); - } - finally - { - in.close(); - } - } - - /** - * Get all the WSDL & schema documents recursively. - */ - private void collectDocs(String dirPath) throws MalformedURLException - { - Set<String> paths = loader.getResourcePaths(dirPath); - if (paths != null) - { - for (String path : paths) - { - if (path.endsWith("/")) - { - collectDocs(path); - } - else - { - URL res = loader.getResource(path); - docs.put(res.toString(), SDDocumentSource.create(res)); - } - } - } - } - - private List<A> parseAdapters(XMLStreamReader reader) - { - if (!reader.getName().equals(QNAME_ENDPOINTS)) - { - failWithFullName("runtime.parser.invalidElement", reader); - } - - List<A> adapters = new ArrayList<A>(); - - Attributes attrs = XMLStreamReaderUtil.getAttributes(reader); - String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION); - if (!version.equals(ATTRVALUE_VERSION_1_0)) - { - failWithLocalName("runtime.parser.invalidVersionNumber", reader, version); - } - - while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) - if (reader.getName().equals(QNAME_ENDPOINT)) - { - - attrs = XMLStreamReaderUtil.getAttributes(reader); - String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME); - if (!names.add(name)) - { - logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/)); - } - - String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION); - Class<?> implementorClass = getImplementorClass(implementationName, reader); - EndpointFactory.verifyImplementorClass(implementorClass); - - SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass); - - QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE); - if (serviceName == null) - serviceName = EndpointFactory.getDefaultServiceName(implementorClass); - - QName portName = getQNameAttribute(attrs, ATTR_PORT); - if (portName == null) - portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass); - - //get enable-mtom attribute value - String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM); - String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE); - String bindingId = getAttribute(attrs, ATTR_BINDING); - if (bindingId != null) - // Convert short-form tokens to API's binding ids - bindingId = getBindingIdForToken(bindingId); - WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold); - String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN); - - // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary. - - boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName); - - ensureNoContent(reader); - Invoker invoker = createInvoker(implementorClass); - WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, - serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); - adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint)); - } - else - { - failWithLocalName("runtime.parser.invalidElement", reader); - } - return adapters; - } - - protected Invoker createInvoker(Class<?> implementorClass) - { - Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker(); - return invoker; - } - - /** - * @param ddBindingId - * binding id explicitlyspecified in the DeploymentDescriptor or parameter - * @param implClass - * Endpoint Implementation class - * @param mtomEnabled - * represents mtom-enabled attribute in DD - * @param mtomThreshold - * threshold value specified in DD - * @return - * is returned with only MTOMFeature set resolving the various precendece rules - */ - private static WSBinding createBinding(String ddBindingId, Class implClass, String mtomEnabled, String mtomThreshold) - { - // Features specified through DD - WebServiceFeatureList features; - - MTOMFeature mtomfeature = null; - if (mtomEnabled != null) - { - if (mtomThreshold != null) - mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold)); - else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled)); - } - - BindingID bindingID; - if (ddBindingId != null) - { - bindingID = BindingID.parse(ddBindingId); - features = bindingID.createBuiltinFeatureList(); - - if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature)) - { - throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled)); - } - } - else - { - bindingID = BindingID.parse(implClass); - // Since bindingID is coming from implclass, - // mtom through Feature annotation or DD takes precendece - - features = new WebServiceFeatureList(); - if (mtomfeature != null) - features.add(mtomfeature); // this wins over MTOM setting in bindingID - features.addAll(bindingID.createBuiltinFeatureList()); - } - - return bindingID.createBinding(features.toArray()); - } - - private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs) - { - if (lhs == null || rhs == null) - return false; - return lhs.isEnabled() ^ rhs.isEnabled(); - } - - /** - * JSR-109 defines short-form tokens for standard binding Ids. These are - * used only in DD. So stand alone deployment descirptor should also honor - * these tokens. This method converts the tokens to API's standard - * binding ids - * - * @param lexical binding attribute value from DD. Always not null - * - * @return returns corresponding API's binding ID or the same lexical - */ - public static @NotNull - String getBindingIdForToken(@NotNull - String lexical) - { - if (lexical.equals("##SOAP11_HTTP")) - { - return SOAPBinding.SOAP11HTTP_BINDING; - } - else if (lexical.equals("##SOAP11_HTTP_MTOM")) - { - return SOAPBinding.SOAP11HTTP_MTOM_BINDING; - } - else if (lexical.equals("##SOAP12_HTTP")) - { - return SOAPBinding.SOAP12HTTP_BINDING; - } - else if (lexical.equals("##SOAP12_HTTP_MTOM")) - { - return SOAPBinding.SOAP12HTTP_MTOM_BINDING; - } - else if (lexical.equals("##XML_HTTP")) - { - return HTTPBinding.HTTP_BINDING; - } - return lexical; - } - - /** - * Checks the deployment descriptor or {@link @WebServiceProvider} annotation - * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}. - * - * @return - * The pointed WSDL, if any. Otherwise null. - */ - private SDDocumentSource getPrimaryWSDL(XMLStreamReader xsr, Attributes attrs, Class<?> implementorClass) - { - - String wsdlFile = getAttribute(attrs, ATTR_WSDL); - if (wsdlFile == null) - { - wsdlFile = EndpointFactory.getWsdlLocation(implementorClass); - } - - if (wsdlFile != null) - { - if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR)) - { - logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL."); - return null; - } - - URL wsdl; - try - { - wsdl = loader.getResource('/' + wsdlFile); - } - catch (MalformedURLException e) - { - throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), e, xsr); - } - if (wsdl == null) - { - throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr); - } - SDDocumentSource docInfo = docs.get(wsdl.toExternalForm()); - assert docInfo != null; - return docInfo; - } - - return null; - } - - /** - * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}. - */ - private EntityResolver createEntityResolver() - { - try - { - return XmlUtil.createEntityResolver(loader.getCatalogFile()); - } - catch (MalformedURLException e) - { - throw new WebServiceException(e); - } - } - - protected String getAttribute(Attributes attrs, String name) - { - String value = attrs.getValue(name); - if (value != null) - { - value = value.trim(); - } - return value; - } - - protected QName getQNameAttribute(Attributes attrs, String name) - { - String value = getAttribute(attrs, name); - if (value == null || value.equals("")) - { - return null; - } - else - { - return QName.valueOf(value); - } - } - - protected String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name) - { - String value = getAttribute(attrs, name); - if (value != null && value.equals("")) - { - failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); - } - return value; - } - - protected String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name) - { - String value = getAttribute(attrs, name); - if (value == null) - { - failWithLocalName("runtime.parser.missing.attribute", reader, name); - } - return value; - } - - protected String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name) - { - String value = getAttribute(attributes, name); - if (value == null) - { - failWithLocalName("runtime.parser.missing.attribute", reader, name); - } - else if (value.equals("")) - { - failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); - } - return value; - } - - /** - * Parses the handler and role information and sets it - * on the {@link WSBinding}. - * @return true if <handler-chains> element present in DD - * false otherwise. - */ - protected boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName) - { - - if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS)) - { - - return false; - } - - HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding); - - binding.setHandlerChain(handlerInfo.getHandlers()); - if (binding instanceof SOAPBinding) - { - ((SOAPBinding)binding).setRoles(handlerInfo.getRoles()); - } - - // move past </handler-chains> - XMLStreamReaderUtil.nextContent(reader); - return true; - } - - protected static void ensureNoContent(XMLStreamReader reader) - { - if (reader.getEventType() != XMLStreamConstants.END_ELEMENT) - { - fail("runtime.parser.unexpectedContent", reader); - } - } - - protected static void fail(String key, XMLStreamReader reader) - { - logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber()); - throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber())); - } - - protected static void failWithFullName(String key, XMLStreamReader reader) - { - throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName()); - } - - protected static void failWithLocalName(String key, XMLStreamReader reader) - { - throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName()); - } - - protected static void failWithLocalName(String key, XMLStreamReader reader, String arg) - { - throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg); - } - - protected Class loadClass(String name) - { - try - { - return Class.forName(name, true, classLoader); - } - catch (ClassNotFoundException e) - { - logger.log(Level.SEVERE, e.getMessage(), e); - throw new ServerRtException("runtime.parser.classNotFound", name); - } - } - - /** - * Loads the class of the given name. - * - * @param xsr - * Used to report the source location information if there's any error. - */ - private Class getImplementorClass(String name, XMLStreamReader xsr) - { - try - { - return Class.forName(name, true, classLoader); - } - catch (ClassNotFoundException e) - { - logger.log(Level.SEVERE, e.getMessage(), e); - throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, xsr); - } - } - - public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime"; - - public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl"; - - public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints"); - public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint"); - - public static final String ATTR_VERSION = "version"; - public static final String ATTR_NAME = "name"; - public static final String ATTR_IMPLEMENTATION = "implementation"; - public static final String ATTR_WSDL = "wsdl"; - public static final String ATTR_SERVICE = "service"; - public static final String ATTR_PORT = "port"; - public static final String ATTR_URL_PATTERN = "url-pattern"; - public static final String ATTR_ENABLE_MTOM = "enable-mtom"; - public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value"; - public static final String ATTR_BINDING = "binding"; - - public static final String ATTRVALUE_VERSION_1_0 = "2.0"; - private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserJBWS.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DeploymentDescriptorParserJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.net.MalformedURLException; - -import javax.ejb.Stateless; - -import com.sun.xml.ws.api.server.Container; -import com.sun.xml.ws.api.server.InstanceResolver; -import com.sun.xml.ws.api.server.Invoker; -import com.sun.xml.ws.transport.http.ResourceLoader; -import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; - -/** - * A copy of DeploymentDescriptorParser that externalizes - * - * createInvoker(Class) - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A> -{ - public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException - { - super(cl, loader, container, adapterFactory); - } - - @Override - protected Invoker createInvoker(Class<?> implClass) - { - Invoker invoker; - InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass); - if (implClass.isAnnotationPresent(Stateless.class)) - { - invoker = new InvokerEJB3(resolver); - } - else - { - invoker = new InvokerJSE(resolver); - } - return invoker; - } - -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointAssociation.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointAssociation.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointAssociation.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * Associates the endpoint meta data with the current thead. - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public final class EndpointAssociation -{ - private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>(); - - public static void setEndpoint(Endpoint ep) - { - endpoint.set(ep); - } - - public static Endpoint getEndpoint() - { - return endpoint.get(); - } - - public static void removeEndpoint() - { - endpoint.remove(); - } -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,111 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.xml.ws.Provider; -import javax.xml.ws.WebServiceException; - -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.EndpointInvocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -import com.sun.istack.NotNull; -import com.sun.xml.ws.api.message.Packet; -import com.sun.xml.ws.api.server.InstanceResolver; -import com.sun.xml.ws.api.server.Invoker; -import com.sun.xml.ws.api.server.WSEndpoint; -import com.sun.xml.ws.api.server.WSWebServiceContext; - -/** - * An invoker for EJB3 endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class InvokerEJB3 extends Invoker -{ - private final InstanceResolver resolver; - - public InvokerEJB3(InstanceResolver resolver) - { - this.resolver = resolver; - } - - @Override - public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) - { - resolver.start(wsc, endpoint); - } - - @Override - public void dispose() - { - resolver.dispose(); - } - - @Override - public <T> T invokeProvider(@NotNull Packet p, T arg) - { - Object targetBean = resolver.resolve(p); - return ((Provider<T>)targetBean).invoke(arg); - } - - @Override - public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException - { - Endpoint ep = EndpointAssociation.getEndpoint(); - - InvocationHandler invHandler = ep.getInvocationHandler(); - EndpointInvocation inv = invHandler.createInvocation(); - inv.setJavaMethod(m); - inv.setArgs(args); - - Object retObj = null; - try - { - invHandler.invoke(ep, null, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } - - return retObj; - } - - private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException - { - if (ex instanceof InvocationTargetException) - throw (InvocationTargetException)ex; - - if (ex instanceof IllegalAccessException) - throw (IllegalAccessException)ex; - - throw new WebServiceException(ex); - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,115 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.xml.ws.Provider; -import javax.xml.ws.WebServiceException; - -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.EndpointInvocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -import com.sun.istack.NotNull; -import com.sun.xml.ws.api.message.Packet; -import com.sun.xml.ws.api.server.InstanceResolver; -import com.sun.xml.ws.api.server.Invoker; -import com.sun.xml.ws.api.server.WSEndpoint; -import com.sun.xml.ws.api.server.WSWebServiceContext; - -/** - * An invoker for JSE endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class InvokerJSE extends Invoker -{ - private final InstanceResolver resolver; - - public InvokerJSE(InstanceResolver resolver) - { - this.resolver = resolver; - } - - @Override - public void start(@NotNull - WSWebServiceContext wsc, @NotNull - WSEndpoint endpoint) - { - resolver.start(wsc, endpoint); - } - - @Override - public void dispose() - { - resolver.dispose(); - } - - @Override - public <T> T invokeProvider(@NotNull - Packet p, T arg) - { - Object targetBean = resolver.resolve(p); - return ((Provider<T>)targetBean).invoke(arg); - } - - @Override - public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException - { - Endpoint ep = EndpointAssociation.getEndpoint(); - - InvocationHandler invHandler = ep.getInvocationHandler(); - EndpointInvocation inv = invHandler.createInvocation(); - inv.setJavaMethod(m); - inv.setArgs(args); - - Object retObj = null; - try - { - Object targetBean = resolver.resolve(p); - invHandler.invoke(ep, targetBean, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } - - return retObj; - } - - private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException - { - if (ex instanceof InvocationTargetException) - throw (InvocationTargetException)ex; - - if (ex instanceof IllegalAccessException) - throw (IllegalAccessException)ex; - - throw new WebServiceException(ex); - } -} Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -23,36 +23,24 @@ //$Id$ -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.metadata.web.ParamValue.ParamType; import org.jboss.wsf.spi.deployment.AbstractDeployer; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDEndpoints; +import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; /** * A deployer that modifies the web.xml meta data * * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 + * @since 21-Mai-2007 */ public class ModifyWebMetaDataDeployer extends AbstractDeployer { - private String listenerClass; private String servletClass; - public String getListenerClass() - { - return listenerClass; - } - - public void setListenerClass(String listenerClass) - { - this.listenerClass = listenerClass; - } - public String getServletClass() { return servletClass; @@ -69,19 +57,15 @@ WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { - Listener listener = new Listener(); - listener.setListenerClass(listenerClass); - webMetaData.addListener(listener); + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) + throw new IllegalStateException("Cannot obtain services.xml meta data"); - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); - if (ddSunJaxws == null) - throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - // Add the path to sun-jaxws.xml ParamValue ctxParam = new ParamValue(); ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); - ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); + ctxParam.setName(XFireConfigurableServletJBWS.PARAM_XFIRE_SERVICES_URL); + ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); webMetaData.addContextParam(ctxParam); for (Servlet servlet : webMetaData.getServlets()) @@ -106,10 +90,10 @@ @Override public void destroy(Deployment dep) { - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); - if (ddSunJaxws != null) + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans != null) { - ddSunJaxws.destroyFileURL(); + ddbeans.destroyFileURL(); } } Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -31,7 +31,6 @@ 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; @@ -39,14 +38,11 @@ import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.RequestHandler; -import com.sun.xml.ws.transport.http.servlet.WSServlet; -import com.sun.xml.ws.transport.http.servlet.WSServletDelegate; - /** * A request handler * * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 + * @since 21-Mai-2007 */ public class RequestHandlerImpl implements RequestHandler { @@ -55,31 +51,7 @@ public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { - WSServletDelegate delegate = (WSServletDelegate)context.getAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); - if (delegate == null) - throw new IllegalStateException("Cannot obtain servlet delegate"); - - 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); - } + throw new NotImplementedException(); } public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletResourceLoader.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletResourceLoader.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Set; - -import javax.servlet.ServletContext; - -import com.sun.xml.ws.transport.http.ResourceLoader; - -/** - * {@link ResourceLoader} backed by {@link ServletContext}. - * - * TDI: A copy of the original that is public - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - */ -public 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); - } -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/SunJaxwsDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/SunJaxwsDeployer.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/SunJaxwsDeployer.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDEndpoint; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDEndpoints; - -/** - * A deployer that generates sun-jaxws.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class SunJaxwsDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - DDEndpoints dd = new DDEndpoints(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String epName = ep.getShortName(); - String targetBean = ep.getTargetBean(); - String urlPattern = ep.getURLPattern(); - - DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern); - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } - dep.getContext().addAttachment(DDEndpoints.class, dd); - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/VirtualFileResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/VirtualFileResourceLoader.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/VirtualFileResourceLoader.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,94 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -//$Id$ - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.virtual.VirtualFile; - -import com.sun.xml.ws.transport.http.ResourceLoader; - -/** - * A ResourceLoader that delegates to the VFS - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class VirtualFileResourceLoader implements ResourceLoader -{ - private final VirtualFile vfRoot; - - public VirtualFileResourceLoader(VirtualFile vfRoot) - { - this.vfRoot = vfRoot; - } - - public URL getResource(String path) throws MalformedURLException - { - if (path.startsWith("/")) - path = path.substring(1); - - URL resURL = null; - try - { - VirtualFile vfChild = vfRoot.findChild(path); - resURL = vfChild.toURL(); - } - catch (Exception ex) - { - // ignore - } - return resURL; - } - - public URL getCatalogFile() throws MalformedURLException - { - return getResource("/WEB-INF/jax-ws-catalog.xml"); - } - - public Set<String> getResourcePaths(String path) - { - if (path.startsWith("/")) - path = path.substring(1); - - Set<String> paths = new HashSet<String>(); - try - { - VirtualFile vfChild = vfRoot.findChild(path); - for (VirtualFile vf : vfChild.getChildren()) - { - String name = vf.getName(); - paths.add(name); - } - } - catch (Exception ex) - { - // ignore - } - return paths; - } -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSEndpointServletJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSEndpointServletJBWS.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSEndpointServletJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $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.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * The JAX-WS dispatcher servlet. - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSEndpointServletJBWS 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); - } - - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** 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); - } - } -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerExt.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerExt.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerExt.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,187 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.net.MalformedURLException; -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.AdapterFactory; -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; - -/** - * A copy of WSServletContextListener that externalizes - * - * getDeploymentDescriptorURL() - * createDeploymentDescriptorParser() - * - * @author WS Development Team - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class WSServletContextListenerExt implements ServletContextAttributeListener, ServletContextListener -{ - 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 - DeploymentDescriptorParserExt<ServletAdapter> parser = createDeploymentDescriptorParser(classLoader, container, resourceLoader, adapterList); - - URL sunJaxWsXml = getDeploymentDescriptorURL(context); - 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); - } - } - - /** - * Externalized for integration - */ - protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, - ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException - { - DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserExt<ServletAdapter>(classLoader, resourceLoader, container, adapterList); - return parser; - } - - /** - * Externalized for integration - */ - protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException - { - URL sunJaxWsXml = context.getResource(JAXWS_RI_RUNTIME); - return sunJaxWsXml; - } - - /** - * Provides access to {@link ServletContext} via {@link Container}. Pipes - * can get ServletContext from Container and use it to load some resources. - */ - 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; - } - } - - protected 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"); -} Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerJBWS.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WSServletContextListenerJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire; - -// $Id$ - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.servlet.ServletContext; -import javax.xml.ws.WebServiceException; - -import com.sun.xml.ws.resources.WsservletMessages; -import com.sun.xml.ws.transport.http.HttpAdapter; -import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; - -/** - * 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 Thomas.Diesler(a)jboss.org - * @since 18-May-2007 - */ -public class WSServletContextListenerJBWS extends WSServletContextListenerExt -{ - public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; - - /** - * Fall back to the 'jbossws-sun-jaxws-url' init parameter for the URL location - * of sun-jaxws.xml - */ - @Override - protected URL getDeploymentDescriptorURL(ServletContext context) throws MalformedURLException - { - URL sunJaxWsXml = super.getDeploymentDescriptorURL(context); - if (sunJaxWsXml == null) - { - String urlStr = context.getInitParameter(PARAM_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)); - - return sunJaxWsXml; - } - - /** - * Externalized for integration - */ - @Override - protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser(ClassLoader classLoader, ServletContainer container, - ServletResourceLoader resourceLoader, AdapterFactory<ServletAdapter> adapterList) throws MalformedURLException - { - DeploymentDescriptorParserExt<ServletAdapter> parser = new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList); - return parser; - } -} Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -28,32 +28,21 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; -import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDEndpoints; +import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; /** * Modifies web.xml for jbossws * * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2006 + * @since 21-May-2006 */ public class WebAppDesciptorModifierImpl implements WebAppDesciptorModifier { // logging support private static Logger log = Logger.getLogger(WebAppDesciptorModifierImpl.class); - private String listenerClass; private String servletClass; - public String getListenerClass() - { - return listenerClass; - } - - public void setListenerClass(String listenerClass) - { - this.listenerClass = listenerClass; - } - public String getServletClass() { return servletClass; @@ -70,15 +59,13 @@ Element root = webXml.getRootElement(); - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); - if (ddSunJaxws == null) + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - + Element contextParam = root.addElement("context-param"); - contextParam.addElement("param-name").addText(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); - contextParam.addElement("param-value").addText(ddSunJaxws.createFileURL().toExternalForm()); - - root.addElement("listener").addElement("listener-class").addText(listenerClass); + contextParam.addElement("param-name").addText(XFireConfigurableServletJBWS.PARAM_XFIRE_SERVICES_URL); + contextParam.addElement("param-value").addText(ddbeans.createFileURL().toExternalForm()); for (Iterator it = root.elementIterator("servlet"); it.hasNext();) { Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,72 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import java.net.URL; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.codehaus.xfire.XFire; +import org.codehaus.xfire.transport.http.XFireConfigurableServlet; + +/** + * An extension to the XFire servlet + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class XFireConfigurableServletJBWS extends XFireConfigurableServlet +{ + public static final String PARAM_XFIRE_SERVICES_URL = "jbossws.xfire.services.url"; + + private final static String CONFIG_FILE = "/WEB-INF/classes/META-INF/xfire/services.xml"; + + public XFire createXFire() throws ServletException + { + XFire xfire; + try + { + // #1 Load services.xml from default location + ServletContext context = getServletContext(); + URL servicesURL = context.getResource(CONFIG_FILE); + + // #1 Load services.xml from init parameter + if (servicesURL == null) + { + String paramValue = context.getInitParameter(PARAM_XFIRE_SERVICES_URL); + if (paramValue != null) + servicesURL = new URL(paramValue); + } + + xfire = loadConfig(servicesURL.getFile()); + } + catch (Exception e) + { + throw new ServletException(e); + } + + return xfire; + } +} Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireConfigurableServletJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java (from rev 3156, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/SunJaxwsDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeployer.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,55 @@ +/* + * 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.wsf.stack.xfire; + +//$Id$ + +import org.jboss.wsf.spi.deployment.AbstractDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDBeans; +import org.jboss.wsf.stack.xfire.metadata.sunjaxws.DDService; + +/** + * A deployer that generates xfire services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class XFireServicesDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String epName = ep.getShortName(); + String targetBean = ep.getTargetBean(); + + DDService ddser = new DDService(epName, targetBean); + log.info("Add " + ddser); + dd.addService(ddser); + } + dep.getContext().addAttachment(DDBeans.class, dd); + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDBeans.java (from rev 3156, branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java) =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDBeans.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDBeans.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,102 @@ +/* + * 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.wsf.stack.xfire.metadata.sunjaxws; + +//$Id$ + +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.wsf.spi.deployment.WSDeploymentException; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; + +//$Id$ + +/** + * Metadata model for xfire services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBeans +{ + private List<DDService> services = new ArrayList<DDService>(); + private File tmpFile; + + public List<DDService> getServices() + { + return services; + } + + public void addService(DDService service) + { + services.add(service); + } + + public URL createFileURL() + { + destroyFileURL(); + + ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); + try + { + tmpFile = File.createTempFile("jbossws-xfire-services", ".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("<beans xmlns='http://xfire.codehaus.org/config/1.0'>"); + for (DDService service : services) + { + service.writeTo(writer); + } + writer.write("</beans>"); + } + +} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoint.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoint.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,192 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDEndpoints.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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.wsf.spi.deployment.WSDeploymentException; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandler.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandler.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandler.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Deleted: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandlerChain.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDHandlerChain.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.xfire.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 Added: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java (rev 0) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -0,0 +1,117 @@ +/* + * 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.wsf.stack.xfire.metadata.sunjaxws; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for services.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDService +{ + // This will be the name of the service as exposed to the world. Required. + private String name; + // The class name of the object you wish to make into a service. Required. + private String serviceClass; + // The class name of the implementation which you wish to use when the service is invoked. Optional. + private String implementationClass; + // The ServiceFactory controls how the Service is built and configured. Optional. + private String serviceFactory; + // The invoker element is optional. It can be used to set a non-default Invoker for a service. + private String invoker; + + public DDService(String name, String serviceClass) + { + this.name = name; + this.serviceClass = serviceClass; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getServiceClass() + { + return serviceClass; + } + + public void setServiceClass(String serviceClass) + { + this.serviceClass = serviceClass; + } + + public String getImplementationClass() + { + return implementationClass; + } + + public void setImplementationClass(String implementationClass) + { + this.implementationClass = implementationClass; + } + + public String getServiceFactory() + { + return serviceFactory; + } + + public void setServiceFactory(String serviceFactory) + { + this.serviceFactory = serviceFactory; + } + + public String getInvoker() + { + return invoker; + } + + public void setInvoker(String invoker) + { + this.invoker = invoker; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<service>"); + writer.write(" <name>" + name + "</name>"); + writer.write(" <serviceClass>" + serviceClass + "</serviceClass>"); + if (implementationClass != null) + writer.write(" <implementationClass>" + implementationClass + "</implementationClass>"); + if (serviceFactory != null) + writer.write(" <serviceFactory>" + serviceFactory + "</serviceFactory>"); + if (invoker != null) + writer.write(" <invoker>" + invoker + "</invoker>"); + writer.write("</service>"); + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/sunjaxws/DDService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-21 10:53:58 UTC (rev 3162) @@ -91,7 +91,7 @@ <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSContextRootDeployer"/> <inject bean="WSURLPatternDeployer"/> - <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSXFireServicesDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> </list> </property> @@ -102,7 +102,7 @@ <inject bean="WSUnifiedDeploymentInfoDeployer"/> <inject bean="WSContextRootDeployer"/> <inject bean="WSURLPatternDeployer"/> - <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSXFireServicesDeployer"/> <inject bean="WSWebAppGeneratorDeployer"/> <inject bean="WSWebAppDeployerDeployer"/> </list> @@ -138,10 +138,8 @@ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire.ModifyWebMetaDataDeployer"> - <property name="listenerClass"><inject bean="WSWebAppDesciptorModifier" property="listenerClass"/></property> <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> </bean> - <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.xfire.SunJaxwsDeployer"/> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> @@ -151,13 +149,13 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> <property name="mainDeployer"><inject bean="MainDeployer"/></property> </bean> + <bean name="WSXFireServicesDeployer" class="org.jboss.wsf.stack.xfire.XFireServicesDeployer"/>  <bean name="WSSecurityRolesHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB21"/> <bean name="WSSecurityRolesHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityRolesHandlerEJB3"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.xfire.WebAppDesciptorModifierImpl"> - <property name="listenerClass">org.jboss.wsf.stack.xfire.WSServletContextListenerJBWS</property> - <property name="servletClass">org.jboss.wsf.stack.xfire.WSEndpointServletJBWS</property> + <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletJBWS</property> </bean> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> Modified: branches/tdiesler/trunk/integration/xfire/version.properties =================================================================== --- branches/tdiesler/trunk/integration/xfire/version.properties 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/integration/xfire/version.properties 2007-05-21 10:53:58 UTC (rev 3162) @@ -4,6 +4,7 @@ sunri.implementation.title=JBoss Web Services - JBossWS/SunRI # Thirdparty library versions +ibm-wsdl4j=1.6.2 jboss-jaxr=1.2.0.GA jboss-jbossws-spi=SNAPSHOT jboss-security-spi=2.0.0.Beta Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -24,6 +24,7 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.Service; import junit.framework.Test; @@ -49,8 +50,8 @@ { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); @@ -61,8 +62,8 @@ { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earjse/JSEBean?wsdl"); QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); String helloWorld = "Hello world!"; String retObj = port.echo(helloWorld); Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 09:47:16 UTC (rev 3161) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 10:53:58 UTC (rev 3162) @@ -8,7 +8,6 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; /** @@ -53,15 +52,15 @@ } /** + * TDI: commented out because WebServiceFeature is not part of xfire-jsr181-api (xfire-1.2.6) * * @param features * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. * @return * returns TestEndpoint - */ @WebEndpoint(name = "TestEndpointPort") public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class, features); } - + */ }

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3161 - branches/jbossws-2.0/jbossws-tests.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-21 05:47:16 -0400 (Mon, 21 May 2007) New Revision: 3161 Modified: branches/jbossws-2.0/jbossws-tests/build.xml Log: Fix haltonfailure Modified: branches/jbossws-2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-21 09:46:44 UTC (rev 3160) +++ branches/jbossws-2.0/jbossws-tests/build.xml 2007-05-21 09:47:16 UTC (rev 3161) @@ -466,7 +466,7 @@ According to our commit policy, haltonfailure MUST be be true for tests-samples. It is a prerequisite for any commit that this target passes without failure. --> - <param name="haltonfailure" value="true"/> + <param name="haltonfailure" value="${haltonfailure}"/> </antcall> <antcall target="tests-report"/> </target>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3160 - branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-21 05:46:44 -0400 (Mon, 21 May 2007) New Revision: 3160 Modified: branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml Log: Add chunked encoding to default configuration Modified: branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-05-21 09:45:25 UTC (rev 3159) +++ branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-05-21 09:46:44 UTC (rev 3160) @@ -8,6 +8,10 @@ <client-config> <config-name>Standard Client</config-name> <feature>http://org.jboss.ws/dispatch/validate</feature> + <property> + <property-name>http://org.jboss.ws/http#chunksize</property-name> + <property-value>2048</property-value> + </property> </client-config> <client-config> @@ -20,7 +24,7 @@ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> </javaee:handler> </javaee:handler-chain> - </post-handler-chains> + </post-handler-chains> </client-config> <client-config>

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3159 - branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-21 05:45:25 -0400 (Mon, 21 May 2007) New Revision: 3159 Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java Log: Fix addressing samples Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-21 09:44:43 UTC (rev 3158) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-21 09:45:25 UTC (rev 3159) @@ -67,7 +67,7 @@ List<Handler> customHandlerChain = new ArrayList<Handler>(); customHandlerChain.add(new ClientHandler()); - //customHandlerChain.add(new WSAddressingClientHandler()); + customHandlerChain.add(new WSAddressingClientHandler()); bindingProvider.getBinding().setHandlerChain(customHandlerChain); Service service2 = Service.create(wsdlURL, serviceName); @@ -75,7 +75,7 @@ bindingProvider = (BindingProvider)port2; List<Handler> customHandlerChain2 = new ArrayList<Handler>(); customHandlerChain2.add(new ClientHandler()); - //customHandlerChain2.add(new WSAddressingClientHandler()); + customHandlerChain2.add(new WSAddressingClientHandler()); bindingProvider.getBinding().setHandlerChain(customHandlerChain2); } Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-21 09:44:43 UTC (rev 3158) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-21 09:45:25 UTC (rev 3159) @@ -61,7 +61,7 @@ String clientid = null; EndpointReference replyTo = addrProps.getReplyTo(); - ReferenceParameters refParams = replyTo.getReferenceParameters(); + ReferenceParameters refParams = replyTo!=null ? replyTo.getReferenceParameters() : null; if (refParams != null) { for (Object obj : refParams.getElements())

18 years, 11 months

1
0
0 / 0

JBossWS SVN: r3158 - in branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws: metadata/config and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-21 05:44:43 -0400 (Mon, 21 May 2007) New Revision: 3158 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/EndpointProperty.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: Chunked encoding can be configured through configuration property Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-21 08:57:27 UTC (rev 3157) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-21 09:44:43 UTC (rev 3158) @@ -29,10 +29,8 @@ import org.jboss.remoting.marshal.MarshalFactory; import org.jboss.remoting.marshal.Marshaller; import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.MessageTrace; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.WSTimeoutException; +import org.jboss.ws.core.*; +import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.metadata.config.EndpointProperty; import javax.xml.rpc.Stub; @@ -49,8 +47,13 @@ import java.util.Properties; /** - * SOAPConnection implementation + * SOAPConnection implementation. + * <p/> * + * Per default HTTP 1.1 chunked encoding is used. + * This may be ovverriden through {@link org.jboss.ws.metadata.config.EndpointProperty#CHUNKED_ENCODING_SIZE}. + * A chunksize value of zero disables chunked encoding. + * * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> * @@ -99,8 +102,8 @@ clientConfig.put(Client.ENABLE_LEASE, false); // Enable chunked encoding - // TODO: make this configurable through an endoint property - clientConfig.put("chunkedLength", "2048"); + // This is the default size. May be overridden through endpoint config + clientConfig.put("chunkedLength", "1024"); } public boolean isClosed() @@ -154,8 +157,11 @@ // setup remoting client Map<String, Object> metadata = createRemotingMetaData(reqMessage, callProps); - Client client = createRemotingClient(endpoint, targetAddress, oneway); + Client client = createRemotingClient(endpoint, targetAddress, oneway); + // remoting props may come from client config as well + mergeConfigContribution(); + try { if (log.isDebugEnabled()) @@ -199,6 +205,25 @@ } } + private void mergeConfigContribution() + { + // check for config property contribution + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if(msgContext!=null) + { + Properties epmdProps = msgContext.getEndpointMetaData().getProperties(); + if(epmdProps.containsKey(EndpointProperty.CHUNKED_ENCODING_SIZE)) + { + String chunkSizeValue = epmdProps.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE); + int chunkSize = Integer.valueOf(chunkSizeValue); + if(chunkSize>0) + clientConfig.put(EndpointProperty.CHUNKED_ENCODING_SIZE, chunkSizeValue); + else + clientConfig.remove(EndpointProperty.CHUNKED_ENCODING_SIZE); + } + } + } + private String addURLParameter(String url, String key, String value) { int qmIndex = url.indexOf("?"); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/EndpointProperty.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/EndpointProperty.java 2007-05-21 08:57:27 UTC (rev 3157) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/EndpointProperty.java 2007-05-21 09:44:43 UTC (rev 3158) @@ -32,6 +32,11 @@ { public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; + /** + * Set to 0 in order to disable chunked encoding + */ + public final static String CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize"; + public URI name; public String value; Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-21 08:57:27 UTC (rev 3157) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-21 09:44:43 UTC (rev 3158) @@ -682,6 +682,15 @@ JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile()); + // arbitrary endpoint properties + for(EndpointProperty p: config.getProperties()) + { + getProperties().put(p.name.toString(), p.value); + } + + // TODO: add features as well. + + // setup handler chains reconfigHandlerMetaData(); }

18 years, 11 months

1
0
0 / 0

← Newer
1
...
16
17
18
19
20
21
22
...
40
Older →

Jump to page:

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