Make examples compile

weld · May 29, 2009 · 2c8cb9b · 2c8cb9b
1 parent e823f4a
commit 2c8cb9b
Show file tree

Hide file tree

Showing 36 changed files with 85 additions and 91 deletions.
diff --git a/conversations/pom.xml b/conversations/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 

diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
@@ -4,12 +4,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Named;
-import javax.context.Conversation;
-import javax.context.SessionScoped;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 import javax.faces.model.SelectItem;
-import javax.inject.Current;
-import javax.inject.Produces;
 
 import org.jboss.webbeans.conversation.ConversationIdGenerator;
 import org.jboss.webbeans.conversation.ConversationInactivityTimeout;

diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
@@ -1,14 +1,14 @@
 package org.jboss.webbeans.examples.conversations;
 
-import javax.context.ConversationScoped;
-import javax.annotation.Named;
+import java.io.Serializable;
+
 import javax.annotation.PreDestroy;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
 
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 
-import java.io.Serializable;
-
 @ConversationScoped
 @Named
 public class Data implements Serializable

diff --git a/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java b/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
@@ -3,16 +3,16 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 @Named
 @SessionScoped
@@ -29,7 +29,7 @@ public class Game implements Serializable
    private int biggest;
    private int remainingGuesses;
 
-   @Current Manager manager;
+   @Current BeanManager manager;
 
    public Game()
    {

diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator implements Serializable 

diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
@@ -11,7 +11,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)

diff --git a/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java b/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
@@ -11,7 +11,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)

diff --git a/login/pom.xml b/login/pom.xml
@@ -4,7 +4,7 @@
 
    <parent>
       <groupId>org.jboss.webbeans.examples</groupId>
-      <artifactId>parent</artifactId>
+      <artifactId>webbeans-examples-parent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
 

diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java b/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
 
 @RequestScoped @Named
 public class Credentials implements Serializable {

diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java b/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
@@ -8,7 +8,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE, METHOD, FIELD})

diff --git a/login/src/main/java/org/jboss/webbeans/examples/login/Login.java b/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
@@ -4,12 +4,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.inject.Current;
-import javax.inject.Produces;
 
 @SessionScoped @Named
 public class Login implements Serializable {

diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
@@ -3,16 +3,16 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
 
 @Named
 @SessionScoped
@@ -29,7 +29,7 @@ public class Game implements Serializable
    private int biggest;
    private int remainingGuesses;
 
-   @Current Manager manager;
+   @Current BeanManager manager;
 
    public Game()
    {

diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
@@ -3,8 +3,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator implements Serializable 

diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
@@ -11,7 +11,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)

diff --git a/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java b/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
@@ -11,7 +11,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)

diff --git a/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java b/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 
 import javax.annotation.PostConstruct;
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
 
 /**
  * This class contains the pure logic of the Number Guess game.

diff --git a/...rguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java b/...rguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator

diff --git a/...rguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java b/...rguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
@@ -16,16 +16,17 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+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 )
 @Documented

diff --git a/...src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java b/...src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 /**
  * This class generates on demand appropriate messages depending on the current

diff --git a/...src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java b/...src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
@@ -18,10 +18,10 @@
 
 import java.awt.CardLayout;
 
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Manager;
 
 /**
  * Swing-based number guess example, main application frame.
@@ -38,7 +38,7 @@ public NumberGuessFrame()
     {
     }
 
-    public void start( @Observes @Deployed Manager manager )
+    public void start( @Observes AfterDeploymentValidation event )
     {
         java.awt.EventQueue.invokeLater( new Runnable()
             {

diff --git a/...mberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java b/...mberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
@@ -16,16 +16,17 @@
  */
 package org.jboss.webbeans.environment.se.example.numberguess;
 
-import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+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 )
 @Documented

diff --git a/...s-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java b/...s-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 
 import javax.ejb.EJB;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
 
 public class TextTranslator implements Serializable
 { 

diff --git a/...or-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java b/...or-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
@@ -1,10 +1,10 @@
 package org.jboss.webbeans.examples.translator;
 
-import javax.annotation.Named;
-import javax.context.RequestScoped;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
 
 @Stateful
 @RequestScoped

diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF b/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
diff --git a/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml b/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/.../conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java b/.../conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
 
 import org.jboss.webbeans.conversation.ConversationInactivityTimeout;
 

diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
@@ -2,8 +2,8 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
 
 @ConversationScoped
 @Named

diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
@@ -9,7 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
 
 @Target( { TYPE, METHOD, FIELD })
 @Retention(RUNTIME)

diff --git a/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java b/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.context.Conversation;
-import javax.inject.Current;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Current;
 
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.WebPage;