[jboss-cvs] JBossAS SVN: r73105 - in projects/ejb3/trunk/core/src/main/java/org/jboss: injection and 1 other directory.

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

Author: wolfc
Date: 2008-05-07 07:31:51 -0400 (Wed, 07 May 2008)
New Revision: 73105

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextPropertyInjector.java
Log:
EJBTHREE-1337: inject WebServiceContextProxy

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java	2008-05-07 10:46:28 UTC (rev 73104)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessBeanContext.java	2008-05-07 11:31:51 UTC (rev 73105)
@@ -25,6 +25,7 @@
 
 import org.jboss.ejb3.session.SessionSpecBeanContext;
 import org.jboss.injection.lang.reflect.BeanProperty;
+import org.jboss.logging.Logger;
 
 
 /**
@@ -35,6 +36,8 @@
  */
 public class StatelessBeanContext extends SessionSpecBeanContext<StatelessContainer>
 {
+   private static final Logger log = Logger.getLogger(StatelessBeanContext.class);
+   
    private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext;
    private BeanProperty webServiceContextProperty;
    
@@ -53,11 +56,19 @@
       this.jaxrpcMessageContext = rpcMessageContext;
    }
 
+   /**
+    * As of EJBTHREE-1337 this method is deprecated, it'll be removed. The
+    * WebServiceContext should already have been injected by the WebServiceContextPropertyInjector.
+    * @return the bean property which holds the WebServiceContext
+    */
+   @Deprecated
    public BeanProperty getWebServiceContextProperty()
    {
+      log.warn("EJBTHREE-1337: do not get WebServiceContext property from stateless bean context, it should already have been injected");
       return webServiceContextProperty;
    }
 
+   @Deprecated
    public void setWebServiceContextProperty(BeanProperty webServiceContextProperty)
    {
       this.webServiceContextProperty = webServiceContextProperty;

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextPropertyInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextPropertyInjector.java	2008-05-07 10:46:28 UTC (rev 73104)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/WebServiceContextPropertyInjector.java	2008-05-07 11:31:51 UTC (rev 73105)
@@ -21,8 +21,6 @@
  */
 package org.jboss.injection;
 
-import javax.ejb.EJBContext;
-
 import org.jboss.ejb3.BeanContext;
 import org.jboss.ejb3.stateless.StatelessBeanContext;
 import org.jboss.injection.lang.reflect.BeanProperty;
@@ -52,6 +50,8 @@
 
    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");