JBossWS SVN: r8441 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 07:44:02 -0400 (Sat, 11 Oct 2008)
New Revision: 8441
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
Log:
[JBWS-2135] Fixing use of annotations
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-10-11 11:35:07 UTC (rev 8440)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-10-11 11:44:02 UTC (rev 8441)
@@ -22,9 +22,6 @@
package org.jboss.test.ws.jaxws.jbws1845;
import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.ws.ResponseWrapper;
@@ -41,7 +38,8 @@
@WebService
(
targetNamespace="http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0",
- serviceName="SpamService"
+ serviceName="SpamService",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws1845.SpamComplaintWSIface"
)
@WebContext
(
@@ -51,18 +49,16 @@
)
public class SpamComplaintWS implements SpamComplaintWSIface
{
- @WebMethod(operationName="processSpamComplaints")
- @WebResult(name="SpamResult")
@ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult")
public SpamResult processSpamComplaints(
- @WebParam(name = "email") String email,
- @WebParam(name = "fromAddress") String fromAddress,
- @WebParam(name = "mailDate") String mailDate,
- @WebParam(name = "complaintDate") String complaintDate,
- @WebParam(name = "mailbox") String mailbox,
- @WebParam(name = "complainer") String complainer,
- @WebParam(name = "xRext") String xRext,
- @WebParam(name = "accountName") String accountName)
+ String email,
+ String fromAddress,
+ String mailDate,
+ String complaintDate,
+ String mailbox,
+ String complainer,
+ String xRext,
+ String accountName)
{
return new SpamResult(email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName);
}
17 years, 2 months
JBossWS SVN: r8440 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 07:35:07 -0400 (Sat, 11 Oct 2008)
New Revision: 8440
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
Log:
[JBWS-2135] Fixing usage of annotations
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java 2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java 2008-10-11 11:35:07 UTC (rev 8440)
@@ -22,8 +22,10 @@
package org.jboss.test.ws.jaxws.jbws1799;
import javax.ejb.Remote;
+import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
/**
* First service interface
@@ -34,8 +36,14 @@
*/
@Remote
@WebService
+@SOAPBinding
+(
+ style=SOAPBinding.Style.DOCUMENT,
+ use=SOAPBinding.Use.LITERAL
+)
public interface IUserAccountService
{
+ @WebMethod
public boolean authenticate
(
@WebParam(name="username") String username
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2008-10-11 11:35:07 UTC (rev 8440)
@@ -22,8 +22,10 @@
package org.jboss.test.ws.jaxws.jbws1799;
import javax.ejb.Remote;
+import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
@@ -36,8 +38,14 @@
*/
@Remote
@WebService
+@SOAPBinding
+(
+ style=SOAPBinding.Style.DOCUMENT,
+ use=SOAPBinding.Use.LITERAL
+)
public interface IUserAccountServiceExt
{
+ @WebMethod
@RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
@ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
public boolean authenticate
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java 2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java 2008-10-11 11:35:07 UTC (rev 8440)
@@ -23,10 +23,7 @@
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -40,15 +37,10 @@
@Stateless
@WebService
(
- name="UserAccountServiceEndPoint",
targetNamespace="namespace1",
- serviceName="UserAccountService1.0"
+ serviceName="UserAccountService1.0",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws1799.IUserAccountService"
)
-@SOAPBinding
-(
- style=SOAPBinding.Style.DOCUMENT,
- use=SOAPBinding.Use.LITERAL
-)
@WebContext
(
transportGuarantee="NONE",
@@ -57,12 +49,8 @@
)
public class UserAccountService implements IUserAccountService
{
- @WebMethod
@TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS)
- public boolean authenticate
- (
- @WebParam(name="username") String username
- )
+ public boolean authenticate(String username)
{
return "authorized".equals(username);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2008-10-11 11:15:44 UTC (rev 8439)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2008-10-11 11:35:07 UTC (rev 8440)
@@ -23,10 +23,7 @@
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
@@ -42,15 +39,10 @@
@Stateless
@WebService
(
- name="UserAccountServiceExtEndPoint",
targetNamespace="namespaceExt",
- serviceName="UserAccountServiceExt1.0"
+ serviceName="UserAccountServiceExt1.0",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws1799.IUserAccountServiceExt"
)
-@SOAPBinding
-(
- style=SOAPBinding.Style.DOCUMENT,
- use=SOAPBinding.Use.LITERAL
-)
@WebContext
(
transportGuarantee="NONE",
@@ -59,15 +51,10 @@
)
public class UserAccountServiceExt implements IUserAccountServiceExt
{
- @WebMethod
@TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS)
@RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
@ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
- public boolean authenticate
- (
- @WebParam(name="username") String username,
- @WebParam(name="password") String password
- )
+ public boolean authenticate(String username, String password)
{
return "authorized".equals(username) && "password".equals(password);
}
17 years, 2 months
JBossWS SVN: r8439 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 07:15:44 -0400 (Sat, 11 Oct 2008)
New Revision: 8439
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2129] Supporting exploded jar deployment
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-11 11:12:25 UTC (rev 8438)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-11 11:15:44 UTC (rev 8439)
@@ -361,7 +361,6 @@
return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
}
-
private boolean isFaultWrapperGenerationRequired(Class<?> clazz)
{
Method[] classMethods = clazz.getMethods();
@@ -388,7 +387,6 @@
return false;
}
-
protected Invoker createInvoker(Class<?> implementorClass)
{
Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker();
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-11 11:12:25 UTC (rev 8438)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-11 11:15:44 UTC (rev 8439)
@@ -187,7 +187,7 @@
}
urls.addAll(innerUrlList);
}
- else if (archiveUrl.toString().endsWith(".jar"))
+ else if (archiveUrl.toString().endsWith(".jar") || archiveUrl.toString().endsWith(".jar/"))
{
if (new File(archiveUrl.getPath()).exists())
{
17 years, 2 months
JBossWS SVN: r8438 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 07:12:25 -0400 (Sat, 11 Oct 2008)
New Revision: 8438
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.java
Log:
Fixing @WebService usage
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.java 2008-10-11 10:25:31 UTC (rev 8437)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.java 2008-10-11 11:12:25 UTC (rev 8438)
@@ -32,7 +32,6 @@
*/
@WebService
(
- name = "JBWS1762POJO",
serviceName = "JBWS1762POJOService",
endpointInterface = "org.jboss.test.ws.jaxws.jbws1762.services.POJOIface"
)
17 years, 2 months
JBossWS SVN: r8437 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-11 06:25:31 -0400 (Sat, 11 Oct 2008)
New Revision: 8437
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
Log:
[JBWS-2129] Adding @WebFault check to understand whether wrapper generation is required
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-10 18:08:27 UTC (rev 8436)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-11 10:25:31 UTC (rev 8437)
@@ -25,17 +25,21 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.jws.soap.SOAPBinding.Style;
@@ -44,6 +48,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.ws.WebFault;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.MTOMFeature;
@@ -332,24 +337,57 @@
if (webServiceAnnotation == null)
return false;
String wsdlLocation = webServiceAnnotation.wsdlLocation();
- String endpointInterface = webServiceAnnotation.endpointInterface();
if (wsdlLocation != null && !"".equals(wsdlLocation))
return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
+
+ String endpointInterface = webServiceAnnotation.endpointInterface();
javax.jws.soap.SOAPBinding soapBinding;
if (endpointInterface == null || "".equalsIgnoreCase(endpointInterface))
{
+ if (isFaultWrapperGenerationRequired(endpoint))
+ return true;
soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
}
else
{
- //getting the annotation from the SEI
+ //Using the SEI to get annotations
Class<?> sei = getImplementorClass(endpointInterface, reader, classLoader);
+ if (isFaultWrapperGenerationRequired(sei))
+ return true;
soapBinding = sei.getAnnotation(javax.jws.soap.SOAPBinding.class);
}
if (soapBinding == null)
return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
}
+
+
+ private boolean isFaultWrapperGenerationRequired(Class<?> clazz)
+ {
+ Method[] classMethods = clazz.getMethods();
+ boolean webMethodAnnUsed = false;
+ List<Method> webMethods = new LinkedList<Method>();
+ for (Method m : classMethods)
+ {
+ if (m.getAnnotation(WebMethod.class) != null)
+ {
+ webMethods.add(m);
+ webMethodAnnUsed = true;
+ }
+ }
+ List<Method> methods = webMethodAnnUsed ? webMethods : Arrays.asList(classMethods);
+ for (Method m : methods)
+ {
+ Class<?>[] exceptionClasses = m.getExceptionTypes();
+ for (Class<?> exceptionClass : exceptionClasses)
+ {
+ if (exceptionClass.getAnnotation(WebFault.class) != null)
+ return true;
+ }
+ }
+ return false;
+ }
+
protected Invoker createInvoker(Class<?> implementorClass)
{
17 years, 2 months
JBossWS SVN: r8436 - container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 14:08:27 -0400 (Fri, 10 Oct 2008)
New Revision: 8436
Modified:
container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
Log:
[JBWS-2194] Porting fix to this branch
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 17:59:52 UTC (rev 8435)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 18:08:27 UTC (rev 8436)
@@ -27,6 +27,7 @@
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.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -96,7 +97,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)
{
17 years, 2 months
JBossWS SVN: r8435 - container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 13:59:52 -0400 (Fri, 10 Oct 2008)
New Revision: 8435
Modified:
container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
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/WebServiceDeployerPreJSE.java
Log:
[JBWS-2336] Adding JBossWebMetaData output on PRE JSE deployer (make it a filter)
Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-10 17:45:22 UTC (rev 8434)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-10 17:59:52 UTC (rev 8435)
@@ -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(a)jboss.org
* @since 24-Apr-2007
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 17:45:22 UTC (rev 8434)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 17:59:52 UTC (rev 8435)
@@ -46,7 +46,7 @@
import javax.management.ObjectName;
/**
- * This web service deployer for EJB. Adopts EJB deployments to
+ * This is 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: 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 17:45:22 UTC (rev 8434)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 17:59:52 UTC (rev 8435)
@@ -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(a)jboss.org
* @since 24-Apr-2007
@@ -36,6 +36,7 @@
public WebServiceDeployerPreJSE()
{
addInput(JBossWebMetaData.class);
+ addOutput(JBossWebMetaData.class);
}
public void setRelOrderWar(int relOrderWar)
17 years, 2 months
JBossWS SVN: r8434 - container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 13:45:22 -0400 (Fri, 10 Oct 2008)
New Revision: 8434
Modified:
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
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/WebServiceDeployerPreJSE.java
Log:
[JBWS-2336] Adding JBossWebMetaData output on PRE JSE deployer (make it a filter)
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-10 17:34:00 UTC (rev 8433)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-10 17:45:22 UTC (rev 8434)
@@ -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(a)jboss.org
* @since 24-Apr-2007
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 17:34:00 UTC (rev 8433)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 17:45:22 UTC (rev 8434)
@@ -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: 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 17:34:00 UTC (rev 8433)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 17:45:22 UTC (rev 8434)
@@ -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(a)jboss.org
* @since 24-Apr-2007
@@ -36,6 +36,7 @@
public WebServiceDeployerPreJSE()
{
addInput(JBossWebMetaData.class);
+ addOutput(JBossWebMetaData.class);
}
public void setRelOrderWar(int relOrderWar)
17 years, 2 months
JBossWS SVN: r8433 - in container/jboss50: branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 13:34:00 -0400 (Fri, 10 Oct 2008)
New Revision: 8433
Added:
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] rollback previous changes, svn merge -r 8432:8431
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:59:10 UTC (rev 8432)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -21,35 +21,39 @@
*/
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
{
@@ -57,12 +61,17 @@
public WebServiceDeployerEJB()
{
- // deployers ordering contract
addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+
addInput(EjbDeployment.class);
+
addInput(Ejb3Deployment.class);
- addOutput(JBossWebMetaData.class); // we're creating web metadata - the input for tomcat deployer
- addOutput(WebServiceDeployment.class); // we're providing webservice metadata
+
+ // Input for the TomcatDeployer
+ addOutput(JBossWebMetaData.class);
+
+ addOutput(WebServiceDeployment.class);
+
}
@Override
@@ -87,14 +96,7 @@
ObjectName objName = null;
try
{
- 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);
+ objName = new ObjectName(ejb.determineContainerName());
}
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:59:10 UTC (rev 8432)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -22,19 +22,15 @@
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()
{
- // deployers ordering contract
- addInput(WarDeployment.class); // we're depending on the output from the TomcatDeployer
+ // Output from the TomcatDeployer
+ addInput(WarDeployment.class);
}
}
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:59:10 UTC (rev 8432)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -22,22 +22,30 @@
package org.jboss.wsf.container.jboss50.deployer;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
- * Web service deployer for JSE endpoints executed before tomcat deployer
- * @author richard.opalka(a)jboss.org
+ * This web service deployer for JSE
+ *
* @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
+ * @since 24-Apr-2007
*/
public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer
{
+ private int relOrderWar;
+
public WebServiceDeployerPreJSE()
{
- // 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
+ addInput(JBossWebMetaData.class);
}
+
+ public void setRelOrderWar(int relOrderWar)
+ {
+ this.relOrderWar = relOrderWar;
+ }
+
+ @Override
+ public int getRelativeOrder()
+ {
+ return relOrderWar - 1;
+ }
}
Copied: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java (from rev 8431, 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 (rev 0)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -0,0 +1,50 @@
+/*
+ * 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:59:10 UTC (rev 8432)
+++ 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 17:34:00 UTC (rev 8433)
@@ -43,17 +43,25 @@
<!--
A web service deployer that hooks in after the EJB deployers
-->
- <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"/>
+ <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB">
+ <depends>EJB2xDeployer</depends>
+ <depends>Ejb3Deployer</depends>
+ </bean>
<!--
A web service deployer that hooks in before the WAR deployer
-->
- <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"/>
+ <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE">
+ <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
+ <depends>WebAppParsingDeployer</depends>
+ </bean>
<!--
A web service deployer that hooks in after the WAR deployer
-->
- <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"/>
+ <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE">
+ <depends>WarDeployer</depends>
+ </bean>
<!--
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:59:10 UTC (rev 8432)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -47,9 +47,10 @@
* {@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
{
@@ -57,12 +58,17 @@
public WebServiceDeployerEJB()
{
- // deployers ordering contract
addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+
addInput(EjbDeployment.class);
+
addInput(Ejb3Deployment.class);
- addOutput(JBossWebMetaData.class); // we're creating web metadata - the input for tomcat deployer
- addOutput(WebServiceDeployment.class); // we're providing webservice metadata
+
+ // Input for the TomcatDeployer
+ addOutput(JBossWebMetaData.class);
+
+ addOutput(WebServiceDeployment.class);
+
}
@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:59:10 UTC (rev 8432)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -22,19 +22,15 @@
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()
{
- // deployers ordering contract
- addInput(WarDeployment.class); // we're depending on the output from the TomcatDeployer
+ // Output from the TomcatDeployer
+ addInput(WarDeployment.class);
}
}
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:59:10 UTC (rev 8432)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -22,22 +22,30 @@
package org.jboss.wsf.container.jboss50.deployer;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
- * Web service deployer for JSE endpoints executed before tomcat deployer
- * @author richard.opalka(a)jboss.org
+ * This web service deployer for JSE
+ *
* @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
+ * @since 24-Apr-2007
*/
public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer
{
+ private int relOrderWar;
+
public WebServiceDeployerPreJSE()
{
- // 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
+ addInput(JBossWebMetaData.class);
}
+
+ public void setRelOrderWar(int relOrderWar)
+ {
+ this.relOrderWar = relOrderWar;
+ }
+
+ @Override
+ public int getRelativeOrder()
+ {
+ return relOrderWar - 1;
+ }
}
Copied: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java (from rev 8431, 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 (rev 0)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java 2008-10-10 17:34:00 UTC (rev 8433)
@@ -0,0 +1,50 @@
+/*
+ * 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:59:10 UTC (rev 8432)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2008-10-10 17:34:00 UTC (rev 8433)
@@ -43,17 +43,25 @@
<!--
A web service deployer that hooks in after the EJB deployers
-->
- <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"/>
+ <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB">
+ <depends>EJB2xDeployer</depends>
+ <depends>Ejb3Deployer</depends>
+ </bean>
<!--
A web service deployer that hooks in before the WAR deployer
-->
- <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"/>
+ <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE">
+ <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
+ <depends>WebAppParsingDeployer</depends>
+ </bean>
<!--
A web service deployer that hooks in after the WAR deployer
-->
- <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"/>
+ <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE">
+ <depends>WarDeployer</depends>
+ </bean>
<!--
Register DeployerHooks with JBoss deployers
17 years, 2 months
JBossWS SVN: r8432 - in container/jboss50: branches/jbossws-jboss500CR2-3.0.4.GA/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
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
17 years, 2 months