WBRI-117, update to packaging to PRD2

weld · Jan 26, 2009 · 5ad1f09 · 5ad1f09
1 parent 5da5caf
commit 5ad1f09
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
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.webbeans.Named;
-import javax.webbeans.RequestScoped;
+import javax.annotation.Named;
+import javax.context.RequestScoped;
 
 @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.webbeans.BindingType;
+import javax.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.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.webbeans.Current;
-import javax.webbeans.Named;
-import javax.webbeans.Produces;
-import javax.webbeans.SessionScoped;
+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,14 +3,14 @@
 
 import java.io.Serializable;
 
+import javax.annotation.Named;
 import javax.annotation.PostConstruct;
+import javax.context.SessionScoped;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.Current;
-import javax.webbeans.Named;
-import javax.webbeans.SessionScoped;
-import javax.webbeans.manager.Manager;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.manager.Manager;
 
 @Named
 @SessionScoped

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.webbeans.ApplicationScoped;
-import javax.webbeans.Produces;
+import javax.context.ApplicationScoped;
+import javax.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.webbeans.BindingType;
+import javax.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.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @Target( { TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)

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.webbeans.Initializer;
+import javax.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.webbeans.Current;
-import javax.webbeans.Named;
-import javax.webbeans.RequestScoped;
+import javax.inject.Current;
 
 @Stateful
 @RequestScoped