[jboss-svn-commits] JBL Code SVN: r19953 - in labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam: conf and 1 other directory.

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

Author: wrzep
Date: 2008-05-14 10:45:25 -0400 (Wed, 14 May 2008)
New Revision: 19953

Modified:
   labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/LabsGuiceInterceptor.java
   labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/conf/Injector.java
Log:
JBLAB-950 final changes

Modified: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/LabsGuiceInterceptor.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/LabsGuiceInterceptor.java	2008-05-14 12:15:32 UTC (rev 19952)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/LabsGuiceInterceptor.java	2008-05-14 14:45:25 UTC (rev 19953)
@@ -108,5 +108,5 @@
         }
 
         return (Injector) result;
-    }    
+    }
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/conf/Injector.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/conf/Injector.java	2008-05-14 12:15:32 UTC (rev 19952)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/seam/conf/Injector.java	2008-05-14 14:45:25 UTC (rev 19953)
@@ -26,12 +26,8 @@
 import com.google.inject.Guice;
 import com.google.inject.Module;
 import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.*;
 import static org.jboss.seam.annotations.Install.FRAMEWORK;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
-import org.jboss.seam.annotations.Unwrap;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
 import org.jboss.seam.log.LogProvider;
 import org.jboss.seam.log.Logging;
 
@@ -43,10 +39,10 @@
 /**
  * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
  */
+ at Name("org.jboss.labs.injection.seam.injector")
 @Scope(ScopeType.APPLICATION)
 @Startup
 @Install(value=false, precedence = FRAMEWORK)
- at BypassInterceptors
 public class Injector implements Serializable
 {
     private static final long serialVersionUID = 8935525407647910950L;
@@ -55,19 +51,28 @@
 
     private String[] modules;
 
+    private com.google.inject.Injector injector = null;
+
     @Unwrap
-    public com.google.inject.Injector getInjector() throws IllegalAccessException, InstantiationException, ClassNotFoundException
+    public com.google.inject.Injector getInjector()
     {
+        return injector;
+    }
+
+    @Create
+    public void createInjector() throws IllegalAccessException, InstantiationException, ClassNotFoundException
+    {
         if ((modules == null) || (modules.length == 0))
         {
             throw new IllegalArgumentException("No Guice module specified.");
         }
 
-        log.info("Creating injector from modules: " + Arrays.toString(modules));        
+        log.info("Creating x injector '" +
+                 "'from modules: " + Arrays.toString(modules));
 
         final List<Module> moduleList = getModuleList(modules);
 
-        return Guice.createInjector(moduleList);
+        injector = Guice.createInjector(moduleList);
     }
 
     private static List<Module> getModuleList(String[] modules) throws IllegalAccessException, InstantiationException, ClassNotFoundException