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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/21 08:05:01

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace     
                        ContentAction.java ContentServlet.java Member.java
                        MemberImage.java ProfileAction.java
  Log:
  display member's picture on profile page using content servlet
  
  Revision  Changes    Path
  1.2       +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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ContentAction.java	21 Dec 2006 08:16:41 -0000	1.1
  +++ ContentAction.java	21 Dec 2006 13:05:01 -0000	1.2
  @@ -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.3       +5 -0      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContentServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ContentServlet.java	21 Dec 2006 08:16:41 -0000	1.2
  +++ ContentServlet.java	21 Dec 2006 13:05:01 -0000	1.3
  @@ -9,6 +9,11 @@
   
   import org.jboss.seam.Component;
   
  +/**
  + * Serves images and other member content
  + * 
  + * @author Shane Bryzak
  + */
   public class ContentServlet extends HttpServlet
   {
      private static final long serialVersionUID = -8461940507242022217L;
  
  
  
  1.9       +1 -0      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Member.java	21 Dec 2006 05:34:47 -0000	1.8
  +++ Member.java	21 Dec 2006 13:05:01 -0000	1.9
  @@ -98,6 +98,7 @@
      }
   
      @OneToOne(fetch = FetchType.LAZY)
  +   @JoinColumn(name = "PICTURE_ID")
      public MemberImage getPicture()
      {
         return picture;
  
  
  
  1.3       +2 -0      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MemberImage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MemberImage.java	21 Dec 2006 05:34:47 -0000	1.2
  +++ MemberImage.java	21 Dec 2006 13:05:01 -0000	1.3
  @@ -4,6 +4,7 @@
   
   import javax.persistence.Entity;
   import javax.persistence.Id;
  +import javax.persistence.JoinColumn;
   import javax.persistence.ManyToOne;
   
   import org.jboss.seam.annotations.Name;
  @@ -31,6 +32,7 @@
      }
      
      @ManyToOne
  +   @JoinColumn(name = "MEMBER_ID")
      public Member getMember()
      {
         return member;
  
  
  
  1.3       +1 -1      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ProfileAction.java	21 Dec 2006 05:34:47 -0000	1.2
  +++ ProfileAction.java	21 Dec 2006 13:05:01 -0000	1.3
  @@ -19,7 +19,7 @@
      @RequestParameter
      private String name;
   
  -   @Out
  +   @Out(required = false)
      private Member selectedMember;
      
      @In(create=true)