[webbeans-commits] Webbeans SVN: r2731 - examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations and 11 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Fri May 29 10:50:13 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-05-29 10:50:13 -0400 (Fri, 29 May 2009)
New Revision: 2731

Added:
   ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
Removed:
   examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
   examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
Modified:
   examples/trunk/conversations/pom.xml
   examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
   examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
   examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
   examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
   examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
   examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
   examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
   examples/trunk/login/pom.xml
   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/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
   examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/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
   examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
   examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
   examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
   examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
   examples/trunk/wicket/numberguess/pom.xml
   examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
   examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
   examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
   examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
   examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
Log:
Make examples compile

Modified: examples/trunk/conversations/pom.xml
===================================================================
--- examples/trunk/conversations/pom.xml	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/pom.xml	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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>
    

Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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;

Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 @@
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game()
    {

Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 

Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/login/pom.xml
===================================================================
--- examples/trunk/login/pom.xml	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/pom.xml	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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>
    

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 {

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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})

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 {

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 @@
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game()
    {

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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.

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 @Target( {TYPE, METHOD, PARAMETER, FIELD} )
 @Retention( RUNTIME )
 @Documented

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 void start( @Observes @Deployed Manager manager )
+    public void start( @Observes AfterDeploymentValidation event )
     {
         java.awt.EventQueue.invokeLater( new Runnable()
             {

Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
 @Target( {TYPE, METHOD, PARAMETER, FIELD} )
 @Retention( RUNTIME )
 @Documented

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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
 { 

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-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Deleted: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF	2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

Deleted: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml	2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
-	<display-name>
-	webbeans-translator-ejb</display-name>
-</ejb-jar>

Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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;
 

Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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;

Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/pom.xml	2009-05-29 14:50:13 UTC (rev 2731)
@@ -49,6 +49,11 @@
 			<!-- TODO Move to version matrix -->
 			<version>1.2.14</version>
 		</dependency>
+		
+		<dependency>
+         <groupId>javax.annotation</groupId>
+         <artifactId>jsr250-api</artifactId>
+    </dependency>
 
 
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->

Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,12 +3,12 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Named;
 import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+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.naming.NamingException;
 
 @Named
@@ -26,7 +26,7 @@
    private int biggest;
    private int remainingGuesses;
    
-   @Current Manager manager;
+   @Current BeanManager manager;
    
    public Game() throws NamingException {}
 

Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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

Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,21 +1,16 @@
 package org.jboss.webbeans.examples.wicket;
 
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
 
 public class HomePage extends WebPage {
 

Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java	2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -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)

Added: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java	                        (rev 0)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java	2009-05-29 14:50:13 UTC (rev 2731)
@@ -0,0 +1,8 @@
+package javax.enterprise.inject.spi;
+
+public interface AfterDeploymentValidation 
+{
+   
+   public void addDeploymentProblem(Throwable t);
+
+}


Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain




More information about the weld-commits mailing list