Fix example

weld · Sep 22, 2009 · 3e60e37 · 3e60e37
1 parent 6038520
commit 3e60e37
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/jsf/login/build.xml b/jsf/login/build.xml
@@ -2,6 +2,6 @@
 
 	<property name="example.name" value="webbeans-login" />
 
-	<import file="../build.xml" />
+	<import file="../../build.xml" />
 
-</project>
+</project>
diff --git a/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java b/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
@@ -3,9 +3,10 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
 
-@RequestScoped @Named
+@RequestScoped @Named @Default
 public class Credentials implements Serializable {
 
     private String username;

diff --git a/jsf/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java b/jsf/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
@@ -8,9 +8,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE, METHOD, FIELD})
-@BindingType
+@Qualifier
 public @interface LoggedIn {}
diff --git a/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Login.java b/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
@@ -5,16 +5,16 @@
 import java.util.List;
 
 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.Inject;
+import javax.inject.Named;
 
 @SessionScoped @Named
 public class Login implements Serializable {
 
-    @Current Credentials credentials;
+    @Inject Credentials credentials;
     //@PersistenceContext EntityManager userDatabase;
 
     private User user;
@@ -47,7 +47,8 @@ public boolean isLoggedIn() {
        return user!=null;
     }
 
-    @Produces @LoggedIn User getCurrentUser() {
+    @Produces @LoggedIn 
+    public User getCurrentUser() {
         return user;
     }