JBossWS SVN: r10229 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:49:22 -0400 (Tue, 23 Jun 2009)
New Revision: 10229
Added:
stack/native/tags/jbossws-native-3.1.2.SP1/
Log:
[JBPAPP-2094] Tagging jbossws-native-3.1.2.SP1
Copied: stack/native/tags/jbossws-native-3.1.2.SP1 (from rev 10228, stack/native/branches/jbossws-native-3.1.2)
16 years, 4 months
JBossWS SVN: r10228 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:46:20 -0400 (Tue, 23 Jun 2009)
New Revision: 10228
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Update pom.xml
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-06-23 14:38:52 UTC (rev 10227)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-06-23 14:46:20 UTC (rev 10228)
@@ -47,9 +47,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0.SP2</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP3</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
<jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
16 years, 4 months
JBossWS SVN: r10227 - framework/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:38:52 -0400 (Tue, 23 Jun 2009)
New Revision: 10227
Added:
framework/tags/jbossws-framework-3.1.2.SP3/
Log:
[JBPAPP-2094] Tagging jbossws-framework-3.1.2.SP3
Copied: framework/tags/jbossws-framework-3.1.2.SP3 (from rev 10226, framework/branches/jbossws-framework-3.1.2)
16 years, 4 months
JBossWS SVN: r10226 - framework/branches/jbossws-framework-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:37:01 -0400 (Tue, 23 Jun 2009)
New Revision: 10226
Modified:
framework/branches/jbossws-framework-3.1.2/pom.xml
Log:
Updating pom.xml
Modified: framework/branches/jbossws-framework-3.1.2/pom.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/pom.xml 2009-06-23 14:32:59 UTC (rev 10225)
+++ framework/branches/jbossws-framework-3.1.2/pom.xml 2009-06-23 14:37:01 UTC (rev 10226)
@@ -24,8 +24,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0.SP2</jbossws.common.version>
+ <jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
</properties>
16 years, 4 months
JBossWS SVN: r10224 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:29:50 -0400 (Tue, 23 Jun 2009)
New Revision: 10224
Added:
common/tags/jbossws-common-1.1.0.SP2/
Log:
[JBPAPP-2094] Tagging jbossws-common-1.1.0.SP2
Copied: common/tags/jbossws-common-1.1.0.SP2 (from rev 10223, common/branches/jbossws-common-1.1.0)
16 years, 4 months
JBossWS SVN: r10223 - common/branches/jbossws-common-1.1.0.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 10:27:50 -0400 (Tue, 23 Jun 2009)
New Revision: 10223
Modified:
common/branches/jbossws-common-1.1.0/pom.xml
Log:
Using jbossws-spi-1.1.2.SP1
Modified: common/branches/jbossws-common-1.1.0/pom.xml
===================================================================
--- common/branches/jbossws-common-1.1.0/pom.xml 2009-06-23 12:41:18 UTC (rev 10222)
+++ common/branches/jbossws-common-1.1.0/pom.xml 2009-06-23 14:27:50 UTC (rev 10223)
@@ -26,7 +26,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
<jboss.common.version>2.2.7.GA</jboss.common.version>
<jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
</properties>
16 years, 4 months
JBossWS SVN: r10222 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)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(a)jboss.com
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
+@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(a)jboss.org
- * @since 24-Apr-2007
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
+@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
16 years, 4 months
JBossWS SVN: r10221 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-23 08:12:15 -0400 (Tue, 23 Jun 2009)
New Revision: 10221
Added:
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
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebservicesMetaDataDeployer.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (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 10:41:19 UTC (rev 10220)
+++ 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)
@@ -21,186 +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 javax.naming.Context;
-
-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.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.webservices.WebservicesMetaData;
/**
- * This it the web service deployer for EJB. Adopts EJB deployments to
+ * This it the web service deployer for EJB. It gets
* {@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 Thomas.Diesler(a)jboss.org
* @author Heiko.Braun(a)jboss.com
- *
- * @since 24-Apr-2007
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
+@SuppressWarnings("unchecked")
public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
{
- private static final Logger log = Logger.getLogger(WebServiceDeployerEJB.class);
- public WebServiceDeployerEJB()
- {
- addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
-
- addInput(EjbDeployment.class);
-
- addInput(Ejb3Deployment.class);
-
- addInput(WebservicesMetaData.class);
-
- // Input for the TomcatDeployer
- addOutput(JBossWebMetaData.class);
-
- addOutput(WebServiceDeployment.class);
-
- }
-
- @Override
- public void internalDeploy(DeploymentUnit unit) throws DeploymentException
- {
- JBossMetaData beans = (JBossMetaData)unit.getAttachment(
- MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME
- );
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
-
- if(beans!=null)
- {
- WebServiceDeploymentAdapter wsDeployment = new WebServiceDeploymentAdapter();
-
- Iterator<JBossEnterpriseBeanMetaData> iterator = beans.getEnterpriseBeans().iterator();
- while(iterator.hasNext())
- {
- JBossEnterpriseBeanMetaData ejb = iterator.next();
- EJBContainer ejbContainer = null;
- if (ejb3Deployment != null && !ejb.isEntity())
- {
- ObjectName objName = null;
- try
- {
- objName = new ObjectName(ejb.determineContainerName());
- }
- catch (Exception e)
- {
- throw new DeploymentException(e);
- }
- ejbContainer = (EJBContainer)ejb3Deployment.getContainer(objName);
- }
- if(ejb.getEjbClass()!=null)
- wsDeployment.getEndpoints().add( new WebServiceDeclarationAdapter(ejb, ejbContainer, unit.getClassLoader()) );
- else
- log.warn("Ingore ejb deployment with null classname: " + ejb);
- }
-
- unit.addAttachment(WebServiceDeployment.class, wsDeployment);
-
- super.internalDeploy(unit);
- }
- }
-
- @Override
- public void internalUndeploy(DeploymentUnit unit)
- {
- super.internalUndeploy(unit);
- }
-
/**
- * Adopts EJB3 bean meta data to a {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration}
+ * Constructor.
*/
- private class WebServiceDeclarationAdapter implements WebServiceDeclaration
+ public WebServiceDeployerEJB()
{
-
- private JBossEnterpriseBeanMetaData ejbMetaData;
- private EJBContainer ejbContainer;
- private ClassLoader loader;
-
- public WebServiceDeclarationAdapter(JBossEnterpriseBeanMetaData ejbMetaData, EJBContainer ejbContainer, ClassLoader loader)
- {
- this.ejbMetaData = ejbMetaData;
- this.ejbContainer = ejbContainer;
- this.loader = loader;
- }
-
- public String getContainerName()
- {
- return ejbMetaData.determineContainerName();
- }
+ super();
- public Context getContext()
- {
- return ejbContainer.getEnc();
- }
+ // inputs
+ addInput(JBossWebMetaData.class);
+ addInput(WebServiceDeployment.class);
- public String getComponentName()
- {
- return ejbMetaData.getName();
- }
-
- public String getComponentClassName()
- {
- return ejbMetaData.getEjbClass();
- }
-
- public <T extends Annotation> T getAnnotation(Class<T> annotation)
- {
- T result = ejbContainer != null ? ejbContainer.getAnnotation(annotation) : null;
- if (result == null)
- {
- Class bean = getComponentClass();
- if(bean.isAnnotationPresent(annotation))
- {
- result = (T)bean.getAnnotation(annotation);
- }
- }
- return result;
- }
-
- private Class getComponentClass()
- {
- try
- {
- return loader.loadClass(getComponentClassName());
- } catch (ClassNotFoundException e)
- {
- throw new RuntimeException("Failed to load component class "+ getComponentClassName()+". Loader:" + this.loader);
- }
- }
+ // outputs
+ addOutput( JBossWebMetaData.class );
}
- /**
- * Adopts an EJB deployment to a {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeployment}
- */
- private class WebServiceDeploymentAdapter implements WebServiceDeployment
- {
- private List<WebServiceDeclaration> endpoints = new ArrayList<WebServiceDeclaration>();
-
- public List<WebServiceDeclaration> getServiceEndpoints()
- {
- return endpoints;
- }
-
- public List<WebServiceDeclaration> getEndpoints()
- {
- return endpoints;
- }
- }
}
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,269 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+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.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * WebServiceDeployment deployer processes EJB containers and its metadata and creates WS adapters wrapping it.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebServiceDeploymentDeployer extends AbstractRealDeployer
+{
+
+ /**
+ * Constructor.
+ */
+ public WebServiceDeploymentDeployer()
+ {
+ super();
+
+ // inputs
+ addInput( MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME );
+ addInput( EjbDeployment.class );
+ addInput( Ejb3Deployment.class );
+ addInput( WebservicesMetaData.class );
+
+ // outputs
+ addOutput( WebServiceDeployment.class );
+ }
+
+ /**
+ * Deploys WebServiceDeployment meta data.
+ */
+ @Override
+ protected void internalDeploy( final DeploymentUnit unit ) throws DeploymentException
+ {
+ final JBossMetaData mergedMD = ( JBossMetaData )unit.getAttachment(
+ MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME
+ );
+ final Ejb3Deployment ejb3Deployment = unit.getAttachment( Ejb3Deployment.class );
+
+ if( mergedMD != null )
+ {
+ final WebServiceDeploymentAdapter wsDeploymentAdapter = new WebServiceDeploymentAdapter();
+ final Iterator< JBossEnterpriseBeanMetaData > ejbIterator = mergedMD.getEnterpriseBeans().iterator();
+
+ while( ejbIterator.hasNext() )
+ {
+ final JBossEnterpriseBeanMetaData ejbMD = ejbIterator.next();
+ final EJBContainer ejbContainer = this.getContainer( ejb3Deployment, ejbMD );
+
+ if( ejbMD.getEjbClass() != null )
+ {
+ wsDeploymentAdapter.getServiceEndpoints().add(
+ new WebServiceDeclarationAdapter( ejbMD, ejbContainer, unit.getClassLoader() )
+ );
+ }
+ else
+ {
+ log.warn( "Ingoring ejb deployment with null classname: " + ejbMD );
+ }
+ }
+
+ unit.addAttachment( WebServiceDeployment.class, wsDeploymentAdapter );
+ }
+ }
+
+ /**
+ * Returns EJB container if EJB3 deployment is detected and EJB meta data does not represent entity bean.
+ *
+ * @param ejb3Deployment EJB3 deployment meta data
+ * @param ejbMD EJB meta data
+ * @return EJB container or null if not EJB3 stateless bean
+ * @throws DeploymentException if some error occurs
+ */
+ private EJBContainer getContainer( final Ejb3Deployment ejb3Deployment, final JBossEnterpriseBeanMetaData ejbMD )
+ throws DeploymentException
+ {
+ if ( ( ejb3Deployment != null ) && ( ejbMD.isEntity() == false ) )
+ {
+ try
+ {
+ final ObjectName objName = new ObjectName( ejbMD.determineContainerName() );
+ return ( EJBContainer ) ejb3Deployment.getContainer( objName );
+ }
+ catch ( MalformedObjectNameException e )
+ {
+ throw new DeploymentException( e );
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Adopts EJB3 bean meta data to a
+ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration}.
+ */
+ private static class WebServiceDeclarationAdapter implements WebServiceDeclaration
+ {
+
+ private final JBossEnterpriseBeanMetaData ejbMetaData;
+ private final EJBContainer ejbContainer;
+ private final ClassLoader loader;
+
+ /**
+ * Constructor.
+ *
+ * @param ejbMetaData EJB metadata
+ * @param ejbContainer EJB container
+ * @param loader class loader
+ */
+ private WebServiceDeclarationAdapter
+ (
+ final JBossEnterpriseBeanMetaData ejbMetaData,
+ final EJBContainer ejbContainer,
+ final ClassLoader loader
+ )
+ {
+ super();
+
+ this.ejbMetaData = ejbMetaData;
+ this.ejbContainer = ejbContainer;
+ this.loader = loader;
+ }
+
+ /**
+ * Returns EJB container name.
+ *
+ * @return container name
+ */
+ public String getContainerName()
+ {
+ return this.ejbMetaData.determineContainerName();
+ }
+
+ /**
+ * Returns JNDI context associated with EJB container.
+ *
+ * @return JNDI context
+ */
+ public Context getContext()
+ {
+ return this.ejbContainer.getEnc();
+ }
+
+ /**
+ * Returns EJB name.
+ *
+ * @returns name
+ */
+ public String getComponentName()
+ {
+ return this.ejbMetaData.getName();
+ }
+
+ /**
+ * Returns EJB class name.
+ *
+ * @return class name
+ */
+ public String getComponentClassName()
+ {
+ return this.ejbMetaData.getEjbClass();
+ }
+
+ /**
+ * Returns requested annotation associated with EJB container or EJB bean.
+ *
+ * @return requested annotation or null if not found
+ */
+ public < T extends Annotation > T getAnnotation( final Class<T> annotationType )
+ {
+ final boolean haveEjbContainer = this.ejbContainer != null;
+
+ if ( haveEjbContainer )
+ {
+ return this.ejbContainer.getAnnotation( annotationType );
+ }
+ else
+ {
+ final Class< ? > bean = this.getComponentClass();
+ return ( T ) bean.getAnnotation( annotationType );
+ }
+ }
+
+ /**
+ * Loads ejb class from associated loader.
+ *
+ * @return ejb class instance
+ */
+ private Class< ? > getComponentClass()
+ {
+ try
+ {
+ return this.loader.loadClass( this.getComponentClassName() );
+ }
+ catch ( ClassNotFoundException cnfe )
+ {
+ throw new RuntimeException( "Failed to load component class: " +
+ this.getComponentClassName() + " from loader: " + this.loader );
+ }
+ }
+
+ }
+
+ /**
+ * Adopts an EJB deployment to a
+ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeployment}
+ */
+ private static class WebServiceDeploymentAdapter implements WebServiceDeployment
+ {
+
+ /** List of endpoints. */
+ private final List< WebServiceDeclaration > endpoints = new ArrayList< WebServiceDeclaration >();
+
+ /**
+ * Returns endpoints list.
+ *
+ * @return endpoints list
+ */
+ public List< WebServiceDeclaration > getServiceEndpoints()
+ {
+ return endpoints;
+ }
+
+ }
+
+}
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.xb.binding.ObjectModelFactory;
+
+/**
+ * webservices.xml deployer.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebServicesMetaDataDeployer
+extends ObjectModelFactoryDeployer< WebservicesMetaData >
+{
+
+ /**
+ * Constructor.
+ */
+ public WebServicesMetaDataDeployer()
+ {
+ super(WebservicesMetaData.class);
+ }
+
+ /**
+ * Model factory generator.
+ */
+ @Override
+ protected ObjectModelFactory getObjectModelFactory( final WebservicesMetaData root )
+ {
+ return new WebservicesFactory( null );
+ }
+
+}
Deleted: 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 10:41:19 UTC (rev 10220)
+++ 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)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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;
-
-import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-
-/**
- * webservices.xml deployer.
- *
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public final class WebservicesMetaDataDeployer
-extends ObjectModelFactoryDeployer< WebservicesMetaData >
-{
-
- /**
- * Constructor.
- */
- public WebservicesMetaDataDeployer()
- {
- super(WebservicesMetaData.class);
- }
-
- /**
- * Model factory generator.
- */
- @Override
- protected ObjectModelFactory getObjectModelFactory( final WebservicesMetaData root )
- {
- return new WebservicesFactory( null );
- }
-
-}
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 10:41:19 UTC (rev 10220)
+++ 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)
@@ -79,11 +79,13 @@
<!--
A deployer that processes webservices.xml file
-->
- <bean name="WebservicesMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WebservicesMetaDataDeployer">
+ <bean name="WebServicesMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WebServicesMetaDataDeployer">
<property name="name">webservices.xml</property>
<property name="useSchemaValidation">true</property>
</bean>
+ <bean name="WebServiceDeploymentDeployer" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeploymentDeployer"/>
+
<!--
A web service deployer that hooks in after the EJB deployers
-->
16 years, 4 months