Author: richard.opalka(a)jboss.com Date: 2008-10-10 09:59:10 -0400 (Fri, 10 Oct 2008) New Revision: 8432 Removed: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml Log: [JBWS-2336] fixing weak JBossWS deployers ordering Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -21,39 +21,35 @@ */ package org.jboss.wsf.container.jboss50.deployer; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.management.ObjectName; + import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb.deployers.EjbDeployment; import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.javaee.JavaEEComponentHelper; +import org.jboss.logging.Logger; import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; -import org.jboss.wsf.spi.metadata.j2ee.PortComponentMD; -import org.jboss.wsf.spi.metadata.j2ee.PortComponentSpec; -import org.jboss.logging.Logger; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.management.ObjectName; - /** * This web service deployer for EJB. Adopts EJB deployments to * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of * {@link org.jboss.wsf.container.jboss50.deployer.DeployerHook}'s. * + * @author richard.opalka(a)jboss.com * @author Thomas.Diesler(a)jboss.org * @author Heiko.Braun(a)jboss.com - * - * @since 24-Apr-2007 */ public class WebServiceDeployerEJB extends AbstractWebServiceDeployer { @@ -61,17 +57,12 @@ public WebServiceDeployerEJB() { + // deployers ordering contract addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME); - addInput(EjbDeployment.class); - addInput(Ejb3Deployment.class); - - // Input for the TomcatDeployer - addOutput(JBossWebMetaData.class); - - addOutput(WebServiceDeployment.class); - + addOutput(JBossWebMetaData.class); // we're creating web metadata - the input for tomcat deployer + addOutput(WebServiceDeployment.class); // we're providing webservice metadata } @Override @@ -96,7 +87,14 @@ ObjectName objName = null; try { - objName = new ObjectName(ejb.determineContainerName()); + String containerName = ejb.determineContainerName(); + if(containerName == null) + { + log.warn("Container name is null in metadata of " + ejb + ", will generate one."); + String ejbName = ejb.getEjbName(); + containerName = JavaEEComponentHelper.createObjectName(ejb3Deployment, ejbName); + } + objName = new ObjectName(containerName); } catch (Exception e) { Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -22,15 +22,19 @@ package org.jboss.wsf.container.jboss50.deployer; import org.jboss.web.deployers.WarDeployment; +import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; /** + * Web service deployer for JSE endpoints executed after tomcat deployer + * @author richard.opalka(a)jboss.com + * @author Thomas.Diesler(a)jboss.org * @author Heiko.Braun(a)jboss.com */ public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer { public WebServiceDeployerPostJSE() { - // Output from the TomcatDeployer - addInput(WarDeployment.class); + // deployers ordering contract + addInput(WarDeployment.class); // we're depending on the output from the TomcatDeployer } } Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -22,30 +22,22 @@ package org.jboss.wsf.container.jboss50.deployer; import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; /** - * This web service deployer for JSE - * + * Web service deployer for JSE endpoints executed before tomcat deployer + * @author richard.opalka(a)jboss.org * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 + * @author Heiko.Braun(a)jboss.com */ public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer { - private int relOrderWar; - public WebServiceDeployerPreJSE() { - addInput(JBossWebMetaData.class); + // deployers ordering contract + addInput(JBossWebMetaData.class); // we're depending on the output from the parsing deployers + addInput(WebServiceDeployment.class); // we're depending on WS deployer EJB + addOutput(JBossWebMetaData.class); // we're modifying web metadata - the input for tomcat deployer + addOutput(WebServiceDeployment.class); // we're providing webservice metadata } - - public void setRelOrderWar(int relOrderWar) - { - this.relOrderWar = relOrderWar; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar - 1; - } } Deleted: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.deployer; - -/** - * The main web service deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceMainDeployer extends AbstractWebServiceDeployer -{ - private int relOrderJSE; - private int relOrderEJB; - - public void setRelOrderEJB(int relOrderEJB) - { - this.relOrderEJB = relOrderEJB; - } - - public void setRelOrderJSE(int relOrderJSE) - { - this.relOrderJSE = relOrderJSE; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB, relOrderJSE) + 1; - } -} Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-10 13:59:10 UTC (rev 8432) @@ -43,25 +43,17 @@ <!-- A web service deployer that hooks in after the EJB deployers --> - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"> - <depends>EJB2xDeployer</depends> - <depends>Ejb3Deployer</depends> - </bean> + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"/> <!-- A web service deployer that hooks in before the WAR deployer --> - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"/> <!-- A web service deployer that hooks in after the WAR deployer --> - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> - <depends>WarDeployer</depends> - </bean> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"/> <!-- Register DeployerHooks with JBoss deployers Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -47,10 +47,9 @@ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of * {@link org.jboss.wsf.container.jboss50.deployer.DeployerHook}'s. * + * @author richard.opalka(a)jboss.com * @author Thomas.Diesler(a)jboss.org * @author Heiko.Braun(a)jboss.com - * - * @since 24-Apr-2007 */ public class WebServiceDeployerEJB extends AbstractWebServiceDeployer { @@ -58,17 +57,12 @@ public WebServiceDeployerEJB() { + // deployers ordering contract addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME); - addInput(EjbDeployment.class); - addInput(Ejb3Deployment.class); - - // Input for the TomcatDeployer - addOutput(JBossWebMetaData.class); - - addOutput(WebServiceDeployment.class); - + addOutput(JBossWebMetaData.class); // we're creating web metadata - the input for tomcat deployer + addOutput(WebServiceDeployment.class); // we're providing webservice metadata } @Override Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -22,15 +22,19 @@ package org.jboss.wsf.container.jboss50.deployer; import org.jboss.web.deployers.WarDeployment; +import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; /** + * Web service deployer for JSE endpoints executed after tomcat deployer + * @author richard.opalka(a)jboss.com + * @author Thomas.Diesler(a)jboss.org * @author Heiko.Braun(a)jboss.com */ public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer { public WebServiceDeployerPostJSE() { - // Output from the TomcatDeployer - addInput(WarDeployment.class); + // deployers ordering contract + addInput(WarDeployment.class); // we're depending on the output from the TomcatDeployer } } Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -22,30 +22,22 @@ package org.jboss.wsf.container.jboss50.deployer; import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; /** - * This web service deployer for JSE - * + * Web service deployer for JSE endpoints executed before tomcat deployer + * @author richard.opalka(a)jboss.org * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 + * @author Heiko.Braun(a)jboss.com */ public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer { - private int relOrderWar; - public WebServiceDeployerPreJSE() { - addInput(JBossWebMetaData.class); + // deployers ordering contract + addInput(JBossWebMetaData.class); // we're depending on the output from the parsing deployers + addInput(WebServiceDeployment.class); // we're depending on WS deployer EJB + addOutput(JBossWebMetaData.class); // we're modifying web metadata - the input for tomcat deployer + addOutput(WebServiceDeployment.class); // we're providing webservice metadata } - - 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/deployer/WebServiceMainDeployer.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 13:59:10 UTC (rev 8432) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.deployer; - -/** - * The main web service deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceMainDeployer extends AbstractWebServiceDeployer -{ - private int relOrderJSE; - private int relOrderEJB; - - public void setRelOrderEJB(int relOrderEJB) - { - this.relOrderEJB = relOrderEJB; - } - - public void setRelOrderJSE(int relOrderJSE) - { - this.relOrderJSE = relOrderJSE; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB, relOrderJSE) + 1; - } -} Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-10 13:39:10 UTC (rev 8431) +++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-10 13:59:10 UTC (rev 8432) @@ -43,25 +43,17 @@ <!-- A web service deployer that hooks in after the EJB deployers --> - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"> - <depends>EJB2xDeployer</depends> - <depends>Ejb3Deployer</depends> - </bean> + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"/> <!-- A web service deployer that hooks in before the WAR deployer --> - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"/> <!-- A web service deployer that hooks in after the WAR deployer --> - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> - <depends>WarDeployer</depends> - </bean> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"/> <!-- Register DeployerHooks with JBoss deployers