[jbossws-commits] JBossWS SVN: r8594 - in container/jboss50/ropalka-trunk/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-30 08:29:33 -0400 (Thu, 30 Oct 2008)
New Revision: 8594

Modified:
   container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
   container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
remove JBWS-2246 hacks

Modified: container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2008-10-30 07:40:01 UTC (rev 8593)
+++ container/jboss50/ropalka-trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2008-10-30 12:29:33 UTC (rev 8594)
@@ -117,16 +117,6 @@
             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();
 
          // find the servlet-class

Modified: container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml	2008-10-30 07:40:01 UTC (rev 8593)
+++ container/jboss50/ropalka-trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml	2008-10-30 12:29:33 UTC (rev 8594)
@@ -227,7 +227,7 @@
     <property name="provides">ContainerEndpointHandler</property>
   </bean>
   
-  <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect"> <!-- TODO: rollback to EndpointLifecycleDeploymentAspect -->
+  <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
     <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
   </bean>