[jboss-cvs] JBossAS SVN: r74913 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection.

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

Author: scott.stark at jboss.org
Date: 2008-06-23 15:15:07 -0400 (Mon, 23 Jun 2008)
New Revision: 74913

Added:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceContextPropertyInjector.java
Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
Log:
JBCTS-816, restore WebServiceContext processing in servlets

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-06-23 18:38:26 UTC (rev 74912)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-06-23 19:15:07 UTC (rev 74913)
@@ -35,6 +35,7 @@
 import javax.ejb.EJBException;
 import javax.ejb.TimerService;
 import javax.transaction.UserTransaction;
+import javax.xml.ws.WebServiceContext;
 
 import org.jboss.ejb3.Container;
 import org.jboss.injection.EnvEntryEncInjector;
@@ -233,6 +234,21 @@
                      mappedName = "java:comp/ORB";
                      continue;
                   }
+                  else if(WebServiceContext.class.getName().equals(envRef.getType()))                      
+                  {     
+                     // JBAS-5359
+                     InjectorFactory<?> factory = new InjectorFactory<WebServiceContextPropertyInjector>()
+                     {                       public WebServiceContextPropertyInjector create(BeanProperty property)          
+                        {
+                           return new WebServiceContextPropertyInjector(property);
+                        }
+                     }; 
+                     if(envRef.getInjectionTargets() != null)
+                     {
+                        InjectionUtil.createInjectors(container.getInjectors(), container.getClassloader(), factory, envRef.getInjectionTargets());
+                        continue; 
+                     }  
+                  }
                }
             }
             catch(ClassNotFoundException e)
@@ -449,8 +465,6 @@
 //                  else
                   if(ORB.class.isAssignableFrom(type))
                      mappedName = "java:comp/ORB";
-                  else if(EJBContext.class.isAssignableFrom(type))
-                     mappedName = "java:comp/EJBContext";
                   else
                      throw new RuntimeException("You did not specify a @Resource.mappedName() on " + accObj + " and there is no binding for enc name " + encName + " in XML");
                }

Added: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceContextPropertyInjector.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceContextPropertyInjector.java	                        (rev 0)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceContextPropertyInjector.java	2008-06-23 19:15:07 UTC (rev 74913)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.web.tomcat.service.injection;
+
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
+import org.jboss.injection.Injector;
+import org.jboss.injection.WebServiceContextProxy;
+import org.jboss.injection.lang.reflect.BeanProperty;
+
+/**
+ * Copy of the ejb3 version to isolate changes and make the ctor public.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Thomas.Diesler at jboss.com
+ * @version $Revision:$
+ */
+public class WebServiceContextPropertyInjector implements Injector
+{
+   private BeanProperty property;
+   
+   public WebServiceContextPropertyInjector(BeanProperty property)
+   {
+      assert property != null : "property must be set";
+      
+      this.property = property;
+   }
+
+   public void inject(Object instance)
+   {
+      throw new RuntimeException("Illegal operation");
+   }
+
+   public void inject(BeanContext ctx)
+   {
+      property.set(ctx.getInstance(), new WebServiceContextProxy());
+      
+      if(!(ctx instanceof StatelessBeanContext))
+         throw new RuntimeException("Can only inject on stateless bean context");
+      
+      ((StatelessBeanContext)ctx).setWebServiceContextProperty(property);
+   }
+   
+   public Class getInjectionClass()
+   {
+      return property.getType();
+   }
+}