August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4247 - stack/metro/trunk/src/main/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-08 06:19:14 -0400 (Wed, 08 Aug 2007) New Revision: 4247 Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml Log: typo Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 10:18:33 UTC (rev 4246) +++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 10:19:14 UTC (rev 4247) @@ -89,7 +89,7 @@ </bean>  - <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects">

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4246 - stack/cxf/trunk/src/main/resources and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-08 06:18:33 -0400 (Wed, 08 Aug 2007) New Revision: 4246 Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml Log: Move URLPattern to Phase1 Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -286,7 +286,11 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> @@ -297,16 +301,12 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSRuntimeLoaderDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> Modified: stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -54,18 +54,32 @@ </bean>  + +  <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> <inject bean="WSCXFDescriptorDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> + +  + <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property> Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 09:22:32 UTC (rev 4245) +++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 10:18:33 UTC (rev 4246) @@ -74,18 +74,32 @@ </bean>  + +  <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> <inject bean="WSMetroDescriptorDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> + +  + <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property>

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4245 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-08 05:22:32 -0400 (Wed, 08 Aug 2007) New Revision: 4245 Modified: stack/native/trunk/version.properties Log: User repository.id=snapshot Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) +++ stack/native/trunk/version.properties 2007-08-08 09:22:32 UTC (rev 4245) @@ -6,7 +6,7 @@ specification.version=jbossws-2.0 version.id=2.1.0.DEV -repository.id=2.0.1.CR1 +repository.id=snapshot implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4244 - container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40 and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-08 05:19:04 -0400 (Wed, 08 Aug 2007) New Revision: 4244 Added: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPostJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPreJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPostJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPreJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPostJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java Removed: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml container/jboss40/trunk/version.properties container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml container/jboss42/trunk/version.properties container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml container/jboss50/trunk/version.properties framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java framework/trunk/version.properties spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml stack/native/trunk/src/main/resources/jbossws-native-config.xml stack/native/trunk/version.properties Log: Use 'Pre' and 'Post' for JSE handling Move notion of parent to DAM instead of DAM intaller Revert container integration version back to snapshot Sort out commented requires, provides clauses Deleted: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,142 +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.container.jboss40; - -//$Id: JAXRPCDeployerHookJSE.java 4116 2007-08-02 16:39:02Z thomas.diesler(a)jboss.com $ - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentInfo di) - { - ArchiveDeployment dep = newDeployment(di); - dep.setRootFile(new URLLoaderAdapter(di.localUrl)); - dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)di.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml"); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - dep.addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = dep.getInitialClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // If this is a servlet we defer the the bean creation - if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) - servletClass = null; - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - - // Create the endpoint - Endpoint ep = newEndpoint(servletClass); - ep.setShortName(servletLink); - service.addEndpoint(ep); - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - if (servletLink.equals(servletName)) - { - return new Servlet(servletName, servletClass); - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return wsMetaData != null; - } -} Deleted: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,50 +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.container.jboss40; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.deployment.DeploymentInfo; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXRPC_JSE; - } - - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return (wsMetaData!=null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPostJSE.java (from rev 4243, container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java) =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPostJSE.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss40; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPostJSE extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Copied: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPreJSE.java (from rev 4243, container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE.java) =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPreJSE.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,142 @@ +/* + * 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.container.jboss40; + +//$Id: JAXRPCDeployerHookJSE.java 4116 2007-08-02 16:39:02Z thomas.diesler(a)jboss.com $ + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo di) + { + ArchiveDeployment dep = newDeployment(di); + dep.setRootFile(new URLLoaderAdapter(di.localUrl)); + dep.setRuntimeClassLoader(null); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)di.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml"); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = dep.getInitialClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // If this is a servlet we defer the the bean creation + if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) + servletClass = null; + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + + // Create the endpoint + Endpoint ep = newEndpoint(servletClass); + ep.setShortName(servletLink); + service.addEndpoint(ep); + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + if (servletLink.equals(servletName)) + { + return new Servlet(servletName, servletClass); + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return wsMetaData != null; + } +} Deleted: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,142 +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.container.jboss40; - -//$Id: JAXWSDeployerHookJSE.java 4116 2007-08-02 16:39:02Z thomas.diesler(a)jboss.com $ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentInfo di) - { - ArchiveDeployment dep = newDeployment(di); - dep.setRootFile(new URLLoaderAdapter(di.localUrl)); - dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)di.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl); - for (Servlet servlet : servlets) - { - String servletName = servlet.getServletName(); - String servletClass = servlet.getServletClass(); - - // Create the endpoint - Endpoint ep = newEndpoint(servletClass); - ep.setShortName(servletName); - service.addEndpoint(ep); - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = (WebMetaData)unit.metaData; - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClassName = (String)entry.getValue(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(new Servlet(servletName, servletClassName)); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,51 +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.container.jboss40; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.deployment.DeploymentInfo; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXWS_JSE; - } - - - /** - * Reject JAX-RPC deployments - */ - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact - return (wsMetaData==null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPostJSE.java (from rev 4243, container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java) =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPostJSE.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -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.container.jboss40; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookPostJSE extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + + /** + * Reject JAX-RPC deployments + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact + return (wsMetaData==null && super.isWebServiceDeployment(unit)); + } +} Copied: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPreJSE.java (from rev 4243, container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE.java) =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPreJSE.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,142 @@ +/* + * 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.container.jboss40; + +//$Id: JAXWSDeployerHookJSE.java 4116 2007-08-02 16:39:02Z thomas.diesler(a)jboss.com $ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentInfo di) + { + ArchiveDeployment dep = newDeployment(di); + dep.setRootFile(new URLLoaderAdapter(di.localUrl)); + dep.setRuntimeClassLoader(null); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)di.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl); + for (Servlet servlet : servlets) + { + String servletName = servlet.getServletName(); + String servletClass = servlet.getServletClass(); + + // Create the endpoint + Endpoint ep = newEndpoint(servletClass); + ep.setShortName(servletName); + service.addEndpoint(ep); + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = (WebMetaData)unit.metaData; + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClassName = (String)entry.getValue(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(new Servlet(servletName, servletClassName)); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -48,8 +48,8 @@ Register DeployerHooks with JBoss deployers -->  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -57,8 +57,8 @@ </property> </bean>  - <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -75,8 +75,8 @@ </property> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -84,8 +84,8 @@ </property> </bean>  - <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -105,11 +105,12 @@  - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> </bean> - <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> @@ -168,6 +169,11 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -185,11 +191,6 @@ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">RuntimeLoader</property> - </bean> -  <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/> <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB3"/> @@ -211,36 +212,35 @@   - <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> </set> </property> </bean>  - <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> @@ -248,7 +248,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -257,6 +256,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> @@ -268,7 +268,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -276,6 +275,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> Modified: container/jboss40/trunk/version.properties =================================================================== --- container/jboss40/trunk/version.properties 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss40/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.CR2 -repository.id=2.0.1.CR2 +version.id=2.0.1.GA +repository.id=snapshot implementation.title=JBoss Web Services - Integration JBoss40 implementation.url=http://www.jboss.org/products/jbossws Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,142 +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.container.jboss42; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentInfo di) - { - ArchiveDeployment dep = newDeployment(di); - dep.setRootFile(new URLLoaderAdapter(di.localUrl)); - dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)di.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml"); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - dep.addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = dep.getInitialClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // If this is a servlet we defer the the bean creation - if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) - servletClass = null; - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - - // Create the endpoint - Endpoint ep = newEndpoint(servletClass); - ep.setShortName(servletLink); - service.addEndpoint(ep); - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - if (servletLink.equals(servletName)) - { - return new Servlet(servletName, servletClass); - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return wsMetaData != null; - } -} Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,50 +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.container.jboss42; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.deployment.DeploymentInfo; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXRPC_JSE; - } - - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return (wsMetaData!=null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java (from rev 4243, container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java) =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPostJSE extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Copied: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java (from rev 4243, container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java) =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,142 @@ +/* + * 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.container.jboss42; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo di) + { + ArchiveDeployment dep = newDeployment(di); + dep.setRootFile(new URLLoaderAdapter(di.localUrl)); + dep.setRuntimeClassLoader(null); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)di.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml"); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = dep.getInitialClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // If this is a servlet we defer the the bean creation + if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) + servletClass = null; + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + + // Create the endpoint + Endpoint ep = newEndpoint(servletClass); + ep.setShortName(servletLink); + service.addEndpoint(ep); + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + if (servletLink.equals(servletName)) + { + return new Servlet(servletName, servletClass); + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return wsMetaData != null; + } +} Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,142 +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.container.jboss42; - -//$Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentInfo di) - { - ArchiveDeployment dep = newDeployment(di); - dep.setRootFile(new URLLoaderAdapter(di.localUrl)); - dep.setRuntimeClassLoader(null); - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)di.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl); - for (Servlet servlet : servlets) - { - String servletName = servlet.getServletName(); - String servletClass = servlet.getServletClass(); - - // Create the endpoint - Endpoint ep = newEndpoint(servletClass); - ep.setShortName(servletName); - service.addEndpoint(ep); - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = (WebMetaData)unit.metaData; - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClassName = (String)entry.getValue(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(new Servlet(servletName, servletClassName)); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,59 +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.container.jboss42; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXWS_JSE; - } - - - /** - * Reject JAX-RPC deployments - */ - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact - return (wsMetaData==null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java (from rev 4243, container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java) =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,52 @@ +/* + * 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.container.jboss42; + +// $Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookPostJSE extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + /** + * Reject JAX-RPC deployments + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact + return (wsMetaData == null && super.isWebServiceDeployment(unit)); + } +} Copied: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java (from rev 4243, container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java) =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,142 @@ +/* + * 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.container.jboss42; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentInfo di) + { + ArchiveDeployment dep = newDeployment(di); + dep.setRootFile(new URLLoaderAdapter(di.localUrl)); + dep.setRuntimeClassLoader(null); + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)di.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl); + for (Servlet servlet : servlets) + { + String servletName = servlet.getServletName(); + String servletClass = servlet.getServletClass(); + + // Create the endpoint + Endpoint ep = newEndpoint(servletClass); + ep.setShortName(servletName); + service.addEndpoint(ep); + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = (WebMetaData)unit.metaData; + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClassName = (String)entry.getValue(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(new Servlet(servletName, servletClassName)); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -57,8 +57,8 @@ -->  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -67,8 +67,8 @@ </bean>  - <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -86,8 +86,8 @@ </bean>  - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -96,8 +96,8 @@ </bean>  - <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -117,11 +117,12 @@  - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> </bean> - <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> @@ -144,7 +145,7 @@ </bean> <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> - <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> </bean> <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> @@ -176,11 +177,15 @@ </bean> <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> -  - <property name="requires">ContextProperties, ContainerMetaData</property> + <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -198,11 +203,6 @@ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">RuntimeLoader</property> - </bean> -  <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> @@ -222,36 +222,35 @@   - <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean>  - <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> @@ -259,7 +258,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -268,6 +266,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> @@ -279,7 +278,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -287,6 +285,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> Modified: container/jboss42/trunk/version.properties =================================================================== --- container/jboss42/trunk/version.properties 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss42/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.CR2 -repository.id=2.0.1.CR2 +version.id=2.0.1.GA +repository.id=snapshot implementation.title=JBoss Web Services - Integration JBoss42 implementation.url=http://www.jboss.org/products/jbossws Copied: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java (from rev 4243, container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java) =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,109 @@ +/* + * 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.container.jboss50; + +// $Id$ + +import java.util.Iterator; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE +{ + /** + * The deployment should be created in phase 1. + */ + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + if (null == dep) + throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1"); + + return dep; + } + + /** + * A phase 2 deployer hook needs to reject first-place + * JSE deployments and wait for those that are re-written. + * We do it by inspecting the Servlet init parameter. + * @param unit + * @return + */ + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + Deployment deployment = unit.getAttachment(Deployment.class); + boolean isModified = false; + if (deployment != null) + isModified = isModifiedServletClass(deployment); + return isModified; + } + + private boolean isModifiedServletClass(Deployment dep) + { + boolean modified = false; + + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + modified = isAlreadyModified(servlet); + } + } + + return modified; + } + + private boolean isAlreadyModified(Servlet servlet) + { + Iterator itParams = servlet.getInitParams().iterator(); + while (itParams.hasNext()) + { + NameValuePair pair = (NameValuePair)itParams.next(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) + return true; + } + return false; + } +} Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -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.container.jboss50; - -//$Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(null); // TODO: Create RuntimeLoader aspect - dep.setType(getDeploymentType()); - - Service service = dep.getService(); - - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - dep.addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - // Create the endpoint - Endpoint ep = newEndpoint(servletClass); - ep.setShortName(servletLink); - service.addEndpoint(ep); - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - for (Servlet servlet : wmd.getServlets()) - { - if (servletLink.equals(servlet.getName())) - { - return servlet; - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null; - } -} Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -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.container.jboss50; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXRPC_JSE; - } - - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return (wsMetaData!=null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPostJSE.java (from rev 4243, container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java) =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPostJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,52 @@ +/* + * 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.container.jboss50; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Copied: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java (from rev 4243, container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java) =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -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.container.jboss50; + +//$Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + ArchiveDeployment dep = newDeployment(unit); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + dep.setRuntimeClassLoader(null); // TODO: Create RuntimeLoader aspect + dep.setType(getDeploymentType()); + + Service service = dep.getService(); + + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + // Create the endpoint + Endpoint ep = newEndpoint(servletClass); + ep.setShortName(servletLink); + service.addEndpoint(ep); + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + for (Servlet servlet : wmd.getServlets()) + { + if (servletLink.equals(servlet.getName())) + { + return servlet; + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null; + } +} Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,59 +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.container.jboss50; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.NameValuePair; -import org.jboss.metadata.web.Servlet; - -import java.util.Iterator; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE -{ - /** Get the deployment type this deployer can handle - */ - public Deployment.DeploymentType getDeploymentType() - { - return Deployment.DeploymentType.JAXWS_JSE; - } - - - /** - * Reject JAX-RPC deployments. - * - * @param unit - * @return - */ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact - return (wsMetaData==null && super.isWebServiceDeployment(unit)); - } -} Copied: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java (from rev 4243, container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java) =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,54 @@ +/* + * 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.container.jboss50; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + /** + * Reject JAX-RPC deployments. + * + * @param unit + * @return + */ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact + return (wsMetaData == null && super.isWebServiceDeployment(unit)); + } +} Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,107 +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.container.jboss50; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.NameValuePair; -import org.jboss.metadata.web.Servlet; - -import java.util.Iterator; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public abstract class Phase2DeployerHookJSE extends AbstractDeployerHookJSE -{ - /** - * The deployment should be created in phase 1. - */ - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - if(null == dep) - throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1"); - - return dep; - } - - /** - * A phase 2 deployer hook needs to reject first-place - * JSE deployments and wait for those that are re-written. - * We do it by inspecting the Servlet init parameter. - * @param unit - * @return - */ - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if(super.isWebServiceDeployment(unit) == false) - return false; - - Deployment deployment = unit.getAttachment(Deployment.class); - boolean isModified =false; - if(deployment!=null) - isModified = isModifiedServletClass(deployment); - return isModified; - } - - private boolean isModifiedServletClass(Deployment dep) - { - boolean modified = false; - - WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); - if (webMetaData != null) - { - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - modified = isAlreadyModified(servlet); - } - } - - return modified; - } - - private boolean isAlreadyModified(Servlet servlet) - { - Iterator itParams = servlet.getInitParams().iterator(); - while (itParams.hasNext()) - { - NameValuePair pair = (NameValuePair)itParams.next(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) - return true; - } - return false; - } -} Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.container.jboss50; +// $Id$ + import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; import org.jboss.wsf.spi.deployment.Deployment; @@ -32,7 +34,6 @@ * and makes it available through the {@link Deployment}. * * @author Heiko.Braun(a)jboss.com - * @version $Revision$ */ public class RuntimeLoaderDeploymentAspect extends DeploymentAspect { Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,46 +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.container.jboss50; - -//$Id$ - -/** - * This web service deployer for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerJSE extends AbstractWebServiceDeployer -{ - private int relOrderWar; - - public void setRelOrderWar(int relOrderWar) - { - this.relOrderWar = relOrderWar; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar - 1; - } -} Deleted: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss50; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class WebServiceDeployerJSE2 extends AbstractWebServiceDeployer -{ - private int relOrderPhase1; - - - public void setRelOrderPhase1(int relOrderPhase1) - { - this.relOrderPhase1 = relOrderPhase1; - } - - @Override - public int getRelativeOrder() - { - return relOrderPhase1 + 1; - } -} \ No newline at end of file Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,44 @@ +/* + * 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.container.jboss50; + +// $Id: $ + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + + public void setRelOrderWar(int relOrder) + { + this.relOrderWar = relOrder; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar + 1; + } +} \ No newline at end of file Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss50; + +//$Id: WebServiceDeployerJSE.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $ + +/** + * This web service deployer for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + public void setRelOrderWar(int relOrderWar) + { + this.relOrderWar = relOrderWar; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar - 1; + } +} Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -25,7 +25,8 @@ The order of which is important 1) EJBDeployer < WebServiceDeployerEJB - 2) WebServiceDeployerJSE < WarDeployer + 2) WebServiceDeployerPreJSE < WarDeployer + 3) WarDeployer < WebServiceDeployerPostJSE Each WebServiceDeployer has a number of DeployerHooks registered with it @@ -33,7 +34,7 @@ - WSDeployerHook_JAXRPC_EJB21 - WSDeployerHook_JAXWS_EJB3 - - WebServiceDeployerJSE + - WebServiceDeployerPreJSE - WSDeployerHook_JAXRPC_JSE - WSDeployerHook_JAXWS_JSE @@ -70,18 +71,18 @@  - <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPreJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <depends>WebAppParsingDeployer</depends> </bean>  - <bean name="WebServiceDeployerJSE2" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE2"> - <property name="relOrderPhase1"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> - <depends>WebServiceDeployerJSE</depends> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPostJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> </bean>   - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> - <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> <parameter> <this/> </parameter> </install> - <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> <parameter> <this/> </parameter> </uninstall> - <depends>WebServiceDeployerJSE</depends> + <depends>WebServiceDeployerPreJSE</depends> </bean>  - <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> - <install bean="WebServiceDeployerJSE2" method="addDeployerHook"> + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> <parameter> <this/> </parameter> </install> - <uninstall bean="WebServiceDeployerJSE2" method="removeDeployerHook"> + <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> <parameter> <this/> </parameter> </uninstall> - <depends>WebServiceDeployerJSE2</depends> + <depends>WebServiceDeployerPostJSE</depends> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> @@ -135,34 +136,34 @@ </bean>  - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> - <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> <parameter> <this/> </parameter> </install> - <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> <parameter> <this/> </parameter> </uninstall> - <depends>WebServiceDeployerJSE</depends> + <depends>WebServiceDeployerPreJSE</depends> </bean>  - <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE2"> - <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> - <install bean="WebServiceDeployerJSE2" method="addDeployerHook"> + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> <parameter> <this/> </parameter> </install> - <uninstall bean="WebServiceDeployerJSE2" method="removeDeployerHook"> + <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> <parameter> <this/> </parameter> </uninstall> - <depends>WebServiceDeployerJSE2</depends> + <depends>WebServiceDeployerPostJSE</depends> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> @@ -183,11 +184,12 @@  - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> </bean> - <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE2</property> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> @@ -241,10 +243,14 @@ </bean> <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeploymentAspect"> - <property name="requires">ContextProperties</property> -  + <property name="requires">ContextProperties, StackDescriptor</property> </bean> + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -263,11 +269,6 @@ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.RuntimeLoaderDeploymentAspect"> -  - <property name="provides">RuntimeLoader</property> - </bean> -  <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.EndpointMetricsImpl"/> <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> @@ -280,8 +281,8 @@   - <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> @@ -291,12 +292,11 @@ </bean>  - <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -305,6 +305,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> @@ -315,7 +316,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -325,6 +325,7 @@ <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> @@ -335,7 +336,6 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -343,6 +343,7 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> Modified: container/jboss50/trunk/version.properties =================================================================== --- container/jboss50/trunk/version.properties 2007-08-08 07:07:32 UTC (rev 4243) +++ container/jboss50/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.CR2 -repository.id=2.0.1.CR2 +version.id=2.0.1.GA +repository.id=snapshot implementation.title=JBoss Web Services - Integration JBoss50 implementation.url=http://www.jboss.org/products/jbossws Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-08-08 07:07:32 UTC (rev 4243) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -23,16 +23,16 @@ //$Id$ -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.DeploymentAspectManager; -import org.jboss.wsf.spi.deployment.DeploymentAspect; - import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; + /** * A deployment aspect installer. * @@ -44,22 +44,11 @@ // provide logging private static final Logger log = Logger.getLogger(DeploymentAspectInstaller.class); - private DeploymentAspectManager parent; private DeploymentAspectManager manager; private Set<DeploymentAspect> aspects; private boolean sortAspectsOnCreate; - private Set<String> parentProvidedConditions = new HashSet<String>(); + private Set<String> parentProvidedConditions = new HashSet<String>(); - public DeploymentAspectManager getParent() - { - return parent; - } - - public void setParent(DeploymentAspectManager parent) - { - this.parent = parent; - } - public void setManager(DeploymentAspectManager manager) { this.manager = manager; @@ -79,32 +68,32 @@ { List<DeploymentAspect> unsortedAspects = new ArrayList<DeploymentAspect>(); - if(parent!=null) - { - Iterator<DeploymentAspect> it = parent.getDeploymentAspects().iterator(); - while(it.hasNext()) - { - DeploymentAspect aspect = it.next(); - parentProvidedConditions.addAll( aspect.getProvidesAsSet()); - } - } - unsortedAspects.addAll(manager.getDeploymentAspects()); unsortedAspects.addAll(aspects); - + List<DeploymentAspect> sortedAspects = unsortedAspects; if (sortAspectsOnCreate) { + // get the conditions provided by the parent + if (manager.getParent() != null) + { + Iterator<DeploymentAspect> it = manager.getParent().getDeploymentAspects().iterator(); + while (it.hasNext()) + { + DeploymentAspect aspect = it.next(); + parentProvidedConditions.addAll(aspect.getProvidesAsSet()); + } + } + sortedAspects = new ArrayList<DeploymentAspect>(); List<DeploymentAspect> allAspects = new ArrayList<DeploymentAspect>(unsortedAspects); // Add aspects with no requirements first Iterator<DeploymentAspect> itAll = allAspects.iterator(); - while (itAll.hasNext()) { DeploymentAspect aspect = itAll.next(); - if (aspect.getRequires() == null) + if (aspect.getRequires() == null || parentProvidedConditions.containsAll(aspect.getRequiresAsSet())) { sortedAspects.add(aspect); itAll.remove(); @@ -160,10 +149,11 @@ String exmsg = "Cannot add deployment aspect(s)"; StringBuilder str = new StringBuilder(exmsg); - if(parent!=null) - str.append( "\n"+parent.getName()+ " provides: " + parentProvidedConditions); - str.append( "\n"+manager.getName()+ " provides: " + providedConditions); + if (manager.getParent() != null) + str.append("\n" + manager.getParent().getName() + " provides: " + parentProvidedConditions); + str.append("\n" + manager.getName() + " provides: " + providedConditions); + for (DeploymentAspect da : allAspects) { str.append("\n " + da.getClass().getName() + ", requires: " + da.getRequires()); @@ -176,18 +166,12 @@ private int getAspectIndex(List<DeploymentAspect> sortedAspects, DeploymentAspect aspect) { int index = -1; - Set<String> selfProvidedConditions = new HashSet<String>(); + Set<String> providedConditions = new HashSet<String>(parentProvidedConditions); for (int i = 0; i < sortedAspects.size(); i++) { DeploymentAspect sortedAspect = sortedAspects.get(i); - selfProvidedConditions.addAll(sortedAspect.getProvidesAsSet()); - - // take both parent and child conditions into consideration - HashSet<String> parentAndChildConditions = new HashSet<String>(); - parentAndChildConditions.addAll(parentProvidedConditions); - parentAndChildConditions.addAll(selfProvidedConditions); - - if (parentAndChildConditions.containsAll(aspect.getRequiresAsSet())) + providedConditions.addAll(sortedAspect.getProvidesAsSet()); + if (providedConditions.containsAll(aspect.getRequiresAsSet())) { index = i + 1; break; Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-08-08 07:07:32 UTC (rev 4243) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -48,6 +48,7 @@ private static final Logger log = Logger.getLogger(DeploymentAspectManagerImpl.class); private String name; + private DeploymentAspectManager parent; private List<DeploymentAspect> sortedAspects = new ArrayList<DeploymentAspect>(); private long deploymentCount; @@ -61,6 +62,16 @@ this.name = name; } + public DeploymentAspectManager getParent() + { + return parent; + } + + public void setParent(DeploymentAspectManager parent) + { + this.parent = parent; + } + public List<DeploymentAspect> getDeploymentAspects() { return Collections.unmodifiableList(sortedAspects); Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2007-08-08 07:07:32 UTC (rev 4243) +++ framework/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.CR2 -repository.id=1.0.0.CR2 +version.id=1.0.0.CR1 +repository.id=1.0.0.CR1 implementation.title=JBoss Web Services - Framework implementation.url=http://www.jboss.org/products/jbossws Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2007-08-08 07:07:32 UTC (rev 4243) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2007-08-08 09:19:04 UTC (rev 4244) @@ -36,6 +36,12 @@ /** Get the name for this aspect manager */ String getName(); + /** Get the optional parent for this manager */ + DeploymentAspectManager getParent(); + + /** Set the optional parent for this manager */ + void setParent(DeploymentAspectManager dam); + /** Get the ordered list of registered deployment aspects */ List<DeploymentAspect> getDeploymentAspects(); Modified: stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -54,8 +54,8 @@ </bean>  - <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> @@ -64,7 +64,7 @@ <inject bean="WSCXFDescriptorDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> Modified: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -74,8 +74,8 @@ </bean>  - <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> @@ -84,7 +84,7 @@ <inject bean="WSMetroDescriptorDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean> <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-08-08 07:07:32 UTC (rev 4243) +++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-08-08 09:19:04 UTC (rev 4244) @@ -38,7 +38,7 @@ The stack specific deployment aspects --> <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> + <property name="provides">ContextProperties, StackDescriptor</property> <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> @@ -76,20 +76,19 @@   - <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerPreJSE</depends> </bean>  - <bean name="WSNativeDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> @@ -101,7 +100,7 @@ <inject bean="WSNativeEagerInitializeDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE2</depends> + <depends>WSDeploymentAspectInstallerPostJSE</depends> </bean> <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-08-08 07:07:32 UTC (rev 4243) +++ stack/native/trunk/version.properties 2007-08-08 09:19:04 UTC (rev 4244) @@ -26,11 +26,11 @@ # Dependend integration projects jbossws-common=1.0.0.CR1 -jbossws-framework=1.0.0.CR2 +jbossws-framework=1.0.0.CR1 jbossws-spi=1.0.0.CR1 -jbossws-jboss50=2.0.1.CR1 -jbossws-jboss42=2.0.1.CR1 -jbossws-jboss40=2.0.1.CR1 +jbossws-jboss40=snapshot +jbossws-jboss42=snapshot +jbossws-jboss50=snapshot # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR2

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4243 - container/jboss40/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-08 03:07:32 -0400 (Wed, 08 Aug 2007) New Revision: 4243 Removed: container/jboss40/trunk/ant.properties Log: Delete ant.properties Deleted: container/jboss40/trunk/ant.properties =================================================================== --- container/jboss40/trunk/ant.properties 2007-08-07 19:18:44 UTC (rev 4242) +++ container/jboss40/trunk/ant.properties 2007-08-08 07:07:32 UTC (rev 4243) @@ -1,26 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# JBoss Home -jboss40.home=/home/hbraun/dev/prj/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3 - -# The JBoss settings -jboss.server.instance=default - -# JBoss Repository -jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository/ -#jboss.repository=http://repository.jboss.org - -# JBossWS Release -jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository/ - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4242 - spi/trunk and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-07 15:18:44 -0400 (Tue, 07 Aug 2007) New Revision: 4242 Added: JBossWS.ipr Modified: spi/trunk/spi.iml Log: Updated intellij files Added: JBossWS.ipr =================================================================== --- JBossWS.ipr (rev 0) +++ JBossWS.ipr 2007-08-07 19:18:44 UTC (rev 4242) @@ -0,0 +1,340 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="true"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + <buildFile url="file://$PROJECT_DIR$/framework/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/common/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/stack/native/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/container/jboss50/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/container/jboss42/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + <buildFile url="file://$PROJECT_DIR$/container/jboss40/trunk/build.xml"> + <additionalClassPath /> + <antReference projectDefault="true" /> + <customJdkName value="" /> + <maximumHeapSize value="128" /> + <properties /> + </buildFile> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS" /> + <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EntryPointsManager"> + <entry_points /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="F5FC34D421DA5D400BD400097C9F01FA" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + </profile> + </profiles> + </component> + <component name="JavacSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="DEPRECATION" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" /> + <option name="OPTION_SCOPE" value="protected" /> + <option name="OPTION_HIERARCHY" value="true" /> + <option name="OPTION_NAVIGATOR" value="true" /> + <option name="OPTION_INDEX" value="true" /> + <option name="OPTION_SEPARATE_INDEX" value="true" /> + <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> + <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> + <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> + <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> + <option name="OPTION_DEPRECATED_LIST" value="true" /> + <option name="OTHER_OPTIONS" value="" /> + <option name="HEAP_SIZE" /> + <option name="LOCALE" /> + <option name="OPEN_IN_BROWSER" value="true" /> + </component> + <component name="JikesSettings"> + <option name="JIKES_PATH" value="" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="DEPRECATION" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="IS_EMACS_ERRORS_MODE" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/server/42-server.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/server/42-server.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/system/42-system.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/system/42-system.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/server/as-server.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/server/as-server.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/system/as-system.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/system/as-system.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/tomcat/as-tomcat.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/tomcat/as-tomcat.iml" group="AS" /> + <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" /> + <module fileurl="file://$PROJECT_DIR$/framework/framework.iml" filepath="$PROJECT_DIR$/framework/framework.iml" /> + <module fileurl="file://$PROJECT_DIR$/container/jboss40/trunk/jboss40.iml" filepath="$PROJECT_DIR$/container/jboss40/trunk/jboss40.iml" group="container" /> + <module fileurl="file://$PROJECT_DIR$/container/jboss42/trunk/jboss42.iml" filepath="$PROJECT_DIR$/container/jboss42/trunk/jboss42.iml" group="container" /> + <module fileurl="file://$PROJECT_DIR$/container/jboss50/trunk/jboss50.iml" filepath="$PROJECT_DIR$/container/jboss50/trunk/jboss50.iml" group="container" /> + <module fileurl="file://$PROJECT_DIR$/stack/native/trunk/native.iml" filepath="$PROJECT_DIR$/stack/native/trunk/native.iml" group="stack" /> + <module fileurl="file://$PROJECT_DIR$/spi/trunk/spi.iml" filepath="$PROJECT_DIR$/spi/trunk/spi.iml" /> + </modules> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/classes" /> + </component> + <component name="ProjectRunConfigurationManager" /> + <component name="RmicSettings"> + <option name="IS_EANABLED" value="false" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="GENERATE_IIOP_STUBS" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> + <UsedPathMacros /> +</project> + Modified: spi/trunk/spi.iml =================================================================== --- spi/trunk/spi.iml 2007-08-07 19:17:32 UTC (rev 4241) +++ spi/trunk/spi.iml 2007-08-07 19:18:44 UTC (rev 4242) @@ -14,7 +14,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -23,7 +23,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +32,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/ant-launcher.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +41,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,7 +50,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -59,7 +59,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,7 +68,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -77,7 +77,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,7 +86,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,7 +104,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -113,7 +113,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -122,7 +122,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -131,7 +131,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -140,7 +140,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -149,7 +149,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -158,7 +158,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -167,7 +167,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -176,7 +176,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -185,17 +185,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/ant-launcher.jar!/" /> + <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4241 - in stack/native/trunk: src/main/java/org/jboss/ws/core/jaxrpc and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-07 15:17:32 -0400 (Tue, 07 Aug 2007) New Revision: 4241 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/src/main/resources/jbossws-native-config.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java stack/native/trunk/version.properties Log: Update to container integration 2.0.1.CR1: Supports 2 phase JSE deployments. Cleanup classloader juggling in within metdata builders Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -191,7 +191,7 @@ for (WrappedParameter param : wrappedParameters) { - Object value = (param.getIndex() < 0) ? returnValue : holderValue(outParameters.get(param.getIndex())); + Object value = (param.getIndex() < 0) ? returnValue : holderValue(outParameters.get(param.getIndex())); param.accessor().set(resStruct, value); } return resStruct; Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -76,7 +76,10 @@ // For every webservice-description build the ServiceMetaData UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(dep.getCanonicalName()); - wsMetaData.setClassLoader(dep.getInitialClassLoader()); + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime loader cannot be null"); + wsMetaData.setClassLoader(runtimeClassLoader); WebservicesMetaData jaxrpcMapping = dep.getAttachment(WebservicesMetaData.class); WebserviceDescriptionMetaData[] wsDescriptionArr = jaxrpcMapping.getWebserviceDescriptions(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -58,8 +58,12 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(dep.getCanonicalName()); - wsMetaData.setClassLoader(dep.getInitialClassLoader()); + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime loader cannot be null"); + wsMetaData.setClassLoader(runtimeClassLoader); + // The container objects below provide access to all of the ejb metadata EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); Iterator<EJBMetaData> it = apMetaData.getEnterpriseBeans(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -50,7 +50,10 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(dep.getCanonicalName()); - wsMetaData.setClassLoader(dep.getInitialClassLoader()); + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime classloader cannot be null"); + wsMetaData.setClassLoader(runtimeClassLoader); // For every bean for (Endpoint ep : dep.getService().getEndpoints()) Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -108,7 +108,10 @@ EndpointResult result = processWebService(dep, wsMetaData, sepClass, linkName); // Clear the java types, etc. - resetMetaDataBuilder(dep.getInitialClassLoader()); + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime loader cannot be null"); + resetMetaDataBuilder(runtimeClassLoader); ServerEndpointMetaData sepMetaData = result.sepMetaData; ServiceMetaData serviceMetaData = result.serviceMetaData; @@ -310,7 +313,10 @@ if (anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); - seiClass = dep.getInitialClassLoader().loadClass(seiName); + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime loader cannot be null"); + seiClass = runtimeClassLoader.loadClass(seiName); WebService seiAnnotation = seiClass.getAnnotation(WebService.class); if (seiAnnotation == null) Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -94,7 +94,7 @@ builder.setGenerateWsdl(generateWsdl); builder.setToolMode(true); builder.setWsdlDirectory(resourceDir); - builder.setMessageStream(messageStream); + builder.setMessageStream(messageStream); if (generateWsdl) messageStream.println("Generating WSDL:"); @@ -102,6 +102,7 @@ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); DeploymentModelFactory factory = spiProvider.getSPI(DeploymentModelFactory.class); Deployment dep = factory.newDeployment("wsprovide-deployment", loader); + dep.setRuntimeClassLoader(loader); builder.buildWebServiceMetaData(dep, umd, endpointClass, null); try Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -41,8 +41,12 @@ UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) throw new IllegalStateException("Cannot obtain unified meta data"); + + ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + if(null == runtimeClassLoader) + throw new IllegalArgumentException("Runtime classloader may not be null"); - umd.setClassLoader(dep.getRuntimeClassLoader()); + umd.setClassLoader(runtimeClassLoader); umd.eagerInitialize(); } } \ No newline at end of file Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -94,7 +94,6 @@ protected void initServiceEndpoint(String contextPath) { initEndpoint(contextPath, getServletName()); - initClassLoader(); initEndpointConfig(); initializeAndStart(); } @@ -106,10 +105,9 @@ { // Initialize the meta data model UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); - if (umd.isEagerInitialized() == false) + if (umd.isEagerInitialized() == false) // TODO: remove this piece { - umd.setClassLoader(dep.getRuntimeClassLoader()); - umd.eagerInitialize(); + throw new IllegalStateException("UMD should be initialized already"); } // Start the endpoint @@ -133,19 +131,8 @@ log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile); epMetaData.setConfigName(configName, configFile); } - } + } - private void initClassLoader() - { - // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader - Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) - { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - dep.setRuntimeClassLoader(classLoader); - } - } - private void initEndpoint(String contextPath, String servletName) { WebAppResolver resolver = new WebAppResolver(contextPath, servletName); Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -170,7 +170,7 @@ ServletInputStream in = req.getInputStream(); ServletOutputStream out = res.getOutputStream(); - ClassLoader classLoader = endpoint.getService().getDeployment().getInitialClassLoader(); + ClassLoader classLoader = endpoint.getService().getDeployment().getRuntimeClassLoader(); if (classLoader == null) throw new IllegalStateException("Deployment has no classloader associated"); Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-08-07 19:17:32 UTC (rev 4241) @@ -70,26 +70,40 @@ </bean> <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern, VFSRoot</property> - <property name="provides">UnifiedMetaDataModel, StackDescriptor</property> + <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot</property> + <property name="provides">UnifiedMetaDataModel</property> </bean> -  +  +  <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerJSE</depends> + </bean> +  + <bean name="WSNativeDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerJSE</depends> + <depends>WSDeploymentAspectInstallerJSE2</depends> </bean> + <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property> @@ -106,6 +120,7 @@ </property> <depends>WSDeploymentAspectInstallerEJB</depends> </bean> + <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> <property name="sortAspectsOnCreate">true</property> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -51,12 +51,6 @@ public void testInheritanceBare() throws Exception { - if (true) - { - System.out.println("FIXME: [JBWS-1702]: Type inheritance on Doclit/Bare"); - return; - } - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"); QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_BareService"); Service service = Service.create(wsdlURL, serviceName); @@ -68,13 +62,7 @@ } public void testInheritanceWrapped() throws Exception - { - if (true) - { - System.out.println("FIXME: [JBWS-1702]: Type inheritance on Doclit/Bare"); - return; - } - + { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"); QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_WrappedService"); Service service = Service.create(wsdlURL, serviceName); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -26,17 +26,21 @@ import javax.jws.WebMethod; import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; /** * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ @WebService +@SOAPBinding( + style = SOAPBinding.Style.DOCUMENT, + use = SOAPBinding.Use.LITERAL, + parameterStyle = SOAPBinding.ParameterStyle.BARE +) public interface SampleWSBareSEI { - @WebMethod() ResponseWrapperB getClassCAsClassB(); - @WebMethod() ResponseWrapperC getClassC(); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java 2007-08-07 19:17:32 UTC (rev 4241) @@ -38,11 +38,6 @@ * @version 1.0 */ @WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI") -@SOAPBinding( - style = SOAPBinding.Style.DOCUMENT, - use = SOAPBinding.Use.LITERAL, - parameterStyle = SOAPBinding.ParameterStyle.BARE -) public class SampleWSWithDocument_Bare implements SampleWSBareSEI { @@ -55,7 +50,7 @@ /** * In .NET Client (C#) only the content information of ClassB is being submitted. (--> propC is unknown) */ - @WebMethod() + //@WebMethod() public ResponseWrapperB getClassCAsClassB() { ClassC classC= new ClassC(); classC.setPropA("propA"); @@ -70,7 +65,7 @@ /** * Method that make ClassC available for all clients using this web service. */ - @WebMethod() + //@WebMethod() public ResponseWrapperC getClassC() { ClassC data = (ClassC) getClassCAsClassB().getData(); ResponseWrapperC resp = new ResponseWrapperC(); Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-08-07 19:16:05 UTC (rev 4240) +++ stack/native/trunk/version.properties 2007-08-07 19:17:32 UTC (rev 4241) @@ -6,7 +6,7 @@ specification.version=jbossws-2.0 version.id=2.1.0.DEV -repository.id=snapshot +repository.id=2.0.1.CR1 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -26,11 +26,11 @@ # Dependend integration projects jbossws-common=1.0.0.CR1 -jbossws-framework=1.0.0.CR1 +jbossws-framework=1.0.0.CR2 jbossws-spi=1.0.0.CR1 -jbossws-jboss50=snapshot -jbossws-jboss42=snapshot -jbossws-jboss40=snapshot +jbossws-jboss50=2.0.1.CR1 +jbossws-jboss42=2.0.1.CR1 +jbossws-jboss40=2.0.1.CR1 # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR2

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4240 - in framework/trunk: src/main/java/org/jboss/wsf/framework/deployment and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-07 15:16:05 -0400 (Tue, 07 Aug 2007) New Revision: 4240 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java framework/trunk/version.properties Log: 1.0.0.CR2: DeploymentAspectInstaller works with parent/child relationships Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-07 19:13:42 UTC (rev 4239) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-07 19:16:05 UTC (rev 4240) @@ -102,8 +102,11 @@ ClassLoader classLoader = service.getDeployment().getRuntimeClassLoader(); if (classLoader == null) + { + // TODO: IMO this is an exception classLoader = service.getDeployment().getInitialClassLoader(); - + } + if (classLoader == null) throw new IllegalStateException("Deployment classloader not set"); Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-08-07 19:13:42 UTC (rev 4239) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-08-07 19:16:05 UTC (rev 4240) @@ -43,11 +43,23 @@ { // provide logging private static final Logger log = Logger.getLogger(DeploymentAspectInstaller.class); - + + private DeploymentAspectManager parent; private DeploymentAspectManager manager; private Set<DeploymentAspect> aspects; private boolean sortAspectsOnCreate; + private Set<String> parentProvidedConditions = new HashSet<String>(); + public DeploymentAspectManager getParent() + { + return parent; + } + + public void setParent(DeploymentAspectManager parent) + { + this.parent = parent; + } + public void setManager(DeploymentAspectManager manager) { this.manager = manager; @@ -66,6 +78,17 @@ public void create() { List<DeploymentAspect> unsortedAspects = new ArrayList<DeploymentAspect>(); + + if(parent!=null) + { + Iterator<DeploymentAspect> it = parent.getDeploymentAspects().iterator(); + while(it.hasNext()) + { + DeploymentAspect aspect = it.next(); + parentProvidedConditions.addAll( aspect.getProvidesAsSet()); + } + } + unsortedAspects.addAll(manager.getDeploymentAspects()); unsortedAspects.addAll(aspects); @@ -75,8 +98,9 @@ sortedAspects = new ArrayList<DeploymentAspect>(); List<DeploymentAspect> allAspects = new ArrayList<DeploymentAspect>(unsortedAspects); - // Add aspects with no requirements first + // Add aspects with no requirements first Iterator<DeploymentAspect> itAll = allAspects.iterator(); + while (itAll.hasNext()) { DeploymentAspect aspect = itAll.next(); @@ -98,7 +122,7 @@ sortedAspects.add(index, aspect); itAll.remove(); - itAll = allAspects.iterator(); + itAll = allAspects.iterator(); // Hm,... } } @@ -132,27 +156,38 @@ DeploymentAspect sortedAspect = sortedAspects.get(i); providedConditions.addAll(sortedAspect.getProvidesAsSet()); } + + String exmsg = "Cannot add deployment aspect(s)"; + StringBuilder str = new StringBuilder(exmsg); + + if(parent!=null) + str.append( "\n"+parent.getName()+ " provides: " + parentProvidedConditions); + str.append( "\n"+manager.getName()+ " provides: " + providedConditions); - String exmsg = "Cannot add deployment aspect(s)"; - StringBuilder str = new StringBuilder(exmsg + "\nProvided Conditions are: " + providedConditions); for (DeploymentAspect da : allAspects) { str.append("\n " + da.getClass().getName() + ", requires: " + da.getRequires()); } log.error(str); - throw new IllegalStateException(exmsg); + throw new IllegalStateException(str.toString()); } private int getAspectIndex(List<DeploymentAspect> sortedAspects, DeploymentAspect aspect) { int index = -1; - Set<String> providedConditions = new HashSet<String>(); + Set<String> selfProvidedConditions = new HashSet<String>(); for (int i = 0; i < sortedAspects.size(); i++) { DeploymentAspect sortedAspect = sortedAspects.get(i); - providedConditions.addAll(sortedAspect.getProvidesAsSet()); - if (providedConditions.containsAll(aspect.getRequiresAsSet())) + selfProvidedConditions.addAll(sortedAspect.getProvidesAsSet()); + + // take both parent and child conditions into consideration + HashSet<String> parentAndChildConditions = new HashSet<String>(); + parentAndChildConditions.addAll(parentProvidedConditions); + parentAndChildConditions.addAll(selfProvidedConditions); + + if (parentAndChildConditions.containsAll(aspect.getRequiresAsSet())) { index = i + 1; break; Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-08-07 19:13:42 UTC (rev 4239) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-08-07 19:16:05 UTC (rev 4240) @@ -90,10 +90,15 @@ DeploymentAspect aspect = getDeploymentAspects().get(i); // Check that all required aspects are met + /* + TODO: This should done by adding all provided conditions to the Deployment + when being executed. Otherwise we will miss the parent provided conditions here + Set<String> requiredSet = aspect.getRequiresAsSet(); requiredSet.remove(DeploymentAspect.LAST_DEPLOYMENT_ASPECT); if (providedConditions.containsAll(requiredSet) == false) throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect); + */ logInvocation(aspect, "Create"); aspect.create(dep); Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-07 19:13:42 UTC (rev 4239) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-07 19:16:05 UTC (rev 4240) @@ -57,7 +57,11 @@ ClassLoader rtcl = dep.getRuntimeClassLoader(); if (rtcl == null) + { + // TODO: What's this? Look's quiet hacky... + log.warn("Using inital class laoder as runtime laoder. Hack?", new IllegalArgumentException()); dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + } for (Endpoint ep : dep.getService().getEndpoints()) { Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2007-08-07 19:13:42 UTC (rev 4239) +++ framework/trunk/version.properties 2007-08-07 19:16:05 UTC (rev 4240) @@ -5,10 +5,10 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.CR1 -repository.id=1.0.0.CR1 +version.id=1.0.0.CR2 +repository.id=1.0.0.CR2 -implementation.title=JBoss Web Services - Common +implementation.title=JBoss Web Services - Framework implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4239 - in container: jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40 and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-07 15:13:42 -0400 (Tue, 07 Aug 2007) New Revision: 4239 Added: container/jboss40/trunk/ant.properties container/jboss40/trunk/jboss40.iml container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/Phase2DeployerHookJSE.java container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/RuntimeLoaderDeploymentAspect.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/AbstractDeployerHook.java container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml container/jboss40/trunk/version.properties container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml container/jboss42/trunk/version.properties container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml container/jboss50/trunk/version.properties Log: 1.0.0.CR1: Support 2 phase JSE deployments. Cleanup classloading Added: container/jboss40/trunk/ant.properties =================================================================== --- container/jboss40/trunk/ant.properties (rev 0) +++ container/jboss40/trunk/ant.properties 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Home +jboss40.home=/home/hbraun/dev/prj/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3 + +# The JBoss settings +jboss.server.instance=default + +# JBoss Repository +jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository/ +#jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository/ + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Added: container/jboss40/trunk/jboss40.iml =================================================================== --- container/jboss40/trunk/jboss40.iml (rev 0) +++ container/jboss40/trunk/jboss40.iml 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-xml-binding.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-system.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/server/default/lib/jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/AbstractDeployerHook.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/AbstractDeployerHook.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/AbstractDeployerHook.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -53,12 +53,20 @@ private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; + protected String deploymentManagerName; + + /** MC provided property **/ + public void setDeploymentManagerName(String deploymentManagerName) + { + this.deploymentManagerName = deploymentManagerName; + } + public DeploymentAspectManager getDeploymentAspectManager() { if(null == deploymentAspectManager) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager(getDeploymentType()); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName ); } return deploymentAspectManager; Added: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss40; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXRPCDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -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.container.jboss40; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + + /** + * Reject JAX-RPC deployments + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact + return (wsMetaData==null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JAXWSDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/Phase2DeployerHookJSE.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/Phase2DeployerHookJSE.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/Phase2DeployerHookJSE.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,64 @@ +/* + * 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.container.jboss40; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.deployment.DeploymentInfo; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class Phase2DeployerHookJSE extends AbstractDeployerHookJSE +{ + /** + * The deployment should be created in phase 1. + */ + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo di) + { + Deployment deployment = (Deployment)di.context.get(Deployment.class); + if(null == deployment) + throw new IllegalArgumentException("spi.Deployment missing. Should be created in Phase 1"); + + return deployment; + } + + /** + * A phase 2 deployer hook needs to reject first-place + * JSE deployments and wait for those that are re-written. + * We rely on the fact that spi.Deployment is created in phase 1. + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo di) + { + if(super.isWebServiceDeployment(di) == false) + return false; + + Deployment deployment = (Deployment)di.context.get(Deployment.class); + return deployment!=null; + } + +} Property changes on: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/Phase2DeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/RuntimeLoaderDeploymentAspect.java (rev 0) +++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/RuntimeLoaderDeploymentAspect.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss40; + +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.ApplicationMetaData; + +/** + * Determines the correct runtime loader for per deployment type + * and makes it available through the {@link org.jboss.wsf.spi.deployment.Deployment}. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class RuntimeLoaderDeploymentAspect extends DeploymentAspect +{ + + public void create(Deployment dep) + { + + // JSE endpoints + if (dep.getAttachment(WebMetaData.class) != null) + { + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); + ClassLoader classLoader = webMetaData.getContextLoader(); + dep.setRuntimeClassLoader(classLoader); + } + + // EJB3 endpoints + else if (dep.getType() == Deployment.DeploymentType.JAXRPC_EJB3 + || dep.getType() == Deployment.DeploymentType.JAXWS_EJB3 ) + { + // loader provided by the deployer hook + if(null == dep.getRuntimeClassLoader()) + throw new IllegalArgumentException("Runtime loader not provided"); + } + + // EJB21 endpoints + else if(dep.getAttachment(ApplicationMetaData.class)!=null) + { + // loader provided by the deployer hook + if(null == dep.getRuntimeClassLoader()) + throw new IllegalArgumentException("Runtime loader not provided"); + } + + else + { + throw new IllegalArgumentException("Unable to determine runtime loader"); + } + } +} Property changes on: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/RuntimeLoaderDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-07 19:13:42 UTC (rev 4239) @@ -47,28 +47,54 @@  +  <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> </list> </property> </bean> +  + <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> </list> </property> </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> </list> </property> </bean> +  + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> @@ -82,6 +108,9 @@ <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerJSE</property> </bean> + <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE2</property> + </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> @@ -155,6 +184,11 @@ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean>  <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/> @@ -175,29 +209,46 @@ </bean>  + +  <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> + <depends>WSDeploymentAspectInstallerJSE</depends> </bean> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -217,6 +268,7 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> Modified: container/jboss40/trunk/version.properties =================================================================== --- container/jboss40/trunk/version.properties 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss40/trunk/version.properties 2007-08-07 19:13:42 UTC (rev 4239) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=snapshot -repository.id=snapshot +version.id=2.0.1.CR2 +repository.id=2.0.1.CR2 implementation.title=JBoss Web Services - Integration JBoss40 implementation.url=http://www.jboss.org/products/jbossws @@ -20,4 +20,4 @@ dom4j=1.6.1 sun-jaxrpc=1.1 -sun-jaxws=2.1.1 \ No newline at end of file +sun-jaxws=2.1.1 Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -53,12 +53,20 @@ private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; + protected String deploymentManagerName; + + /** MC provided property **/ + public void setDeploymentManagerName(String deploymentManagerName) + { + this.deploymentManagerName = deploymentManagerName; + } + public DeploymentAspectManager getDeploymentAspectManager() { if(null == deploymentAspectManager) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager(getDeploymentType()); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName ); } return deploymentAspectManager; Added: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,59 @@ +/* + * 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.container.jboss42; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + + /** + * Reject JAX-RPC deployments + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact + return (wsMetaData==null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,64 @@ +/* + * 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.container.jboss42; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class Phase2DeployerHookJSE extends AbstractDeployerHookJSE +{ + /** + * The deployment should be created in phase 1. + */ + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo di) + { + Deployment deployment = (Deployment)di.context.get(Deployment.class); + if(null == deployment) + throw new IllegalArgumentException("spi.Deployment missing. Should be created in Phase 1"); + + return deployment; + } + + /** + * A phase 2 deployer hook needs to reject first-place + * JSE deployments and wait for those that are re-written. + * We rely on the fact that spi.Deployment is created in phase 1. + */ + @Override + public boolean isWebServiceDeployment(DeploymentInfo di) + { + if(super.isWebServiceDeployment(di) == false) + return false; + + Deployment deployment = (Deployment)di.context.get(Deployment.class); + return deployment!=null; + } + +} Property changes on: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java (rev 0) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.container.jboss42; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; + +/** + * Determines the correct runtime loader for per deployment type + * and makes it available through the {@link org.jboss.wsf.spi.deployment.Deployment}. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class RuntimeLoaderDeploymentAspect extends DeploymentAspect +{ + + public void create(Deployment dep) + { + + // JSE endpoints + if (dep.getAttachment(WebMetaData.class) != null) + { + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); + ClassLoader classLoader = webMetaData.getContextLoader(); + dep.setRuntimeClassLoader(classLoader); + } + + // EJB3 endpoints + else if (dep.getType() == Deployment.DeploymentType.JAXRPC_EJB3 + || dep.getType() == Deployment.DeploymentType.JAXWS_EJB3 ) + { + // loader provided by the deployer hook + if(null == dep.getRuntimeClassLoader()) + throw new IllegalArgumentException("Runtime loader not provided"); + } + + // EJB21 endpoints + else if(dep.getAttachment(ApplicationMetaData.class)!=null) + { + // loader provided by the deployer hook + if(null == dep.getRuntimeClassLoader()) + throw new IllegalArgumentException("Runtime loader not provided"); + } + + else + { + throw new IllegalArgumentException("Unable to determine runtime loader"); + } + } +} Property changes on: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-07 19:13:42 UTC (rev 4239) @@ -55,28 +55,58 @@  + +  <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> </list> </property> </bean> + +  + <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> </list> </property> </bean> + +  <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> </list> </property> </bean> + +  + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> @@ -90,6 +120,9 @@ <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerJSE</property> </bean> + <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE2</property> + </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> @@ -143,7 +176,8 @@ </bean> <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> - <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> +  + <property name="requires">ContextProperties, ContainerMetaData</property> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> @@ -163,6 +197,11 @@ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean>  <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> @@ -181,30 +220,46 @@ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> -  +  +  <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="parent"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> + <depends>WSDeploymentAspectInstallerJSE</depends> </bean> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -224,6 +279,7 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> Modified: container/jboss42/trunk/version.properties =================================================================== --- container/jboss42/trunk/version.properties 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss42/trunk/version.properties 2007-08-07 19:13:42 UTC (rev 4239) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=snapshot -repository.id=snapshot +version.id=2.0.1.CR2 +repository.id=2.0.1.CR2 implementation.title=JBoss Web Services - Integration JBoss42 implementation.url=http://www.jboss.org/products/jbossws Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -46,12 +46,20 @@ private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; + protected String deploymentManagerName; + + /** MC provided property **/ + public void setDeploymentManagerName(String deploymentManagerName) + { + this.deploymentManagerName = deploymentManagerName; + } + public DeploymentAspectManager getDeploymentAspectManager() { if(null == deploymentAspectManager) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager(getDeploymentType()); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName ); } return deploymentAspectManager; Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -64,7 +64,7 @@ dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); - EJBArchiveMetaData umd = new EJBArchiveMetaData(); + EJBArchiveMetaData umd = new EJBArchiveMetaData(); buildUnifiedBeanMetaData(umd, ejb3Deployment); buildWebservicesMetaData(umd, jarDD); Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -44,7 +44,7 @@ */ public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB { - /** Get the deployemnt type this deployer can handle + /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() { Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -44,7 +44,7 @@ */ public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE { - /** Get the deployemnt type this deployer can handle + /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() { @@ -59,7 +59,7 @@ { ArchiveDeployment dep = newDeployment(unit); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(null); + dep.setRuntimeClassLoader(null); // TODO: Create RuntimeLoader aspect dep.setType(getDeploymentType()); Service service = dep.getService(); Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,52 @@ +/* + * 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.container.jboss50; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXRPC_JSE; + } + + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return (wsMetaData!=null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -46,7 +46,7 @@ */ public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB { - /** Get the deployemnt type this deployer can handle + /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() { Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -46,7 +46,7 @@ */ public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE { - /** Get the deployemnt type this deployer can handle + /** Get the deployment type this deployer can handle */ public DeploymentType getDeploymentType() { @@ -57,8 +57,7 @@ public Deployment createDeployment(DeploymentUnit unit) { ArchiveDeployment dep = newDeployment(unit); - dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setRuntimeClassLoader(null); + dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setType(getDeploymentType()); Service service = dep.getService(); Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,59 @@ +/* + * 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.container.jboss50; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.web.Servlet; + +import java.util.Iterator; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JAXWSDeployerHookJSE2 extends Phase2DeployerHookJSE +{ + /** Get the deployment type this deployer can handle + */ + public Deployment.DeploymentType getDeploymentType() + { + return Deployment.DeploymentType.JAXWS_JSE; + } + + + /** + * Reject JAX-RPC deployments. + * + * @param unit + * @return + */ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact + return (wsMetaData==null && super.isWebServiceDeployment(unit)); + } +} Property changes on: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,107 @@ +/* + * 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.container.jboss50; + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.web.Servlet; + +import java.util.Iterator; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class Phase2DeployerHookJSE extends AbstractDeployerHookJSE +{ + /** + * The deployment should be created in phase 1. + */ + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + if(null == dep) + throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1"); + + return dep; + } + + /** + * A phase 2 deployer hook needs to reject first-place + * JSE deployments and wait for those that are re-written. + * We do it by inspecting the Servlet init parameter. + * @param unit + * @return + */ + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if(super.isWebServiceDeployment(unit) == false) + return false; + + Deployment deployment = unit.getAttachment(Deployment.class); + boolean isModified =false; + if(deployment!=null) + isModified = isModifiedServletClass(deployment); + return isModified; + } + + private boolean isModifiedServletClass(Deployment dep) + { + boolean modified = false; + + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + modified = isAlreadyModified(servlet); + } + } + + return modified; + } + + private boolean isAlreadyModified(Servlet servlet) + { + Iterator itParams = servlet.getInitParams().iterator(); + while (itParams.hasNext()) + { + NameValuePair pair = (NameValuePair)itParams.next(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) + return true; + } + return false; + } +} Property changes on: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/Phase2DeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,68 @@ +/* + * 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.container.jboss50; + +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.ejb3.Ejb3Deployment; + +/** + * Determines the correct runtime loader for per deployment type + * and makes it available through the {@link Deployment}. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class RuntimeLoaderDeploymentAspect extends DeploymentAspect +{ + + public void create(Deployment dep) + { + + // JSE endpoints + if (dep.getAttachment(WebMetaData.class) != null) + { + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); + ClassLoader classLoader = webMetaData.getContextLoader(); + dep.setRuntimeClassLoader(classLoader); + } + + // EJB3 endpoints + else if (dep.getAttachment(Ejb3Deployment.class) != null) + { + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + } + + // EJB21 endpoints + else if (dep.getAttachment(ApplicationMetaData.class) != null) + { + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + } + + else + { + throw new IllegalArgumentException("Unable to determine runtime loader"); + } + } +} Property changes on: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java (rev 0) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java 2007-08-07 19:13:42 UTC (rev 4239) @@ -0,0 +1,43 @@ +/* + * 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.container.jboss50; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WebServiceDeployerJSE2 extends AbstractWebServiceDeployer +{ + private int relOrderPhase1; + + + public void setRelOrderPhase1(int relOrderPhase1) + { + this.relOrderPhase1 = relOrderPhase1; + } + + @Override + public int getRelativeOrder() + { + return relOrderPhase1 + 1; + } +} \ No newline at end of file Property changes on: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceDeployerJSE2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-07 19:13:42 UTC (rev 4239) @@ -74,11 +74,23 @@ <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <depends>WebAppParsingDeployer</depends> </bean> + +  + <bean name="WebServiceDeployerJSE2" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE2"> + <property name="relOrderPhase1"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> + <depends>WebServiceDeployerJSE</depends> + </bean> -  + +  <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -91,7 +103,24 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> +  + <bean name="WSDeployerHook_JAXRPC_JSE2" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <install bean="WebServiceDeployerJSE2" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE2" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE2</depends> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> @@ -104,7 +133,10 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> + +  <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE</property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -117,7 +149,24 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> +  + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE2"> + <property name="deploymentManagerName">WSDeploymentAspectManagerJSE2</property> + <install bean="WebServiceDeployerJSE2" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE2" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE2</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> @@ -137,6 +186,9 @@ <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerJSE</property> </bean> + <bean name="WSDeploymentAspectManagerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE2</property> + </bean> <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> @@ -189,7 +241,8 @@ </bean> <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeploymentAspect"> - <property name="requires">ContextProperties, StackDescriptor</property> + <property name="requires">ContextProperties</property> +  </bean> <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> @@ -209,6 +262,11 @@ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.RuntimeLoaderDeploymentAspect"> +  + <property name="provides">RuntimeLoader</property> + </bean>  <bean name="WSEndpointMetrics" class="org.jboss.wsf.framework.management.EndpointMetricsImpl"/> @@ -219,12 +277,26 @@ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> -  +  + +  <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerJSE2" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE2"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -233,16 +305,17 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -262,6 +335,7 @@ <property name="sortAspectsOnCreate">false</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> Modified: container/jboss50/trunk/version.properties =================================================================== --- container/jboss50/trunk/version.properties 2007-08-07 11:11:28 UTC (rev 4238) +++ container/jboss50/trunk/version.properties 2007-08-07 19:13:42 UTC (rev 4239) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=snapshot -repository.id=snapshot +version.id=2.0.1.CR2 +repository.id=2.0.1.CR2 implementation.title=JBoss Web Services - Integration JBoss50 implementation.url=http://www.jboss.org/products/jbossws

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4238 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-07 07:11:28 -0400 (Tue, 07 Aug 2007) New Revision: 4238 Added: stack/native/branches/jbossws-2.0/ Log: Create branches jbossws-2.0 Copied: stack/native/branches/jbossws-2.0 (from rev 4237, stack/native/trunk)

17 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007