[jboss-cvs] JBossAS SVN: r74764 - trunk/ejb3/src/main/org/jboss/ejb3/client.

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

Author: scott.stark at jboss.org
Date: 2008-06-18 01:12:05 -0400 (Wed, 18 Jun 2008)
New Revision: 74764

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientEJBHandler.java
   trunk/ejb3/src/main/org/jboss/ejb3/client/Utils.java
Log:
Remove the client container enc injectors

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2008-06-18 04:55:59 UTC (rev 74763)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2008-06-18 05:12:05 UTC (rev 74764)
@@ -83,7 +83,6 @@
    
    // for performance there is an array.
    private List<Injector> injectors = new ArrayList<Injector>();
-   private Map<String, Map<AccessibleObject, Injector>> encInjections = new HashMap<String, Map<AccessibleObject, Injector>>();
    private Context enc;
    private DependencyPolicy dependsPolicy;
 
@@ -230,7 +229,7 @@
     */
    public Map<String, Map<AccessibleObject, Injector>> getEncInjections()
    {
-      return encInjections;
+      throw new IllegalStateException("ENC setup happens on the server");
    }
 
    /* (non-Javadoc)
@@ -325,12 +324,13 @@
       // TODO: check which handlers a client container should support
       Collection<InjectionHandler<RemoteEnvironment>> handlers = new ArrayList<InjectionHandler<RemoteEnvironment>>();
       handlers.add(new ClientEJBHandler<RemoteEnvironment>());
+      // This currently has no use in the ClientContainer, maybe in the future when running an mc
       handlers.add(new DependsHandler<RemoteEnvironment>());
-      handlers.add(new JndiInjectHandler<RemoteEnvironment>());
+      //handlers.add(new JndiInjectHandler<RemoteEnvironment>());
       handlers.add(new PersistenceUnitHandler<RemoteEnvironment>());
       handlers.add(new ClientResourceHandler<RemoteEnvironment>(this.mainClass));
       handlers.add(new WebServiceRefHandler<RemoteEnvironment>());
-      
+
       // TODO: we're going to use a jar class loader
 //      ClassLoader old = Thread.currentThread().getContextClassLoader();
 //      Thread.currentThread().setContextClassLoader(classloader);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientEJBHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientEJBHandler.java	2008-06-18 04:55:59 UTC (rev 74763)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientEJBHandler.java	2008-06-18 05:12:05 UTC (rev 74764)
@@ -54,7 +54,7 @@
 public class ClientEJBHandler<X extends RemoteEnvironment>
    extends AbstractHandler<X>
 {
-   private static final Logger log = Logger.getLogger(EJBRemoteHandler.class);
+   private static final Logger log = Logger.getLogger(ClientEJBHandler.class);
 
    public void loadXml(X xml, InjectionContainer container)
    {
@@ -156,7 +156,7 @@
       String encName = ref.name();
       if (encName == null || encName.equals(""))
       {
-         encName = InjectionUtil.getEncName(field);
+         encName = Utils.getEncName(field);
       }
       else
       {
@@ -170,7 +170,7 @@
       String encName = ref.name();
       if (encName == null || encName.equals(""))
       {
-         encName = InjectionUtil.getEncName(method);
+         encName = Utils.getEncName(method);
       }
       else
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/Utils.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/Utils.java	2008-06-18 04:55:59 UTC (rev 74763)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/Utils.java	2008-06-18 05:12:05 UTC (rev 74764)
@@ -129,6 +129,31 @@
       }
 
       throw new RuntimeException("<injection-target> could not be found: " + target.getInjectionTargetClass() + "." + target.getInjectionTargetName());
+   }
 
+   public static String getEncName(Class type)
+   {
+      return "env/" + type.getName();
    }
+
+   public static String getEncName(Method method)
+   {
+      String encName = method.getName().substring(3);
+      if (encName.length() > 1)
+      {
+         encName = encName.substring(0, 1).toLowerCase() + encName.substring(1);
+      }
+      else
+      {
+         encName = encName.toLowerCase();
+      }
+
+      encName = getEncName(method.getDeclaringClass()) + "/" + encName;
+      return encName;
+   }
+
+   public static String getEncName(Field field)
+   {
+      return getEncName(field.getDeclaringClass()) + "/" + field.getName();
+   }
 }