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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/21 21:04:48

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace    
                        ContentAction.java LoginAction.java LoginLocal.java
                        ProfileAction.java
  Log:
  added security rules
  
  Revision  Changes    Path
  1.3       +1 -1      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContentAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ContentAction.java	21 Dec 2006 13:05:01 -0000	1.2
  +++ ContentAction.java	22 Dec 2006 02:04:48 -0000	1.3
  @@ -17,7 +17,7 @@
      {
         MemberImage img = entityManager.find(MemberImage.class, imageId);
   
  -      if (img != null)// && SeamSecurityManager.hasPermission("memberImage", "view", img))      
  +      if (img != null && SeamSecurityManager.hasPermission("memberImage", "view", img))      
            return img;
         else
            return null;
  
  
  
  1.5       +34 -30    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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- LoginAction.java	21 Dec 2006 05:34:47 -0000	1.4
  +++ LoginAction.java	22 Dec 2006 02:04:48 -0000	1.5
  @@ -26,7 +26,9 @@
   @Name("login")
   public class LoginAction implements LoginLocal
   {
  -  @In(required = false) @Out(required = false) Member member;
  +   @In(required = false)
  +   @Out(required = false)
  +   Member member;
     
     private boolean loggedIn;
   
  @@ -34,7 +36,8 @@
     {
       try
       {
  -      Authenticator.instance().authenticate(member.getUsername(), member.getPassword());
  +         Authenticator.instance().authenticate(member.getUsername(),
  +               member.getPassword());
         loggedIn = true;      
       }
       catch (AuthenticationException ex)
  @@ -55,6 +58,7 @@
   	return loggedIn;
     }
     
  -  @Remove @Destroy
  +   @Remove
  +   @Destroy
     public void destroy() { }
   }
  
  
  
  1.3       +1 -0      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- LoginLocal.java	20 Dec 2006 03:36:56 -0000	1.2
  +++ LoginLocal.java	22 Dec 2006 02:04:48 -0000	1.3
  @@ -13,4 +13,5 @@
     void login();
     void logout();
     boolean isLoggedIn();
  +  void destroy();
   }
  
  
  
  1.4       +3 -6      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProfileAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ProfileAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ProfileAction.java	21 Dec 2006 13:05:01 -0000	1.3
  +++ ProfileAction.java	22 Dec 2006 02:04:48 -0000	1.4
  @@ -28,14 +28,14 @@
      @Factory("selectedMember")
      public void display()
      {
  -      if (name == null)
  +      if (name == null && Identity.isSet())
         {
            selectedMember = (Member) entityManager.createQuery(
                  "from Member where username = :username")
                  .setParameter("username", Identity.instance().getName())
                  .getSingleResult();
         }
  -      else
  +      else if (name != null)
         {
            try
            {
  @@ -44,10 +44,7 @@
               .setParameter("name", name)
               .getSingleResult();
            }
  -         catch (NoResultException ex) 
  -         {
  -            FacesMessages.instance().add("The member name you specified does not exist.");
  -         }   
  +         catch (NoResultException ex) { }   
         }
      }
   }