[jbossws-commits] JBossWS SVN: r10222 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jun 23 08:41:18 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-06-23 08:41:18 -0400 (Tue, 23 Jun 2009)
New Revision: 10222
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServicesMetaDataDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] removing useless dependencies (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-23 12:41:18 UTC (rev 10222)
@@ -45,11 +45,11 @@
super();
// inputs
- addInput(JBossWebMetaData.class);
- addInput(WebServiceDeployment.class);
+ this.addInput( JBossWebMetaData.class );
+ this.addInput( WebServiceDeployment.class );
// outputs
- addOutput( JBossWebMetaData.class );
+ this.addOutput( JBossWebMetaData.class );
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-23 12:41:18 UTC (rev 10222)
@@ -25,14 +25,25 @@
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
+ * The phase two web service deployer for JSE.
+ *
* @author Heiko.Braun at jboss.com
+ * @author <a href="ropalka at redhat.com">Richard Opalka</a>
*/
+ at SuppressWarnings("unchecked")
public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer
{
+
+ /**
+ * Constructor.
+ */
public WebServiceDeployerPostJSE()
{
- // Output from the TomcatDeployer
- addInput(WarDeployment.class);
- addInput(WebservicesMetaData.class);
+ super();
+
+ // inputs
+ this.addInput( WarDeployment.class );
+ this.addInput( WebservicesMetaData.class );
}
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-23 12:41:18 UTC (rev 10222)
@@ -25,30 +25,28 @@
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
- * This is the web service deployer for JSE
+ * The phase one web service deployer for JSE.
*
* @author Thomas.Diesler at jboss.org
- * @since 24-Apr-2007
+ * @author <a href="ropalka at redhat.com">Richard Opalka</a>
*/
+ at SuppressWarnings("unchecked")
public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer
{
- private int relOrderWar;
+ /**
+ * Constructor.
+ */
public WebServiceDeployerPreJSE()
{
- addInput(JBossWebMetaData.class);
- addInput(WebservicesMetaData.class);
- addOutput(JBossWebMetaData.class);
+ super();
+
+ // inputs
+ this.addInput( JBossWebMetaData.class );
+ this.addInput( WebservicesMetaData.class );
+
+ // outputs
+ this.addOutput( JBossWebMetaData.class );
}
- public void setRelOrderWar(int relOrderWar)
- {
- this.relOrderWar = relOrderWar;
- }
-
- @Override
- public int getRelativeOrder()
- {
- return relOrderWar - 1;
- }
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeploymentDeployer.java 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeploymentDeployer.java 2009-06-23 12:41:18 UTC (rev 10222)
@@ -59,13 +59,13 @@
super();
// inputs
- addInput( MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME );
- addInput( EjbDeployment.class );
- addInput( Ejb3Deployment.class );
- addInput( WebservicesMetaData.class );
+ this.addInput( MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME );
+ this.addInput( EjbDeployment.class );
+ this.addInput( Ejb3Deployment.class );
+ this.addInput( WebservicesMetaData.class );
// outputs
- addOutput( WebServiceDeployment.class );
+ this.addOutput( WebServiceDeployment.class );
}
/**
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServicesMetaDataDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServicesMetaDataDeployer.java 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServicesMetaDataDeployer.java 2009-06-23 12:41:18 UTC (rev 10222)
@@ -40,7 +40,7 @@
*/
public WebServicesMetaDataDeployer()
{
- super(WebservicesMetaData.class);
+ super( WebservicesMetaData.class );
}
/**
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-23 12:12:15 UTC (rev 10221)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-23 12:41:18 UTC (rev 10222)
@@ -89,25 +89,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
More information about the jbossws-commits
mailing list