[jboss-cvs] JBossAS SVN: r109025 - in branches/switchboard-integration: component-matrix and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Oct 30 14:07:43 EDT 2010
Author: jaikiran
Date: 2010-10-30 14:07:42 -0400 (Sat, 30 Oct 2010)
New Revision: 109025
Added:
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/server/src/main/java/org/jboss/as/switchboard/
branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/
branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/
branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java
branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/UserTransactionRefResourceProvider.java
branches/switchboard-integration/testsuite/src/resources/web/html/jbosstest/WEB-INF/jboss-service.xml
Modified:
branches/switchboard-integration/build/build.xml
branches/switchboard-integration/component-matrix/pom.xml
branches/switchboard-integration/server/pom.xml
branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
JBAS-8548 Upgrade to 1.0.0-alpha-4 of SwitchBoard and introduce resource providers for java:comp/ORB java:comp/UserTransaction and java:comp/TransactionSynchronizationRegistry
Modified: branches/switchboard-integration/build/build.xml
===================================================================
--- branches/switchboard-integration/build/build.xml 2010-10-30 18:07:33 UTC (rev 109024)
+++ branches/switchboard-integration/build/build.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -199,8 +199,7 @@
module-resteasy,
module-hibernate-int,
module-hornetq-int,
- module-console,
- module-switchboard">
+ module-console">
</target>
<target name="install" depends="partition-build, jboss-all-client"
@@ -250,6 +249,11 @@
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
+ <!-- Use switchboard-clustered-jboss-beans.xml in all -->
+ <delete file="${install.all}/deployers/switchboard-jboss-beans.xml"/>
+ <!-- Use switchboard-jboss-beans.xml in default -->
+ <delete file="${install.default}/deployers/switchboard-clustered-jboss-beans.xml"/>
+
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
<mkdir dir="${install.minimal.deployers}"/>
@@ -315,6 +319,7 @@
<include name="jbossweb.deployer/**"/>
<include name="metadata-deployer-jboss-beans.xml"/>
<include name="security-deployer-jboss-beans.xml"/>
+ <include name="switchboard-jboss-beans.xml"/>
<include name="jboss-threads.deployer/**"/>
<include name="jboss-logging.deployer/**"/>
<exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
@@ -911,7 +916,6 @@
</fileset>
</copy>
-
<!-- Copy the "all" configuration files -->
<mkdir dir="${install.server}/all/conf"/>
<copy todir="${install.server}/all/conf" filtering="no">
@@ -931,20 +935,6 @@
</copy>
</target>
- <!-- ========= -->
- <!-- Switchboard -->
- <!-- ========= -->
- <target name="module-switchboard" depends="module-server">
-
- <!-- Copy the switchboard dir in deployers -->
- <mkdir dir="${install.all.deployers}/switchboard"/>
-
- <unjar src="${org.jboss.switchboard:jboss-switchboard-mc-impl:jar}" dest="${install.all.deployers}/switchboard">
- <patternset>
- <include name="META-INF/*.xml"/>
- </patternset>
- </unjar>
- </target>
<!-- ========= -->
<!-- Connector -->
Modified: branches/switchboard-integration/component-matrix/pom.xml
===================================================================
--- branches/switchboard-integration/component-matrix/pom.xml 2010-10-30 18:07:33 UTC (rev 109024)
+++ branches/switchboard-integration/component-matrix/pom.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -132,7 +132,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-3</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-4</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/pom.xml
===================================================================
--- branches/switchboard-integration/server/pom.xml 2010-10-30 18:07:33 UTC (rev 109024)
+++ branches/switchboard-integration/server/pom.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -419,8 +419,23 @@
<artifactId>jboss-switchboard-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-mc-spi</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-javaee</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-impl</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Added: branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml (rev 0)
+++ branches/switchboard-integration/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Deployers -->
+ <bean name="WebENCOperatorDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentENCOperatorDeployer">
+ <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
+ </bean>
+
+ <bean name="EJBENCOperatorDeployer" class="org.jboss.switchboard.mc.deployer.EJBEnvironmentENCOperatorDeployer">
+ <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
+ </bean>
+
+ <!-- Resource providers -->
+
+ <!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
+ <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"/>
+
+ <!-- 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">
+ <property name="typedResourceRefResourceProviders">
+ <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
+ <entry>
+ <key>java.net.URL</key>
+ <value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- ResourceProvider for java:comp/ORB (EE.5.12 of Java EE6 spec) -->
+ <bean name="org.jboss.switchboard.ORBRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBRefResourceProvider"/>
+
+ <!-- ResourceProvider for java:comp/UserTransaction (EE.5.10 of Java EE 6 spec) -->
+ <bean name="org.jboss.switchboard.UserTransactionRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionRefResourceProvider"/>
+
+ <bean name="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationRefResourceProvider"/>
+
+
+
+ <!-- Resource provider registry -->
+ <bean name="org.jboss.switchboard.ResourceProviderRegistry" class="org.jboss.switchboard.mc.resource.provider.ResourceProviderRegistry">
+ <property name="resourceProviders">
+ <list>
+ <inject bean="org.jboss.switchboard.EnvEntryResourceProvider"/>
+ <inject bean="org.jboss.switchboard.ResourceEnvRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
+ <!-- Disabled till container themselves stop binding into java:comp
+ <inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
+ -->
+ <!-- Disabled till https://jira.jboss.org/browse/JBAS-8465 is fixed
+ <inject bean="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider"/>
+ -->
+ </list>
+ </property>
+
+ </bean>
+
+ <!-- JNDI environment processor -->
+ <bean name="org.jboss.switchboard.JndiEnvironmentProcessor" class="org.jboss.switchboard.mc.JndiEnvironmentProcessor">
+ <constructor><parameter><inject bean="org.jboss.switchboard.ResourceProviderRegistry"/></parameter></constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Added: branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml (rev 0)
+++ branches/switchboard-integration/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Deployers -->
+ <bean name="WebENCOperatorDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentENCOperatorDeployer">
+ <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
+ </bean>
+
+ <bean name="EJBENCOperatorDeployer" class="org.jboss.switchboard.mc.deployer.EJBEnvironmentENCOperatorDeployer">
+ <constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
+ </bean>
+
+ <!-- Resource providers -->
+
+ <!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
+ <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"/>
+
+ <!-- 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">
+ <property name="typedResourceRefResourceProviders">
+ <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
+ <entry>
+ <key>java.net.URL</key>
+ <value><bean name="org.jboss.switchboard.URLResourceProvider" class="org.jboss.switchboard.mc.resource.provider.URLResourceProvider"/></value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- ResourceProvider for java:comp/UserTransaction (EE.5.10 of Java EE 6 spec) -->
+ <bean name="org.jboss.switchboard.UserTransactionRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionRefResourceProvider"/>
+
+ <bean name="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationRefResourceProvider"/>
+
+
+
+ <!-- Resource provider registry -->
+ <bean name="org.jboss.switchboard.ResourceProviderRegistry" class="org.jboss.switchboard.mc.resource.provider.ResourceProviderRegistry">
+ <property name="resourceProviders">
+ <list>
+ <inject bean="org.jboss.switchboard.EnvEntryResourceProvider"/>
+ <inject bean="org.jboss.switchboard.ResourceEnvRefResourceProvider"/>
+ <inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
+ <!-- Disabled till container themselves stop binding into java:comp
+ <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
+ -->
+ <!-- Disabled till https://jira.jboss.org/browse/JBAS-8465 is fixed
+ <inject bean="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider"/>
+ -->
+ </list>
+ </property>
+
+ </bean>
+
+ <!-- JNDI environment processor -->
+ <bean name="org.jboss.switchboard.JndiEnvironmentProcessor" class="org.jboss.switchboard.mc.JndiEnvironmentProcessor">
+ <constructor><parameter><inject bean="org.jboss.switchboard.ResourceProviderRegistry"/></parameter></constructor>
+ </bean>
+
+
+</deployment>
\ No newline at end of file
Added: branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java (rev 0)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package org.jboss.as.switchboard.resource.provider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.environment.ORBRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+
+/**
+ * ORBRefResourceProvider
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class ORBRefResourceProvider implements MCBasedResourceProvider<ORBRefType>
+{
+
+ public Class<ORBRefType> getEnvironmentEntryType()
+ {
+ return ORBRefType.class;
+ }
+
+ public Resource provide(DeploymentUnit context, ORBRefType type)
+ {
+ return new LinkRefResource("java:/JBossCorbaORB");
+ }
+
+}
Added: branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java (rev 0)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package org.jboss.as.switchboard.resource.provider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.environment.TransactionSynchronizationRegistryRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+
+/**
+ * TransactionSynchronizationRefResourceProvider
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class TransactionSynchronizationRefResourceProvider implements MCBasedResourceProvider<TransactionSynchronizationRegistryRefType>
+{
+
+ public Class<TransactionSynchronizationRegistryRefType> getEnvironmentEntryType()
+ {
+ return TransactionSynchronizationRegistryRefType.class;
+ }
+
+ public Resource provide(DeploymentUnit context, TransactionSynchronizationRegistryRefType type)
+ {
+ return new LinkRefResource("java:TransactionSynchronizationRegistry");
+ }
+
+}
Added: branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/UserTransactionRefResourceProvider.java
===================================================================
--- branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/UserTransactionRefResourceProvider.java (rev 0)
+++ branches/switchboard-integration/server/src/main/java/org/jboss/as/switchboard/resource/provider/UserTransactionRefResourceProvider.java 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package org.jboss.as.switchboard.resource.provider;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.environment.UserTransactionRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+
+/**
+ * UserTransactionRefResourceProvider
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class UserTransactionRefResourceProvider implements MCBasedResourceProvider<UserTransactionRefType>
+{
+
+ public Class<UserTransactionRefType> getEnvironmentEntryType()
+ {
+ return UserTransactionRefType.class;
+ }
+
+ public Resource provide(DeploymentUnit context, UserTransactionRefType type)
+ {
+ return new LinkRefResource("UserTransaction");
+ }
+
+}
Added: branches/switchboard-integration/testsuite/src/resources/web/html/jbosstest/WEB-INF/jboss-service.xml
===================================================================
--- branches/switchboard-integration/testsuite/src/resources/web/html/jbosstest/WEB-INF/jboss-service.xml (rev 0)
+++ branches/switchboard-integration/testsuite/src/resources/web/html/jbosstest/WEB-INF/jboss-service.xml 2010-10-30 18:07:42 UTC (rev 109025)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mbean code="org.jboss.naming.JNDIBindingServiceMgr" name="jboss.apps:name=myapp">
+ <attribute name="BindingsConfig" serialDataType="jbxb">
+ <jndi:bindings xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jndi="urn:jboss:jndi-binding-service:1.0"
+ xs:schemaLocation="urn:jboss:jndi-binding-service resource:jndi-binding-service_1_0.xsd">
+ <!-- bind to java:SomeWebSite jndi name which is referenced in jboss-web.xml
+ via a resource-ref entry -->
+ <jndi:binding name="java:SomeWebSite">
+ <jndi:value type="java.net.URL">http://www.jboss.org</jndi:value>
+ </jndi:binding>
+
+ </jndi:bindings>
+ </attribute>
+</mbean>
Modified: branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-10-30 18:07:33 UTC (rev 109024)
+++ branches/switchboard-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2010-10-30 18:07:42 UTC (rev 109025)
@@ -415,7 +415,7 @@
currentThread.setContextClassLoader(webLoader.getClassLoader());
metaData.setENCLoader(webLoader.getClassLoader());
Context javaCompCtx = component.getContext();
- // Add ORB/UserTransaction
+// // Add ORB/UserTransaction
ORB orb = null;
try
{
More information about the jboss-cvs-commits
mailing list