[jboss-cvs] JBossAS SVN: r100666 - in projects/jboss-jca/trunk: fungal/src/main/java/org/jboss/jca/fungal/api and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-02-07 09:42:29 -0500 (Sun, 07 Feb 2010)
New Revision: 100666

Modified:
   projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/api/Kernel.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
Log:
Add getBean(String, Class) to Kernel API

Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java	2010-02-07 12:11:45 UTC (rev 100665)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java	2010-02-07 14:42:29 UTC (rev 100666)
@@ -22,9 +22,9 @@
 
 package org.jboss.jca.embedded;
 
+import org.jboss.jca.fungal.api.Kernel;
 import org.jboss.jca.fungal.api.KernelConfiguration;
 import org.jboss.jca.fungal.api.KernelFactory;
-import org.jboss.jca.fungal.impl.KernelImpl;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -47,7 +47,7 @@
    private boolean fullProfile;
 
    /** Kernel */
-   private KernelImpl kernel;
+   private Kernel kernel;
 
    /** ShrinkWrap deployments */
    private List<File> shrinkwrapDeployments;
@@ -83,7 +83,7 @@
       KernelConfiguration kernelConfiguration = new KernelConfiguration();
       kernelConfiguration = kernelConfiguration.remoteAccess(false);
 
-      kernel = (KernelImpl)KernelFactory.create(kernelConfiguration);
+      kernel = KernelFactory.create(kernelConfiguration);
       kernel.startup();
 
       if (fullProfile)
@@ -136,7 +136,7 @@
       if (expectedType == null)
          throw new IllegalArgumentException("ExpectedType is null");
 
-      return expectedType.cast(kernel.getBean(name));
+      return kernel.getBean(name, expectedType);
    }
 
    /**

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/api/Kernel.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/api/Kernel.java	2010-02-07 12:11:45 UTC (rev 100665)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/api/Kernel.java	2010-02-07 14:42:29 UTC (rev 100666)
@@ -43,6 +43,15 @@
    public MainDeployer getMainDeployer();
 
    /**
+    * Get a bean
+    * @param name The bean name
+    * @param expectedType The expected type for the bean
+    * @return The bean instance
+    * @exception Throwable If an error occurs
+    */
+   public <T> T getBean(String name, Class<T> expectedType) throws Throwable;
+
+   /**
     * Startup
     * @exception Throwable Thrown if an error occurs
     */

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-02-07 12:11:45 UTC (rev 100665)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-02-07 14:42:29 UTC (rev 100666)
@@ -30,10 +30,6 @@
 import org.jboss.jca.fungal.deployment.ConstructorType;
 import org.jboss.jca.fungal.deployment.DependsType;
 import org.jboss.jca.fungal.deployment.EntryType;
-import org.jboss.jca.fungal.deployment.IgnoreCreateType;
-import org.jboss.jca.fungal.deployment.IgnoreDestroyType;
-import org.jboss.jca.fungal.deployment.IgnoreStartType;
-import org.jboss.jca.fungal.deployment.IgnoreStopType;
 import org.jboss.jca.fungal.deployment.IncallbackType;
 import org.jboss.jca.fungal.deployment.InjectType;
 import org.jboss.jca.fungal.deployment.InstallType;

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2010-02-07 12:11:45 UTC (rev 100665)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2010-02-07 14:42:29 UTC (rev 100666)
@@ -585,6 +585,24 @@
 
    /**
     * Get a bean
+    * @param name The bean name
+    * @param expectedType The expected type for the bean
+    * @return The bean instance
+    * @exception Throwable If an error occurs
+    */
+   public <T> T getBean(String name, Class<T> expectedType) throws Throwable
+   {
+      if (name == null)
+         throw new IllegalArgumentException("Name is null");
+
+      if (expectedType == null)
+         throw new IllegalArgumentException("ExpectedType is null");
+
+      return expectedType.cast(getBean(name));
+   }
+
+   /**
+    * Get a bean
     * @param name The name of the bean
     * @return The bean
     */