[webbeans-commits] Webbeans SVN: r1233 - in examples/trunk: numberguess/src/main/java/org/jboss/webbeans/examples/numberguess and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-26 10:01:48 -0500 (Mon, 26 Jan 2009) New Revision: 1233 Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java Log: WBRI-117, update to packaging to PRD2 Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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 { Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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}) Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java =================================================================== --- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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 { Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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 Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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 Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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) Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java =================================================================== --- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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) Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java =================================================================== --- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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 { Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java =================================================================== --- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-01-26 15:00:55 UTC (rev 1232) +++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-01-26 15:01:48 UTC (rev 1233) @@ -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