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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/25 11:49:00

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace  
                        Authenticator.java ContentAction.java
  Log:
  page security
  
  Revision  Changes    Path
  1.2       +0 -3      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Authenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Authenticator.java	25 Jan 2007 13:24:07 -0000	1.1
  +++ Authenticator.java	25 Jan 2007 16:49:00 -0000	1.2
  @@ -12,7 +12,6 @@
   import org.jboss.seam.annotations.Out;
   import org.jboss.seam.annotations.Synchronized;
   import org.jboss.seam.core.FacesMessages;
  -import org.jboss.seam.security.Identity;
   
   /**
    * Authenticator bean - authenticates the user against the database
  @@ -26,8 +25,6 @@
      @In(create=true)
      private EntityManager entityManager;
      
  -   @In Identity identity;
  -   
      @Out(required = false, scope = SESSION)
      private Member authenticatedMember;
   
  
  
  
  1.6       +1 -2      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ContentAction.java	25 Jan 2007 13:24:07 -0000	1.5
  +++ ContentAction.java	25 Jan 2007 16:49:00 -0000	1.6
  @@ -12,13 +12,12 @@
   public class ContentAction implements ContentLocal
   {
      @In(create = true) EntityManager entityManager;   
  -   @In(create = true) Identity identity;
      
      public MemberImage getImage(int imageId)
      {
         MemberImage img = entityManager.find(MemberImage.class, imageId);
         
  -      if (img == null || !identity.hasPermission("memberImage", "view", img))
  +      if (img == null || !Identity.instance().hasPermission("memberImage", "view", img))
            return null;
         else
            return img;