svn commit: r738226 - in /incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample: bean/ bindings/ dependent/ model/ observer/ util/

[ge...@apache.org]

Author: gerdogdu
Date: Tue Jan 27 20:20:58 2009
New Revision: 738226

URL: http://svn.apache.org/viewvc?rev=738226&view=rev
Log:
Update implementation to reflect API changes.

Modified:
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java
    incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java Tue Jan 27 20:20:58 2009
@@ -18,16 +18,16 @@
 
 import java.lang.annotation.Annotation;
 
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.context.SessionScoped;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observes;
 import javax.faces.application.FacesMessage;
+import javax.inject.Current;
+import javax.inject.Produces;
 
-import javax.webbeans.Current;
-import javax.webbeans.Event;
-import javax.webbeans.Named;
-import javax.webbeans.Fires;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.SessionScoped;
 
 import org.apache.webbeans.sample.bindings.LoggedInUser;
 import org.apache.webbeans.sample.dependent.LoginCheck;

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java Tue Jan 27 20:20:58 2009
@@ -16,9 +16,9 @@
  */
 package org.apache.webbeans.sample.bean;
 
+import javax.annotation.Named;
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpSession;
-import javax.webbeans.Named;
 
 import org.apache.webbeans.sample.bindings.LoggedInUser;
 import org.apache.webbeans.sample.model.User;

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java Tue Jan 27 20:20:58 2009
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.webbeans.BindingType;
+import javax.inject.BindingType;
 
 @BindingType
 @Retention(RetentionPolicy.RUNTIME)

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java Tue Jan 27 20:20:58 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.sample.dependent;
 
-import javax.webbeans.Dependent;
+import javax.context.Dependent;
 
 @Dependent
 public class LoginCheck

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java Tue Jan 27 20:20:58 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.sample.model;
 
-import javax.webbeans.Model;
+import javax.annotation.Model;
 
 /**
  * Simple model object for loginned users.

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java Tue Jan 27 20:20:58 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.sample.observer;
 
-import javax.webbeans.Observer;
+import javax.event.Observer;
 
 import org.apache.webbeans.sample.event.LoggedInEvent;
 import org.apache.webbeans.sample.model.User;

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java?rev=738226&r1=738225&r2=738226&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java Tue Jan 27 20:20:58 2009
@@ -16,11 +16,11 @@
  */
 package org.apache.webbeans.sample.util;
 
+import javax.annotation.Named;
+import javax.context.Dependent;
 import javax.faces.application.FacesMessage;
 import javax.faces.application.FacesMessage.Severity;
 import javax.faces.context.FacesContext;
-import javax.webbeans.Dependent;
-import javax.webbeans.Named;
 
 @Named(value="facesMessage")
 @Dependent