[jboss-cvs] JBossAS SVN: r109338 - in branches/switchboard-integration: server/src/etc/deployers and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 15 08:33:03 EST 2010
Author: jaikiran
Date: 2010-11-15 08:33:02 -0500 (Mon, 15 Nov 2010)
New Revision: 109338
Added:
branches/switchboard-integration/server/src/main/java/org/jboss/deployment/Ejb2xComponentDeployer.java
branches/switchboard-integration/testsuite/src/resources/refs/resources/hornetq-jms.xml
Modified:
branches/switchboard-integration/component-matrix/pom.xml
branches/switchboard-integration/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml
branches/switchboard-integration/testsuite/imports/sections/web.xml
branches/switchboard-integration/testsuite/src/main/org/jboss/test/web/servlets/ENCTester.java
branches/switchboard-integration/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
Log:
JBAS-8548 (1) Upgrade to latest switchboard and jboss-injection versions (2) Fix testsuite failures (3) Introduce a EJB2.x component deployer for EJB2.x beans
Modified: branches/switchboard-integration/component-matrix/pom.xml
===================================================================
--- branches/switchboard-integration/component-matrix/pom.xml 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/component-matrix/pom.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -49,7 +49,7 @@
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
- <version.jboss.injection>1.0.0-alpha-1</version.jboss.injection>
+ <version.jboss.injection>1.0.0-alpha-2</version.jboss.injection>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.4.0.CR3</version.jboss.jbossws-native>
@@ -133,7 +133,7 @@
<version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
- <version.org.jboss.switchboard.depchain>1.0.0-alpha-7</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-8</version.org.jboss.switchboard.depchain>
<version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.weld>1.1.0.Beta1</version.org.jboss.weld>
Modified: branches/switchboard-integration/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
===================================================================
--- branches/switchboard-integration/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -20,7 +20,9 @@
</bean>
<bean name="EjbClassLoaderDeployer" class="org.jboss.deployment.EjbClassLoaderDeployer"/>
-
+
+ <bean name="Ejb2xComponentDeployer" class="org.jboss.deployment.Ejb2xComponentDeployer"/>
+
<bean name="EJB2xDeployer" class="org.jboss.ejb.deployers.EjbDeployer">
<!-- The EJBDeployer needs the JTA transaction manager service -->
<property name="transactionManagerServiceName">jboss:service=TransactionManager</property>
Modified: branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -16,7 +16,16 @@
<bean name="org.jboss.switchboard.EnvEntryResourceProvider" class="org.jboss.switchboard.mc.resource.provider.EnvEntryResourceProvider"/>
<!-- processes resource-env-ref resources (EE.5.8 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.ResourceEnvRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceEnvRefProvider"/>
+ <bean name="org.jboss.switchboard.ResourceEnvRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceEnvRefProvider">
+ <property name="typedResourceEnvRefResourceProviders">
+ <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
+ <entry>
+ <key>javax.xml.ws.WebServiceContext</key>
+ <value><inject bean="org.jboss.switchboard.WebServiceContextResourceProvider"/></value>
+ </entry>
+ </map>
+ </property>
+ </bean>
<!-- processes resource-ref resources (EE.5.7 of Java EE6 spec) -->
<bean name="org.jboss.switchboard.ResourceRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceRefResourceProviderDelegator">
@@ -26,10 +35,6 @@
<key>java.net.URL</key>
<value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
</entry>
- <entry>
- <key>javax.xml.ws.WebServiceContext</key>
- <value><inject bean="org.jboss.switchboard.WebServiceContextResourceProvider"/></value>
- </entry>
</map>
</property>
</bean>
@@ -53,6 +58,11 @@
<inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
+ <!--
+ <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
+ -->
<!-- Disabled till container themselves stop binding into java:comp
<inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
Modified: branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -16,7 +16,16 @@
<bean name="org.jboss.switchboard.EnvEntryResourceProvider" class="org.jboss.switchboard.mc.resource.provider.EnvEntryResourceProvider"/>
<!-- processes resource-env-ref resources (EE.5.8 of Java EE6 spec) -->
- <bean name="org.jboss.switchboard.ResourceEnvRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceEnvRefProvider"/>
+ <bean name="org.jboss.switchboard.ResourceEnvRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceEnvRefProvider">
+ <property name="typedResourceEnvRefResourceProviders">
+ <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
+ <entry>
+ <key>javax.xml.ws.WebServiceContext</key>
+ <value><inject bean="org.jboss.switchboard.WebServiceContextResourceProvider"/></value>
+ </entry>
+ </map>
+ </property>
+ </bean>
<!-- processes resource-ref resources (EE.5.7 of Java EE6 spec) -->
<bean name="org.jboss.switchboard.ResourceRefResourceProvider" class="org.jboss.switchboard.mc.resource.provider.ResourceRefResourceProviderDelegator">
@@ -26,11 +35,7 @@
<key>java.net.URL</key>
<value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
</entry>
- <entry>
- <key>javax.xml.ws.WebServiceContext</key>
- <value><inject bean="org.jboss.switchboard.WebServiceContextResourceProvider"/></value>
- </entry>
- </map>
+ </map>
</property>
</bean>
@@ -49,6 +54,11 @@
<inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
+ <!--
+ <inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
+ -->
<!-- Disabled till container themselves stop binding into java:comp
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
-->
Added: branches/switchboard-integration/server/src/main/java/org/jboss/deployment/Ejb2xComponentDeployer.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/deployment/Ejb2xComponentDeployer.java (rev 0)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/deployment/Ejb2xComponentDeployer.java 2010-11-15 13:33:02 UTC (rev 109338)
@@ -0,0 +1,100 @@
+/**
+ *
+ */
+package org.jboss.deployment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+
+/**
+ * Creates and deploys EJB2x beans as components
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class Ejb2xComponentDeployer extends AbstractComponentDeployer<JBossMetaData, JBossEnterpriseBeanMetaData>
+{
+ private static final Logger log = Logger.getLogger(Ejb2xComponentDeployer.class);
+
+ private static final JBossDeploymentVisitor deploymentVisitor = new JBossDeploymentVisitor();
+
+ private static final String attachmentName = JBossMetaData.class.getName();
+
+ public Ejb2xComponentDeployer()
+ {
+ setInput(JBossMetaData.class);
+ setOutput(deploymentVisitor.getComponentType());
+
+ setDeploymentVisitor(deploymentVisitor);
+ }
+
+ @Override
+ protected <U> void deploy(DeploymentUnit unit, DeploymentVisitor<U> visitor) throws DeploymentException
+ {
+ U deployment = unit.getAttachment(attachmentName, visitor.getVisitorType());
+ try
+ {
+ visitor.deploy(unit, deployment);
+ }
+ catch (Throwable t)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + unit.getName(), t);
+ }
+ }
+
+ @Override
+ protected <U> void undeploy(DeploymentUnit unit, DeploymentVisitor<U> visitor)
+ {
+ if (visitor == null)
+ return;
+
+ U deployment = unit.getAttachment(attachmentName, visitor.getVisitorType());
+ visitor.undeploy(unit, deployment);
+ }
+
+ private static class JBossDeploymentVisitor
+ extends
+ AbstractDeploymentVisitor<JBossEnterpriseBeanMetaData, JBossMetaData>
+ {
+ @Override
+ public Class<JBossEnterpriseBeanMetaData> getComponentType()
+ {
+ return JBossEnterpriseBeanMetaData.class;
+ }
+
+ @Override
+ protected List<? extends JBossEnterpriseBeanMetaData> getComponents(JBossMetaData deployment)
+ {
+ // Process only 2.x beans
+ if (deployment == null || !deployment.isEJB2x())
+ return null;
+ JBossEnterpriseBeansMetaData enterpriseBeans = deployment.getEnterpriseBeans();
+ if (enterpriseBeans == null)
+ {
+ return null;
+ }
+ return new ArrayList<JBossEnterpriseBeanMetaData>(enterpriseBeans);
+ }
+
+ @Override
+ protected String getComponentName(JBossEnterpriseBeanMetaData attachment)
+ {
+ return JBossEnterpriseBeanMetaData.class.getName() + "." + attachment.getEjbName();
+ }
+
+ public Class<JBossMetaData> getVisitorType()
+ {
+ return JBossMetaData.class;
+ }
+ }
+
+}
Modified: branches/switchboard-integration/testsuite/imports/sections/web.xml
===================================================================
--- branches/switchboard-integration/testsuite/imports/sections/web.xml 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/testsuite/imports/sections/web.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -691,6 +691,7 @@
webxml="${build.resources}/web/simple-xmlonly/web.xml">
<webinf dir="${build.resources}/web/simple-xmlonly">
<include name="jboss-web.xml"/>
+ <include name="jboss-service.xml"/>
</webinf>
<classes dir="${build.classes}">
<include name="org/jboss/test/web/servlets/ENCTester.class"/>
Modified: branches/switchboard-integration/testsuite/src/main/org/jboss/test/web/servlets/ENCTester.java
===================================================================
--- branches/switchboard-integration/testsuite/src/main/org/jboss/test/web/servlets/ENCTester.java 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/testsuite/src/main/org/jboss/test/web/servlets/ENCTester.java 2010-11-15 13:33:02 UTC (rev 109338)
@@ -117,7 +117,7 @@
private void testEjbRefs(Context initCtx, Context myEnv) throws NamingException
{
//do lookup on bean specified without ejb-link
- Object ejb = initCtx.lookup("java:comp/env/ejb/bean3");
+ Object ejb = initCtx.lookup("ejb/bean3");
if ((ejb instanceof StatelessSessionHome) == false)
throw new NamingException("ejb/bean3 is not a StatelessSessionHome");
log.debug("ejb/bean3 = " + ejb);
Added: branches/switchboard-integration/testsuite/src/resources/refs/resources/hornetq-jms.xml
===================================================================
--- branches/switchboard-integration/testsuite/src/resources/refs/resources/hornetq-jms.xml (rev 0)
+++ branches/switchboard-integration/testsuite/src/resources/refs/resources/hornetq-jms.xml 2010-11-15 13:33:02 UTC (rev 109338)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <queue name="testQueue">
+ <entry name="queue/testQueue" />
+ </queue>
+
+ <topic name="testTopic">
+ <entry name="topic/testTopic"/>
+ </topic>
+
+</configuration>
Modified: branches/switchboard-integration/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- branches/switchboard-integration/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2010-11-15 10:37:38 UTC (rev 109337)
+++ branches/switchboard-integration/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2010-11-15 13:33:02 UTC (rev 109338)
@@ -24,7 +24,7 @@
import javax.xml.ws.WebServiceContext;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.switchboard.javaee.jboss.environment.JBossResourceRefType;
+import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType;
import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
import org.jboss.switchboard.spi.Resource;
import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
@@ -34,19 +34,19 @@
*
* @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
*/
-public final class WebServiceContextResourceProvider implements MCBasedResourceProvider<JBossResourceRefType>
+public final class WebServiceContextResourceProvider implements MCBasedResourceProvider<JBossResourceEnvRefType>
{
@Override
- public Resource provide(final DeploymentUnit unit, final JBossResourceRefType type)
+ public Resource provide(final DeploymentUnit unit, final JBossResourceEnvRefType resEnvRef)
{
return new WebServiceContextResource(ThreadLocalAwareWebServiceContext.getInstance());
}
@Override
- public Class<JBossResourceRefType> getEnvironmentEntryType()
+ public Class<JBossResourceEnvRefType> getEnvironmentEntryType()
{
- return JBossResourceRefType.class;
+ return JBossResourceEnvRefType.class;
}
/**
More information about the jboss-cvs-commits
mailing list