[jboss-cvs] JBossAS SVN: r110051 - in trunk: tomcat/src/resources/standalone and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2010-12-20 14:37:56 -0500 (Mon, 20 Dec 2010)
New Revision: 110051

Added:
   trunk/tomcat/src/resources/standalone/switchboard-jboss-beans.xml
Modified:
   trunk/build/build.xml
Log:
JBAS-8659 Fix jbossweb-standalone boot failures

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-12-20 18:55:02 UTC (rev 110050)
+++ trunk/build/build.xml	2010-12-20 19:37:56 UTC (rev 110051)
@@ -321,15 +321,16 @@
         <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-threads.deployer/**"/>
         <include name="jboss-logging.deployer/**"/>
         <exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
+        <exclude name="switchboard-jboss-beans.xml"/>  
       </fileset>
     </copy>
     <copy todir="${install.jbossweb.deployers}">
       <fileset dir="${tomcat.module.output}/resources/standalone">
         <include name="scanning-deployers-jboss-beans.xml"/>
+        <include name="switchboard-jboss-beans.xml"/>          
       </fileset>
     </copy>
     <copy todir="${install.jbossweb.deployers}/jbossweb.deployer/META-INF">

Added: trunk/tomcat/src/resources/standalone/switchboard-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/switchboard-jboss-beans.xml	                        (rev 0)
+++ trunk/tomcat/src/resources/standalone/switchboard-jboss-beans.xml	2010-12-20 19:37:56 UTC (rev 110051)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- Deployers -->
+    <bean  name="org.jboss.switchboard.WebEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentSwitchBoardDeployer">
+        <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"/>
+    
+    <!--  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">
+        <constructor>
+            <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+        </constructor>    
+    </bean>
+
+
+    <!--  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">
+        <property name="typedResourceEnvRefResourceProviders">
+            <map keyClass="java.lang.String" valueClass="org.jboss.switchboard.mc.spi.MCBasedResourceProvider">
+                <entry>
+                    <key>javax.transaction.UserTransaction</key>
+                    <value>
+                        <bean name="org.jboss.switchboard.UserTransactionResEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.UserTransactionResourceEnvRefResourceProvider"/>
+                    </value>
+                </entry>
+                <entry>
+                    <key>org.omg.CORBA.ORB</key>
+                    <value>
+                            <!-- Resource provider for res-env-ref of type ORB -->
+                            <bean name="org.jboss.switchboard.ORBResourceEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBResourceEnvRefResourceProvider">
+                                <constructor>
+                                    <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+                                </constructor>    
+                            </bean>
+                    </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">
+        <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>
+                <entry>
+                    <key>org.omg.CORBA_2_3.ORB</key>
+                    <value>
+                        <!-- Resource provider for res-ref of type ORB -->
+                        <bean name="org.jboss.switchboard.ORBResourceRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.ORBResourceRefResourceProvider">
+                            <constructor>
+                                <parameter class="java.lang.String"><value>java:/JBossCorbaORB</value></parameter>
+                            </constructor>    
+                        </bean>
+                    </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"/>
+
+    <!--  ResourceProvider for java:comp/TransactionSynchronizationRegistry (EE.5.11 of Java EE 6 spec)
+-->
+    <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"/>
+                <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>