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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/21 03:16:41

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace     
                        ContentServlet.java
  Added:       examples/seamspace/src/org/jboss/seam/example/seamspace     
                        ContentAction.java ContentLocal.java
  Removed:     examples/seamspace/src/org/jboss/seam/example/seamspace     
                        ImageAction.java ImageLocal.java
  Log:
  renamed ImageAction to ContentAction
  
  Revision  Changes    Path
  1.2       +13 -8     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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ContentServlet.java	21 Dec 2006 05:34:47 -0000	1.1
  +++ ContentServlet.java	21 Dec 2006 08:16:41 -0000	1.2
  @@ -13,13 +13,17 @@
   {
      private static final long serialVersionUID = -8461940507242022217L;
   
  +   private static final String IMAGES_PATH = "/images";
  +
      @Override
      protected void doGet(HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
      {
  -      ImageLocal local = (ImageLocal) Component.getInstance(ImageAction.class);
  +      if (IMAGES_PATH.equals(request.getPathInfo()))
  +      {
  +         ContentLocal contentAction = (ContentLocal) Component.getInstance(ContentAction.class);
         
  -      MemberImage img = local.getImage(Integer.parseInt(request.getParameter("id")));
  +         MemberImage img = contentAction.getImage(Integer.parseInt(request.getParameter("id")));
         
         if (img != null)
         {
  @@ -28,4 +32,5 @@
           response.getOutputStream().flush();
         }
      }
  +   }
   }
  
  
  
  1.1      date: 2006/12/21 08:16:41;  author: sbryzak2;  state: Exp;jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentAction.java
  
  Index: ContentAction.java
  ===================================================================
  package org.jboss.seam.example.seamspace;
  
  import javax.ejb.Stateless;
  import javax.persistence.EntityManager;
  
  import org.jboss.seam.annotations.In;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.security.SeamSecurityManager;
  
  @Stateless
  @Name("contentAction")
  public class ContentAction implements ContentLocal
  {
     @In(create = true) EntityManager entityManager;
     
     public MemberImage getImage(int imageId)
     {
        MemberImage img = entityManager.find(MemberImage.class, imageId);
  
        if (img != null && SeamSecurityManager.hasPermission("MemberImage", "view", img))      
           return img;
        else
           return null;
     }
  }
  
  
  
  1.1      date: 2006/12/21 08:16:41;  author: sbryzak2;  state: Exp;jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/ContentLocal.java
  
  Index: ContentLocal.java
  ===================================================================
  package org.jboss.seam.example.seamspace;
  
  import javax.ejb.Local;
  
  @Local
  public interface ContentLocal
  {
    MemberImage getImage(int imageId);
  }