[jboss-cvs] JBossAS SVN: r70035 - in trunk: server/src/main/org/jboss/ejb/deployers and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 22 08:05:14 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-02-22 08:05:14 -0500 (Fri, 22 Feb 2008)
New Revision: 70035
Added:
trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployment.java
trunk/server/src/main/org/jboss/web/deployers/WarDeployment.java
trunk/system-jmx/src/main/org/jboss/system/deployers/MultipleServicesDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceMetaDataSet.java
Modified:
trunk/server/src/etc/conf/default/bootstrap-beans.xml
trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/webservices/build.xml
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java
trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
Log:
Fix issue with a deployment wanting to create multiple services through the ServiceDeployer
Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml 2008-02-22 13:05:14 UTC (rev 70035)
@@ -273,6 +273,9 @@
<constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
<property name="type">sar</property>
</bean>
+ <bean name="MultipleServicesDeployer" class="org.jboss.system.deployers.MultipleServicesDeployer">
+ <property name="serviceDeployer"><inject bean="ServiceDeployer"/></property>
+ </bean>
<!-- UnifiedClassLoader -->
<!--bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer">
Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -82,6 +82,7 @@
{
super(JBossMetaData.class);
setOutput(ServiceMetaData.class);
+ setOutput(EjbDeployment.class);
}
public String getTransactionManagerServiceName()
Added: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployment.java (rev 0)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployment.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.ejb.deployers;
+
+// $Id$
+
+
+/**
+ * A deployer output for EJB2.x deployments.
+ * Used for deployer ordering.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 22-Feb-2008
+ */
+public class EjbDeployment
+{
+}
Property changes on: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -47,6 +47,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.system.deployers.ServiceMetaDataSet;
import org.jboss.system.metadata.ServiceConstructorMetaData;
import org.jboss.system.metadata.ServiceDependencyMetaData;
import org.jboss.system.metadata.ServiceMetaData;
@@ -115,6 +116,8 @@
{
super(JBossWebMetaData.class);
setOutput(ServiceMetaData.class);
+ setOutput(ServiceMetaDataSet.class);
+ setOutput(WarDeployment.class);
}
/** Get the flag indicating if the normal Java2 parent first class loading
@@ -677,10 +680,21 @@
// deployers that use ServiceMetaData as an input (e.g. the
// org.jboss.system.deployers.ServiceDeployer). Those deployers
// can now take over deploying the web module.
-
- // TODO could create multiple components for the deployment
- // The ServiceConstructorMetaData is not serializable due to its args
- unit.addAttachment(ServiceMetaData.class, webModule);
+
+ // In case there already is a ServiceMetaData object attached, we use a set
+ ServiceMetaData prevService = unit.getAttachment(ServiceMetaData.class);
+ if (prevService != null)
+ {
+ ServiceMetaDataSet services = new ServiceMetaDataSet();
+ services.add(prevService);
+ services.add(webModule);
+ unit.addAttachment(ServiceMetaDataSet.class, services);
+ unit.removeAttachment(ServiceMetaData.class);
+ }
+ else
+ {
+ unit.addAttachment(ServiceMetaData.class, webModule);
+ }
}
catch (Exception e)
{
Added: trunk/server/src/main/org/jboss/web/deployers/WarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WarDeployment.java (rev 0)
+++ trunk/server/src/main/org/jboss/web/deployers/WarDeployment.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * 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.web.deployers;
+
+// $Id$
+
+/**
+ * A deployer output for webapp deployments.
+ * Used for deployer ordering.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 22-Feb-2008
+ */
+public class WarDeployment
+{
+}
Property changes on: trunk/server/src/main/org/jboss/web/deployers/WarDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/system-jmx/src/main/org/jboss/system/deployers/MultipleServicesDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/MultipleServicesDeployer.java (rev 0)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/MultipleServicesDeployer.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.system.deployers;
+
+// $Id$
+
+import java.util.Iterator;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.system.metadata.ServiceMetaData;
+
+/**
+ * A deployer that iterates over a set of service deployments.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 22-Feb-2008
+ */
+public class MultipleServicesDeployer extends AbstractSimpleRealDeployer<ServiceMetaDataSet>
+{
+ private ServiceDeployer serviceDeployer;
+
+ public MultipleServicesDeployer()
+ {
+ super(ServiceMetaDataSet.class);
+ }
+
+ public void setServiceDeployer(ServiceDeployer serviceDeployer)
+ {
+ this.serviceDeployer = serviceDeployer;
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, ServiceMetaDataSet deployment) throws DeploymentException
+ {
+ Iterator<ServiceMetaData> it = deployment.iterator();
+ while (it.hasNext())
+ {
+ ServiceMetaData service = it.next();
+ unit.addAttachment(ServiceMetaData.class, service);
+ try
+ {
+ serviceDeployer.deploy(unit, service);
+ }
+ finally
+ {
+ unit.removeAttachment(ServiceMetaData.class);
+ }
+ }
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit unit, ServiceMetaDataSet deployment)
+ {
+ Iterator<ServiceMetaData> it = deployment.iterator();
+ while (it.hasNext())
+ {
+ ServiceMetaData service = it.next();
+ unit.addAttachment(ServiceMetaData.class, service);
+ try
+ {
+ serviceDeployer.undeploy(unit, service);
+ }
+ finally
+ {
+ unit.removeAttachment(ServiceMetaData.class);
+ }
+ }
+ }
+}
Property changes on: trunk/system-jmx/src/main/org/jboss/system/deployers/MultipleServicesDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceMetaDataSet.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceMetaDataSet.java (rev 0)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceMetaDataSet.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.system.deployers;
+
+// $Id : $
+
+import java.util.HashSet;
+
+import org.jboss.system.metadata.ServiceMetaData;
+
+/**
+ * A set of ServiceMetaData.
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 22-Feb-2008
+ */
+public class ServiceMetaDataSet extends HashSet<ServiceMetaData>
+{
+}
Property changes on: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceMetaDataSet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -118,7 +118,6 @@
*/
private JBossWebMetaData sharedMetaData = null;
-
/**
* The server xml configuration file name
*/
Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/build.xml 2008-02-22 13:05:14 UTC (rev 70035)
@@ -75,6 +75,7 @@
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
<path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="jboss.jboss.managed.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -88,52 +88,29 @@
if (beanMetaData == null)
throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName);
+ // get the MBeanServer
+ server = MBeanServerLocator.locateJBoss();
+
// get the bean's JNDI name
jndiName = beanMetaData.getContainerObjectNameJndiName();
if (jndiName == null)
throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName);
+ }
- server = MBeanServerLocator.locateJBoss();
- objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB");
- if (server.isRegistered(objectName) == false)
- throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+ public void invoke(Endpoint ep, Invocation inv) throws Exception
+ {
+ log.debug("Invoke: " + inv.getJavaMethod().getName());
- // Dynamically add the service endpoint interceptor
- // http://jira.jboss.org/jira/browse/JBWS-758
- try
+ if (objectName == null)
{
- EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule");
- StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName);
+ objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB");
+ if (server.isRegistered(objectName) == false)
+ throw new WebServiceException("Cannot find service endpoint target: " + objectName);
- boolean injectionPointFound = false;
- Interceptor prev = container.getInterceptor();
- while (prev != null && prev.getNext() != null)
- {
- Interceptor next = prev.getNext();
- if (next.getNext() == null)
- {
- log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName());
- ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor();
- prev.setNext(sepInterceptor);
- sepInterceptor.setNext(next);
- injectionPointFound = true;
- }
- prev = next;
- }
- if (injectionPointFound == false)
- log.warn("Cannot service endpoint interceptor injection point");
+ // Inject the Service endpoint interceptor
+ injectServiceEndpointInterceptor(objectName, ep.getShortName());
}
- catch (Exception ex)
- {
- log.warn("Cannot add service endpoint interceptor", ex);
- }
- }
-
- public void invoke(Endpoint ep, Invocation inv) throws Exception
- {
- log.debug("Invoke: " + inv.getJavaMethod().getName());
-
// invoke on the container
try
{
@@ -168,21 +145,54 @@
if (credential == null && sc != null)
credential = sc.getUtil().getCredential();
-
+
Method method = inv.getJavaMethod();
Object[] args = inv.getArgs();
org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
-
+
HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
if (callback == null)
throw new IllegalStateException("Cannot obtain HandlerCallback");
-
+
jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
jbInv.setType(InvocationType.SERVICE_ENDPOINT);
jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
-
+
return jbInv;
}
+
+ private void injectServiceEndpointInterceptor(ObjectName objectName, String ejbName)
+ {
+ // Dynamically add the service endpoint interceptor
+ // http://jira.jboss.org/jira/browse/JBWS-758
+ try
+ {
+ EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule");
+ StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName);
+
+ boolean injectionPointFound = false;
+ Interceptor prev = container.getInterceptor();
+ while (prev != null && prev.getNext() != null)
+ {
+ Interceptor next = prev.getNext();
+ if (next.getNext() == null)
+ {
+ log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName());
+ ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor();
+ prev.setNext(sepInterceptor);
+ sepInterceptor.setNext(next);
+ injectionPointFound = true;
+ }
+ prev = next;
+ }
+ if (injectionPointFound == false)
+ log.warn("Cannot service endpoint interceptor injection point");
+ }
+ catch (Exception ex)
+ {
+ log.warn("Cannot add service endpoint interceptor", ex);
+ }
+ }
}
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerEJB.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -21,6 +21,10 @@
*/
package org.jboss.wsf.container.jboss50;
+import org.jboss.ejb.deployers.EjbDeployment;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
//$Id: WebServiceDeployerEJB.java 3146 2007-05-18 22:55:26Z thomas.diesler at jboss.com $
/**
@@ -31,33 +35,13 @@
*/
public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
{
- private int relOrderEJB2x;
- private int relOrderEJB3;
- private int relOrderWar;
-
- public void setRelOrderEJB2x(int relOrderEJB2x)
+ public WebServiceDeployerEJB()
{
- this.relOrderEJB2x = relOrderEJB2x;
+ // Output of the EJBDeployer
+ addInput(EjbDeployment.class);
+ // Output of the EJB3Deployer
+ addInput(Ejb3Deployment.class);
+ // Input for the TomcatDeployer
+ addOutput(JBossWebMetaData.class);
}
-
- public void setRelOrderEJB3(int relOrderEJB3)
- {
- this.relOrderEJB3 = relOrderEJB3;
- }
-
- public void setRelOrderWar(int relOrderWar)
- {
- this.relOrderWar = relOrderWar;
- }
-
- @Override
- public int getRelativeOrder()
- {
- int relOrderEJB = Math.max(relOrderEJB2x, relOrderEJB3) + 1;
- if (relOrderEJB >= relOrderWar)
- throw new IllegalStateException("relOrderEJB (" + relOrderEJB + ") >= relOrderWar (" + relOrderWar + ")");
-
- return relOrderEJB;
- }
-
}
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPostJSE.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -21,24 +21,18 @@
*/
package org.jboss.wsf.container.jboss50;
-// $Id: $
+//$Id: $
+import org.jboss.web.deployers.WarDeployment;
+
/**
* @author Heiko.Braun at jboss.com
*/
public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer
{
- private int relOrderWar;
-
-
- public void setRelOrderWar(int relOrder)
+ public WebServiceDeployerPostJSE()
{
- this.relOrderWar = relOrder;
+ // Output from the TomcatDeployer
+ addInput(WarDeployment.class);
}
-
- @Override
- public int getRelativeOrder()
- {
- return relOrderWar + 1;
- }
}
\ No newline at end of file
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebServiceDeployerPreJSE.java 2008-02-22 13:05:14 UTC (rev 70035)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.container.jboss50;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
//$Id: WebServiceDeployerJSE.java 3146 2007-05-18 22:55:26Z thomas.diesler at jboss.com $
/**
@@ -33,6 +35,11 @@
{
private int relOrderWar;
+ public WebServiceDeployerPreJSE()
+ {
+ addInput(JBossWebMetaData.class);
+ }
+
public void setRelOrderWar(int relOrderWar)
{
this.relOrderWar = relOrderWar;
Modified: trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-02-22 11:34:30 UTC (rev 70034)
+++ trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-02-22 13:05:14 UTC (rev 70035)
@@ -58,9 +58,6 @@
A web service deployer that hooks in after the EJB deployers
-->
<bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
- <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
- <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property>
- <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
<depends>EJB2xDeployer</depends>
<depends>Ejb3Deployer</depends>
</bean>
@@ -75,11 +72,9 @@
<!--
A web service deployer that hooks in after the WAR deployer
- This deployer depends on the RuntimeClassloader being available.
-->
<bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPostJSE">
- <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
- <depends>WebAppParsingDeployer</depends>
+ <depends>WarDeployer</depends>
</bean>
<!--
More information about the jboss-cvs-commits
mailing list