[jboss-cvs] jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/19 22:36:56

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace    
                        LoginAction.java LoginLocal.java Member.java
                        MemberRole.java
  Log:
  added pages.xml, minor changes
  
  Revision  Changes    Path
  1.2       +25 -9     jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LoginAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LoginAction.java	31 Oct 2006 02:54:36 -0000	1.1
  +++ LoginAction.java	20 Dec 2006 03:36:56 -0000	1.2
  @@ -1,11 +1,16 @@
   package org.jboss.seam.example.seamspace;
   
  -import javax.ejb.Stateless;
  +import javax.ejb.Remove;
  +import javax.ejb.Stateful;
   
  +import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  +import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
  +import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.annotations.Synchronized;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.security.AuthenticationException;
   import org.jboss.seam.security.authenticator.Authenticator;
  @@ -15,30 +20,41 @@
    *
    * @author Shane Bryzak
    */
  - at Stateless
  - at Name("loginAction")
  + at Stateful
  + at Scope(ScopeType.SESSION)
  + at Synchronized
  + at Name("login")
   public class LoginAction implements LoginLocal
   {
     @In(required = false) @Out(required = false) Member member;
   
  -  public String login()
  +  private boolean loggedIn;
  +
  +  public void login()
     {
       try
       {
         Authenticator.instance().authenticate(member.getUsername(), member.getPassword());
  -      return "success";
  +      loggedIn = true;      
       }
       catch (AuthenticationException ex)
       {
         FacesMessages.instance().add("Invalid login");
  -      return "login";
       }
     }
   
  -  public String logout()
  +  public void logout()
     {
  +	loggedIn = false;
       Authenticator.instance().unauthenticateSession();
       Seam.invalidateSession();
  -    return "login";
     }
  +  
  +  public boolean isLoggedIn()
  +  {
  +	return loggedIn;
  +  }
  +  
  +  @Remove @Destroy
  +  public void destroy() { }
   }
  
  
  
  1.2       +3 -2      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginLocal.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LoginLocal.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/LoginLocal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LoginLocal.java	31 Oct 2006 02:54:36 -0000	1.1
  +++ LoginLocal.java	20 Dec 2006 03:36:56 -0000	1.2
  @@ -10,6 +10,7 @@
   @Local
   public interface LoginLocal
   {
  -  String login();
  -  String logout();
  +  void login();
  +  void logout();
  +  boolean isLoggedIn();
   }
  
  
  
  1.6       +4 -1      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Member.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Member.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Member.java	14 Dec 2006 04:12:21 -0000	1.5
  +++ Member.java	20 Dec 2006 03:36:56 -0000	1.6
  @@ -4,6 +4,7 @@
   import java.util.Set;
   import javax.persistence.Entity;
   import javax.persistence.Id;
  +import javax.persistence.JoinColumn;
   import javax.persistence.JoinTable;
   import javax.persistence.ManyToMany;
   
  @@ -56,7 +57,9 @@
     }
   
     @ManyToMany
  -  @JoinTable(name = "MemberRoles")
  +  @JoinTable(name = "MemberRoles",
  +             joinColumns=@JoinColumn(name="MEMBER_ID"), 
  +		     inverseJoinColumns=@JoinColumn(name="ROLE_ID"))    
     public Set<MemberRole> getRoles()
     {
       return roles;
  
  
  
  1.2       +1 -1      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MemberRole.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberRole.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- MemberRole.java	14 Dec 2006 05:18:58 -0000	1.1
  +++ MemberRole.java	20 Dec 2006 03:36:56 -0000	1.2
  @@ -12,7 +12,7 @@
    * @author Shane Bryzak
    */
   @Entity
  - at Name("role")
  + at Name("memberRole")
   public class MemberRole implements Serializable
   {
     private Integer roleId;