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

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

Author: wolfc
Date: 2007-04-10 04:53:48 -0400 (Tue, 10 Apr 2007)
New Revision: 62202

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
   trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
Log:
JBCTS-577: ignore missing enc injectors

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-04-10 07:02:33 UTC (rev 62201)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-04-10 08:53:48 UTC (rev 62202)
@@ -107,11 +107,11 @@
       
       processMetadata(null);
       
-//      for (EncInjector injector : encInjectors.values())
-//      {
-//         log.trace("encInjector: " + injector);
+      for (EncInjector injector : encInjectors.values())
+      {
+         log.trace("encInjector: " + injector);
 //         injector.inject(this);
-//      }
+      }
       
       for(Injector injector : injectors)
       {
@@ -314,7 +314,8 @@
       handlers.add(new JndiInjectHandler());
       handlers.add(new PersistenceContextHandler());
       handlers.add(new PersistenceUnitHandler());
-      handlers.add(new ResourceHandler());
+      // since enc injectors live on the server side, we don't want to check those
+      handlers.add(new ResourceHandler(false));
       handlers.add(new WebServiceRefHandler());
       
       // TODO: we're going to use a jar class loader

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2007-04-10 07:02:33 UTC (rev 62201)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2007-04-10 08:53:48 UTC (rev 62202)
@@ -31,6 +31,7 @@
 import org.jboss.ejb3.metamodel.ApplicationClientDD;
 import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
 import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
+import org.jboss.logging.Logger;
 import org.jboss.util.NotImplementedException;
 import org.jboss.xb.binding.JBossXBException;
 
@@ -47,6 +48,8 @@
 public class ClientLauncher
    implements AppClientLauncher
 {
+   private static final Logger log = Logger.getLogger(ClientLauncher.class);
+   
    private static URL findResource(String resourceName)
    {
       URL url;
@@ -89,7 +92,9 @@
    public static ApplicationClientDD loadXML() throws JBossXBException, IOException
    {
       URL url = findResource("META-INF/application-client.xml");
+      log.trace("application-client.xml found at " + url);
       URL jbossClientURL = findResource("META-INF/jboss-client.xml");
+      log.trace("jboss-client.xml found at " + jbossClientURL);
       return loadXML(url, jbossClientURL);
    }
    

Modified: trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-04-10 07:02:33 UTC (rev 62201)
+++ trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-04-10 08:53:48 UTC (rev 62202)
@@ -57,7 +57,19 @@
 public class ResourceHandler implements InjectionHandler
 {
    private static final Logger log = Logger.getLogger(ResourceHandler.class);
+   
+   private boolean checkEncInjectors;
 
+   public ResourceHandler()
+   {
+      this(true);
+   }
+   
+   public ResourceHandler(boolean checkEncInjectors)
+   {
+      this.checkEncInjectors = checkEncInjectors;
+   }
+   
    private static void loadEnvEntry(InjectionContainer container, Collection<EnvEntry> envEntries)
    {
       for (EnvEntry envEntry : envEntries)
@@ -490,7 +502,7 @@
       }
       else
       {
-         if (!container.getEncInjectors().containsKey(encName))
+         if (checkEncInjectors && !container.getEncInjectors().containsKey(encName))
          {
             String mappedName = ref.mappedName();
             if (mappedName == null || mappedName.equals(""))