[webbeans-commits] Webbeans SVN: r2713 - in extensions/trunk: logger/src/main/java/org/jboss/webbeans/log and 11 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Tue May 26 08:55:05 EDT 2009


Author: dallen6
Date: 2009-05-26 08:55:05 -0400 (Tue, 26 May 2009)
New Revision: 2713

Modified:
   extensions/trunk/logger/pom.xml
   extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java
   extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java
   extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java
   extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java
   extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java
   extensions/trunk/servlet/pom.xml
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java
   extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java
   extensions/trunk/wicket/pom.xml
   extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java
   extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java
Log:
Updated Web Beans Extensions to latest JSR-299 API

Modified: extensions/trunk/logger/pom.xml
===================================================================
--- extensions/trunk/logger/pom.xml	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/logger/pom.xml	2009-05-26 12:55:05 UTC (rev 2713)
@@ -2,7 +2,7 @@
    <parent>
       <artifactId>webbeans-parent</artifactId>
       <groupId>org.jboss.webbeans</groupId>
-      <version>1.0.0.PREVIEW1</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.webbeans</groupId>

Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java
===================================================================
--- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -10,8 +10,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.annotation.NonBinding;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
+import javax.enterprise.inject.NonBinding;
 
 /**
  * Injects a log

Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java
===================================================================
--- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -17,13 +17,10 @@
 
 package org.jboss.webbeans.log;
 
-import javax.inject.Current;
-import javax.inject.Produces;
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.webbeans.log.Log;
-import org.jboss.webbeans.log.Logging;
-
 /**
  * The <code>LoggerProducer</code> provides a producer method for all
  * @Logger annotated log objects.  Each logger is application scoped

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.environment.se;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.manager.Manager;
 
 import org.jboss.webbeans.bootstrap.api.Bootstrap;
 import org.jboss.webbeans.environment.se.events.Shutdown;
@@ -25,7 +25,7 @@
     * 
     * @param shutdownRequest
     */
-   public void shutdown(@Observes @Shutdown Manager shutdownRequest)
+   public void shutdown(@Observes @Shutdown BeanManager shutdownRequest)
    {
       synchronized (this)
       {

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.environment.se;
 
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.jboss.webbeans.bootstrap.api.Bootstrap;
 import org.jboss.webbeans.bootstrap.api.Environments;
@@ -78,7 +78,7 @@
         new StartMain(args).main();
     }
 
-    public Manager main()
+    public BeanManager main()
     {
         go();
         return manager;

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -21,12 +21,12 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.context.ApplicationScoped;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.event.Observes;
-import javax.inject.Produces;
 
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
 import org.jboss.webbeans.environment.se.StartMain;
 import org.jboss.webbeans.environment.se.bindings.Parameters;
 
@@ -86,7 +86,7 @@
     *
     * @param manager The Manager which has been initialized.
     */
-   public void initArgs(@Observes @Initialized Manager manager) {
+   public void initArgs(@Observes @BeforeBeanDiscovery BeanManager manager) {
       this.setArgs( StartMain.PARAMETERS );
    }
 }

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 /**
  * 

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 /**
  * Fired by webbeans SE before shutting down. Applications and modules should

Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -16,8 +16,8 @@
  */
 package org.jboss.webbeans.environment.se.test;
 
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.jboss.webbeans.environment.se.StartMain;
 import org.jboss.webbeans.environment.se.events.Shutdown;
@@ -44,7 +44,7 @@
     public void testMain()
     {
         String[] args = ARGS ;
-        Manager manager = new StartMain(args).main();
+        BeanManager manager = new StartMain(args).main();
 
         MainTestBean mainTestBean = manager.getInstanceByType( MainTestBean.class );
         Assert.assertNotNull( mainTestBean );
@@ -79,7 +79,7 @@
     @Test
     public void testMainEmptyArgs()
     {
-        Manager manager = new StartMain(ARGS_EMPTY).main();
+        BeanManager manager = new StartMain(ARGS_EMPTY).main();
 
         MainTestBean mainTestBean = manager.getInstanceByType( MainTestBean.class );
         Assert.assertNotNull( mainTestBean );
@@ -91,7 +91,7 @@
         shutdownManager(manager);
     }
 
-    private void shutdownManager( Manager manager )
+    private void shutdownManager( BeanManager manager )
     {
         manager.fireEvent( manager, new ShutdownAnnotation() );
     }

Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/MainTestBean.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -16,11 +16,11 @@
  */
 package org.jboss.webbeans.environment.se.test.beans;
 
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.Initializer;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Manager;
 
 /**
  *
@@ -41,7 +41,7 @@
         paramsTestBean.getParameters();
     }
 
-    public void mainMethod(@Observes @Deployed Manager manager) {
+    public void mainMethod(@Observes @AfterBeanDiscovery BeanManager manager) {
         System.out.println( "Starting main test app" );
     }
 

Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ParametersTestBean.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Initializer;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Initializer;
 
 import org.jboss.webbeans.environment.se.bindings.Parameters;
 import org.testng.Assert;

Modified: extensions/trunk/servlet/pom.xml
===================================================================
--- extensions/trunk/servlet/pom.xml	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/pom.xml	2009-05-26 12:55:05 UTC (rev 2713)
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.jboss.webbeans</groupId>
       <artifactId>webbeans-version-matrix</artifactId>
-      <version>1.0.0.PREVIEW1</version>
+      <version>1.0.0-SNAPSHOT</version>
   </parent>
 
    <name>Web Beans Servlet aggregator</name>

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.test.tomcat.examples;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 public class Game
 {

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Generator.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.test.tomcat.examples;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator {

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -8,7 +8,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD })
 @Retention(RUNTIME)

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -10,7 +10,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.test.tomcat.examples;
 
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 public class TextTranslator 
 { 

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Mouse.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,17 +1,17 @@
 package org.jboss.webbeans.test.tomcat.lookup;
 
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 public class Mouse
 {
    
-   public Manager getManager()
+   public BeanManager getManager()
    {
       try
       {
-         return (Manager) new InitialContext().lookup("java:comp/env/app/Manager");
+         return (BeanManager) new InitialContext().lookup("java:comp/env/app/Manager");
       }
       catch (NamingException e)
       {

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/Vole.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,15 +1,15 @@
 package org.jboss.webbeans.test.tomcat.lookup;
 
 import javax.annotation.Resource;
-import javax.inject.manager.Manager;
+import javax.enterprise.inject.spi.BeanManager;
 
 public class Vole
 {
    
    @Resource(mappedName="java:comp/env/app/Manager")
-   Manager manager;
+   BeanManager manager;
    
-   public Manager getManager()
+   public BeanManager getManager()
    {
       return manager;
    }

Modified: extensions/trunk/wicket/pom.xml
===================================================================
--- extensions/trunk/wicket/pom.xml	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/wicket/pom.xml	2009-05-26 12:55:05 UTC (rev 2713)
@@ -2,7 +2,7 @@
    <parent>
       <artifactId>webbeans-parent</artifactId>
       <groupId>org.jboss.webbeans</groupId>
-      <version>1.0.0.PREVIEW1</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.webbeans</groupId>

Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java
===================================================================
--- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansRequestCycle.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,7 +1,7 @@
 package org.jboss.webbeans.wicket;
 
-import javax.context.Conversation;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.apache.wicket.IRequestTarget;
 import org.apache.wicket.Page;
@@ -72,7 +72,7 @@
          specifiedCid = request.getParameter("cid");
       }
 
-      Manager manager = CurrentManager.rootManager();
+      BeanManager manager = CurrentManager.rootManager();
       Conversation conversation = manager.getInstanceByType(Conversation.class);
 
       // restore a conversation if it exists

Modified: extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java
===================================================================
--- extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java	2009-05-26 12:53:17 UTC (rev 2712)
+++ extensions/trunk/wicket/src/main/java/org/jboss/webbeans/wicket/WebBeansWebRequestCycleProcessor.java	2009-05-26 12:55:05 UTC (rev 2713)
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.wicket;
 
-import javax.context.Conversation;
+import javax.enterprise.context.Conversation;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.RequestCycle;




More information about the weld-commits mailing list