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

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

Author: scott.stark at jboss.org
Date: 2008-04-18 04:12:20 -0400 (Fri, 18 Apr 2008)
New Revision: 72417

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/ejb3/deployers/Ejb3ClientDeployer.java
Log:
Expand the client launcher arguments to accept the jndi properties

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2008-04-18 07:47:36 UTC (rev 72416)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2008-04-18 08:12:20 UTC (rev 72417)
@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.annotation.PostConstruct;
 import javax.naming.Context;
@@ -88,14 +89,20 @@
    
    private List<Method> postConstructs = new ArrayList<Method>();
 
-   public ClientContainer(JBossClientMetaData xml, Class<?> mainClass, String applicationClientName) throws Exception
+   public ClientContainer(JBossClientMetaData xml, Class<?> mainClass, String applicationClientName)
+      throws Exception
    {
+      this(xml, mainClass, applicationClientName, null);
+   }
+   public ClientContainer(JBossClientMetaData xml, Class<?> mainClass, String applicationClientName, Properties jndiEnv)
+      throws Exception
+   {
       this.xml = xml;
       this.mainClass = mainClass;
       this.applicationClientName = applicationClientName;
       
       //Context ctx = getInitialContext();
-      Context ctx = InitialContextFactory.getInitialContext();
+      Context ctx = InitialContextFactory.getInitialContext(jndiEnv);
       enc = (Context) ctx.lookup(applicationClientName);
       log.debug("Client ENC("+applicationClientName+"):");
       NamingEnumeration<NameClassPair> e = enc.list("");

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2008-04-18 07:47:36 UTC (rev 72416)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientLauncher.java	2008-04-18 08:12:20 UTC (rev 72417)
@@ -26,6 +26,7 @@
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -63,11 +64,18 @@
     * @param args
     * @throws Exception
     */
-   public static void launch(JBossClientMetaData xml, String mainClassName, String applicationClientName, String args[]) throws Exception
+   public static void launch(JBossClientMetaData xml, String mainClassName, String applicationClientName, String args[])
+      throws Exception
    {
+      launch(xml, mainClassName, applicationClientName, args, null);
+   }
+   public static void launch(JBossClientMetaData xml, String mainClassName,
+         String applicationClientName, String args[], Properties jndiEnv)
+      throws Exception
+   {
       Class<?> mainClass = Class.forName(mainClassName);
       
-      ClientContainer container = new ClientContainer(xml, mainClass, applicationClientName);
+      ClientContainer container = new ClientContainer(xml, mainClass, applicationClientName, jndiEnv);
       
       // TODO: postContruct
       
@@ -165,8 +173,14 @@
    public void launch(String mainClassName, String clientName, String args[])
       throws Throwable
    {
+      launch(mainClassName, clientName, args, null);
+   }
+   public void launch(String mainClassName, String clientName, String args[],
+         Properties jndiEnv)
+      throws Throwable
+   {
       JBossClientMetaData xml = loadXML(clientName);
-      launch(xml, mainClassName, clientName, args);
+      launch(xml, mainClassName, clientName, args, jndiEnv);
    }
 
 }

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-04-18 07:47:36 UTC (rev 72416)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-04-18 08:12:20 UTC (rev 72417)
@@ -104,6 +104,7 @@
 
          // Notify the client launcher of extra class path entries in an EAR (See EE 8.2)
          encCtx.bind("classPathEntries", getClassPathEntries(unit));
+         encCtx.createSubcontext("env");
          
          // TODO: Notify the client launcher of other metadata stuff (injectors, lifecycle callbacks etc)
          // FIXME: For now I expose the entire metadata
@@ -177,7 +178,7 @@
 
    private KernelAbstraction getKernelAbstraction()
    {
-      return new MCKernelAbstraction(kernel, server);
+      return new JBossASKernel(kernel);
    }
 
    // TODO: move this method either to a utility class or to the scanning deployer