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> - <!-- Build jbosswsri-deployer --> + <!-- Build jbossws-sunri50-deployer --> <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> - <!-- Build jbosswsri50-src.zip --> + <!-- Build jbossws-sunri50-src.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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/xfire to jboss50 --> - <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> - - <!-- Remove jbossws/xfire from jboss50 --> - <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/xfire to jboss50 --> + <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> + + <!-- Remove jbossws/xfire from jboss50 --> + <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- Release to jboss.local.repository --> - <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- Release to jboss.local.repository --> + <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"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<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"/> - - <!-- - Run tests against jboss50 - --> - <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> - - <!-- - Run tests against jboss42 - --> - <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> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="tests-prepare,thirdparty"> - - <!-- - Cannot use XFire client - [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap - --> - - <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> - - <!-- The combined compile classpath --> - <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> - - <!-- The test client classpath --> - <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> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <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> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <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"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<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"/> + + <!-- + Run tests against jboss50 + --> + <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> + + <!-- + Run tests against jboss42 + --> + <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> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <!-- + Init the various classpaths + --> + <target name="tests-init" depends="tests-prepare,thirdparty"> + + <!-- + Cannot use XFire client + [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap + --> + + <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> + + <!-- The combined compile classpath --> + <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> + + <!-- The test client classpath --> + <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> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <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> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <property file="${int.xfire.dir}/version.properties"/> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - <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> - - <!-- - thirdpartry-get - --> - <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"> - - <!-- The compile classpath for jboss50 integration --> - <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <property file="${int.xfire.dir}/version.properties"/> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + + <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> + + <!-- + thirdpartry-get + --> + <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"> + + <!-- The compile classpath for jboss50 integration --> + <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<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"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <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"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <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> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - - <!-- Compile java sources --> - <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> - - <!-- Compile etc files (manifests and such) --> - <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> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> - </target> - - <!-- - | Build all jar files. - --> - <target name="jars-jboss50" depends="compile"> - - <!-- Build jbossws-xfire50.jar --> - <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> - - <!-- Build jbossws-context.war --> - <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> - - <!-- Build jbosswsri.sar --> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> - <!-- [JBAS-4379] MC beans deployed twice because of jacc service - <fileset dir="${xfire.output.lib.dir}"> - <include name="jbossws-context.war"/> - </fileset> - --> - <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> - - <!-- Build jbossws-xfire50-deployer --> - <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> - - <!-- Build jbossws-xfire50-src.zip --> - <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > - <fileset dir="${xfire.java.dir}"/> - </zip> - - </target> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<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"/> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <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"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <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> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + + <!-- Compile java sources --> + <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> + + <!-- Compile etc files (manifests and such) --> + <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> + + <!-- ================================================================== --> + <!-- Archives --> + <!-- ================================================================== --> + + <!-- + | Build all jar files. + --> + <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> + </target> + + <!-- + | Build all jar files. + --> + <target name="jars-jboss50" depends="compile"> + + <!-- Build jbossws-xfire50.jar --> + <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> + + <!-- Build jbossws-context.war --> + <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> + + <!-- Build jbosswsri.sar --> + <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> + <!-- [JBAS-4379] MC beans deployed twice because of jacc service + <fileset dir="${xfire.output.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + --> + <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> + + <!-- Build jbossws-xfire50-deployer --> + <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> + + <!-- Build jbossws-xfire50-src.zip --> + <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > + <fileset dir="${xfire.java.dir}"/> + </zip> + + </target> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <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=&quot;@repository.id(a)&quot; - 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=&quot;@repository.id(a)&quot; + 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> - - <!-- - <security-domain>java:/jaas/jbossws</security-domain> - --> - <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> + + <!-- + <security-domain>java:/jaas/jbossws</security-domain> + --> + <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"?> - -<!-- - A web application that installs the JBossWS servlets - - $Id$ ---> - -<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> - - <!-- now the mappings --> - - <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> - - <!-- - currently the W3C haven't settled on a media type for WSDL; - http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft - for now we go with the basic 'it's XML' response - --> - <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"?> + +<!-- + A web application that installs the JBossWS servlets + + $Id$ +--> + +<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> + + <!-- now the mappings --> + + <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> + + <!-- + currently the W3C haven't settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response + --> + <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="depends">View installed dependencies</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&l... - <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html&qu... 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&... forum</a></li> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> - <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users"&g... 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=JBWSFAQSourceReposito... 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="depends">View installed dependencies</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&l... + <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html&qu... 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&... forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users"&g... 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=JBWSFAQSourceReposito... 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"> - - <!-- - A web service deployer that hooks in after the EJB deployers - --> - <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> - - <!-- - A web service deployer that hooks in before the WAR deployer - --> - <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> - - <!-- - A web service deployer that hooks in after the web service WAR/EJB deployers - --> - <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"> + + <!-- + A web service deployer that hooks in after the EJB deployers + --> + <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> + + <!-- + A web service deployer that hooks in before the WAR deployer + --> + <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> + + <!-- + A web service deployer that hooks in after the web service WAR/EJB deployers + --> + <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"> - - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig"> - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - </bean> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/> - - <!-- Bind Service objects in client environment context --> - <!-- The bean name is compiled into the server. Changeit with the next release. --> - <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/--> - - <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <!-- - ********************************************************************************************************************* - Web Service deployment - - There are three deployers registered with the JBoss Main Deployer. - The order of which is important - - 1) EJBDeployer < WebServiceDeployerEJB - 2) WebServiceDeployerJSE < WarDeployer - 3) WebServiceMainDeployer - - Each WebServiceDeployer has a number of DeployerHooks registerd with it - - - WebServiceDeployerEJB - - WSDeployerHook_JAXRPC_EJB21 - - WSDeployerHook_JAXWS_EJB3 - - - WebServiceDeployerJSE - - WSDeployerHook_JAXRPC_JSE - - WSDeployerHook_JAXWS_JSE - - - WebServiceMainDeployer - - WSMainDeployerHook - - Conceptually, each of these hooks implements the following pattern: - - DployerHook.deploy(unit) - if(isWebServiceDeployment) - Deployment dep = createDeployment(unit) - DeployerManager.deploy(dep) - - DeployerHook.undeploy(unit) - Deployment dep = getDeployment(unit) - DeployerManager.undeploy(dep) - - Each deployer hook has a web service DeployerManager injected into it. - A web service DeployerManager maintains a list of Deployers, each of which - handles a single aspect of web service deployment. - - Finally, each Endpoint is registered with the EndpointRegistry. - - ********************************************************************************************************************* - --> - - <!-- - Each DeploymentManger maintains a list of Deployers - Each Deployer handles a single aspect of web service deployment. - --> - <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> - - <!-- - The Deployers - Each handles a single aspect of web service deployment - --> - <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> - - <!-- Deployer helper beans --> - <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> - - <!-- - Register DeployerHooks with JBoss deployers - --> - <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"> + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig"> + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + </bean> + + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/> + + <!-- Bind Service objects in client environment context --> + <!-- The bean name is compiled into the server. Changeit with the next release. --> + <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/--> + + <!-- Locate the single instance of the kernel --> + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <!-- + ********************************************************************************************************************* + Web Service deployment + + There are three deployers registered with the JBoss Main Deployer. + The order of which is important + + 1) EJBDeployer < WebServiceDeployerEJB + 2) WebServiceDeployerJSE < WarDeployer + 3) WebServiceMainDeployer + + Each WebServiceDeployer has a number of DeployerHooks registerd with it + + - WebServiceDeployerEJB + - WSDeployerHook_JAXRPC_EJB21 + - WSDeployerHook_JAXWS_EJB3 + + - WebServiceDeployerJSE + - WSDeployerHook_JAXRPC_JSE + - WSDeployerHook_JAXWS_JSE + + - WebServiceMainDeployer + - WSMainDeployerHook + + Conceptually, each of these hooks implements the following pattern: + + DployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeployerManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeployerManager.undeploy(dep) + + Each deployer hook has a web service DeployerManager injected into it. + A web service DeployerManager maintains a list of Deployers, each of which + handles a single aspect of web service deployment. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + + <!-- + Each DeploymentManger maintains a list of Deployers + Each Deployer handles a single aspect of web service deployment. + --> + <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> + + <!-- + The Deployers + Each handles a single aspect of web service deployment + --> + <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> + + <!-- Deployer helper beans --> + <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> + + <!-- + Register DeployerHooks with JBoss deployers + --> + <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"> <!-- Test a schema import --> <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