[jboss-cvs] JBossAS SVN: r79732 - in branches/ropalka-jbossws304/webservices/src: main/org/jboss/wsf/container/jboss50/deployment/tomcat and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-20 03:43:15 -0400 (Mon, 20 Oct 2008)
New Revision: 79732

Modified:
   branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
   branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
   branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
   branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
   branches/ropalka-jbossws304/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
Log:
[JBWS-2360] sync with container integration branch

Modified: branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java	2008-10-20 07:41:51 UTC (rev 79731)
+++ branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java	2008-10-20 07:43:15 UTC (rev 79732)
@@ -30,7 +30,7 @@
 import java.util.List;
 
 /**
- * This deployer that calls the registered DeployerHooks
+ * This is the deployer that calls the registered DeployerHooks
  * 
  * @author Thomas.Diesler at jboss.org
  * @since 24-Apr-2007

Modified: branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-10-20 07:41:51 UTC (rev 79731)
+++ branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-10-20 07:43:15 UTC (rev 79732)
@@ -43,7 +43,7 @@
 import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
 
 /**
- * This web service deployer for EJB. Adopts EJB deployments to
+ * This it the 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.
  *

Modified: branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java	2008-10-20 07:41:51 UTC (rev 79731)
+++ branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java	2008-10-20 07:43:15 UTC (rev 79732)
@@ -24,7 +24,7 @@
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 
 /**
- * This web service deployer for JSE
+ * This is the web service deployer for JSE
  * 
  * @author Thomas.Diesler at jboss.org
  * @since 24-Apr-2007
@@ -36,6 +36,7 @@
    public WebServiceDeployerPreJSE()
    {
       addInput(JBossWebMetaData.class);
+      addOutput(JBossWebMetaData.class);
    }
 
    public void setRelOrderWar(int relOrderWar)

Modified: branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2008-10-20 07:41:51 UTC (rev 79731)
+++ branches/ropalka-jbossws304/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2008-10-20 07:43:15 UTC (rev 79732)
@@ -117,6 +117,16 @@
             initParams = new ArrayList<ParamValueMetaData>();
             servlet.setInitParam(initParams);
          }
+         
+         if (servlet.getLoadOnStartup() <= 0)
+         {
+            // [JBWS-2246] hack. We need to start all webservice endpoint servlets because of
+            // wsdl-publish-location feature. This feature generates wsdl to specified file
+            // location on the FS. Without starting the servlets the WSDL will not be published
+            // because publish wsdl deployment aspect is now called in endpoint init servlet
+            // lifecycle method and not in the deployers chain as it was in AS 4.x series.
+            servlet.setLoadOnStartup(1);
+         }
 
          String linkName = servlet.getServletName();
 

Modified: branches/ropalka-jbossws304/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
===================================================================
--- branches/ropalka-jbossws304/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml	2008-10-20 07:41:51 UTC (rev 79731)
+++ branches/ropalka-jbossws304/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml	2008-10-20 07:43:15 UTC (rev 79732)
@@ -156,7 +156,7 @@
       <property name="provides">ContainerEndpointHandler</property>
    </bean>
 
-   <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+   <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect">
       <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
    </bean>