[jboss-cvs] JBossAS SVN: r110175 - in trunk/server/src: main/java/org/jboss/as/switchboard/resource/provider and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Dec 23 09:46:31 EST 2010


Author: jaikiran
Date: 2010-12-23 09:46:30 -0500 (Thu, 23 Dec 2010)
New Revision: 110175

Added:
   trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResEnvRefResourceProvider.java
   trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResourceProvider.java
Removed:
   trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java
Modified:
   trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
Log:
JBAS-8548 JBAS-8465 Enable TransactionSynchronizationRegistry resource provider

Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-12-23 13:28:46 UTC (rev 110174)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml	2010-12-23 14:46:30 UTC (rev 110175)
@@ -75,6 +75,12 @@
                             </bean>
                     </value>
                 </entry>
+                <entry>
+                    <key>javax.transaction.TransactionSynchronizationRegistry</key>
+                    <value>
+                        <bean name="org.jboss.switchboard.TransactionSynchronizationResEnvRefResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationResEnvRefResourceProvider"/>
+                    </value>
+                </entry>
             </map>           
         </property>
         <property name="fallbackResourceEnvRefResourceProviders">
@@ -123,7 +129,7 @@
 
     <!--  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"/>
+    <bean name="org.jboss.switchboard.TransactionSynchronizationResourceProvider" class="org.jboss.as.switchboard.resource.provider.TransactionSynchronizationResourceProvider"/>
 
     <!-- ResourceProvider for java:comp/EJBContext -->
     <bean name="org.jboss.switchboard.EJBContextResourceProvider" class="org.jboss.as.ejb3.switchboard.resource.provider.EJBContextResourceProvider">
@@ -160,10 +166,7 @@
                 <inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
                 <inject bean="org.jboss.switchboard.EJBContextResourceProvider"/>
                 <inject bean="org.jboss.switchboard.TimerServiceResourceProvider"/>
-                <!-- Disabled till https://jira.jboss.org/browse/JBAS-8465 is fixed
-                <inject bean="org.jboss.switchboard.TransactionSyncRegistryRefResourceProvider"/>
-                -->
-                <!-- java:comp/ -->
+                <inject bean="org.jboss.switchboard.TransactionSynchronizationResourceProvider"/>
             </list>
         </property>
 

Deleted: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java	2010-12-23 13:28:46 UTC (rev 110174)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java	2010-12-23 14:46:30 UTC (rev 110175)
@@ -1,31 +0,0 @@
-/**
- * 
- */
-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: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResEnvRefResourceProvider.java
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResEnvRefResourceProvider.java	                        (rev 0)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResEnvRefResourceProvider.java	2010-12-23 14:46:30 UTC (rev 110175)
@@ -0,0 +1,53 @@
+/*
+ * 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.as.switchboard.resource.provider;
+
+import javax.transaction.TransactionSynchronizationRegistry;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.switchboard.impl.resource.LinkRefResource;
+import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType;
+import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
+import org.jboss.switchboard.spi.Resource;
+
+/**
+ * Provides {@link Resource} for resource-env-ref corresponding to type {@link TransactionSynchronizationRegistry}
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class TransactionSynchronizationResEnvRefResourceProvider implements MCBasedResourceProvider<JBossResourceEnvRefType>
+{
+
+   @Override
+   public Resource provide(DeploymentUnit unit, JBossResourceEnvRefType resEnvRef)
+   {
+      return new LinkRefResource("java:TransactionSynchronizationRegistry");
+   }
+
+   @Override
+   public Class<JBossResourceEnvRefType> getEnvironmentEntryType()
+   {
+      return JBossResourceEnvRefType.class;
+   }
+
+}

Copied: trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResourceProvider.java (from rev 110172, trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationRefResourceProvider.java)
===================================================================
--- trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResourceProvider.java	                        (rev 0)
+++ trunk/server/src/main/java/org/jboss/as/switchboard/resource/provider/TransactionSynchronizationResourceProvider.java	2010-12-23 14:46:30 UTC (rev 110175)
@@ -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 TransactionSynchronizationResourceProvider implements MCBasedResourceProvider<TransactionSynchronizationRegistryRefType>
+{
+
+   public Class<TransactionSynchronizationRegistryRefType> getEnvironmentEntryType()
+   {
+      return TransactionSynchronizationRegistryRefType.class;
+   }
+
+   public Resource provide(DeploymentUnit context, TransactionSynchronizationRegistryRefType type)
+   {
+      return new LinkRefResource("java:TransactionSynchronizationRegistry");
+   }
+
+}



More information about the jboss-cvs-commits mailing list