[jboss-cvs] JBossAS SVN: r82314 - branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/injection.

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

Author: adrian at jboss.org
Date: 2008-12-16 08:58:24 -0500 (Tue, 16 Dec 2008)
New Revision: 82314

Modified:
   branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
Log:
[JBAS-6265] - Don't use the ejb3 usertx in servlets

Modified: branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
===================================================================
--- branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-12-16 13:44:23 UTC (rev 82313)
+++ branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-12-16 13:58:24 UTC (rev 82314)
@@ -38,6 +38,7 @@
 import javax.xml.ws.WebServiceContext;
 
 import org.jboss.ejb3.Container;
+import org.jboss.injection.AbstractPropertyInjector;
 import org.jboss.injection.EnvEntryEncInjector;
 import org.jboss.injection.InjectionContainer;
 import org.jboss.injection.InjectionHandler;
@@ -47,7 +48,6 @@
 import org.jboss.injection.JndiPropertyInjector;
 import org.jboss.injection.LinkRefEncInjector;
 import org.jboss.injection.TimerServicePropertyInjector;
-import org.jboss.injection.UserTransactionPropertyInjector;
 import org.jboss.injection.ValueEncInjector;
 import org.jboss.injection.lang.reflect.BeanProperty;
 import org.jboss.injection.lang.reflect.FieldBeanProperty;
@@ -59,6 +59,7 @@
 import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
 import org.jboss.reflect.plugins.ValueConvertor;
+import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
 import org.omg.CORBA.ORB;
 
 /**
@@ -503,4 +504,18 @@
       }
    }
 
+   public static class UserTransactionPropertyInjector extends AbstractPropertyInjector
+   {
+      public UserTransactionPropertyInjector(BeanProperty property, InjectionContainer container)
+      {
+         super(property);
+      }
+
+      public void inject(Object instance)
+      {
+         UserTransaction ut = ServerVMClientUserTransaction.getSingleton();
+         property.set(instance, ut);
+      }
+   }
+
 }