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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/23 09:54:26

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace   
                        ContentAction.java LoginAction.java Register.java
  Log:
  fixed compiler errors due to core changes
  
  Revision  Changes    Path
  1.4       +3 -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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ContentAction.java	22 Dec 2006 02:04:48 -0000	1.3
  +++ ContentAction.java	23 Jan 2007 14:54:26 -0000	1.4
  @@ -5,19 +5,20 @@
   
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.security.SeamSecurityManager;
  +import org.jboss.seam.security.Security;
   
   @Stateless
   @Name("contentAction")
   public class ContentAction implements ContentLocal
   {
      @In(create = true) EntityManager entityManager;
  +   @In Security security;
      
      public MemberImage getImage(int imageId)
      {
         MemberImage img = entityManager.find(MemberImage.class, imageId);
   
  -      if (img != null && SeamSecurityManager.hasPermission("memberImage", "view", img))      
  +      if (img != null && security.hasPermission("memberImage", "view", img))      
            return img;
         else
            return null;
  
  
  
  1.13      +6 -3      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.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- LoginAction.java	23 Jan 2007 05:25:07 -0000	1.12
  +++ LoginAction.java	23 Jan 2007 14:54:26 -0000	1.13
  @@ -21,7 +21,7 @@
   import org.jboss.seam.annotations.Synchronized;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.log.Log;
  -import org.jboss.seam.security.SeamSecurityManager;
  +import org.jboss.seam.security.Security;
   
   /**
    * Login action
  @@ -43,6 +43,9 @@
      @In(create=true)
      private EntityManager entityManager;
      
  +   @In 
  +   private Security security;
  +   
      @Out(required = false)
      private Member authenticatedMember;
      
  @@ -50,10 +53,10 @@
      {
         try
         {
  -         CallbackHandler cbh = SeamSecurityManager.instance().createCallbackHandler(
  +         CallbackHandler cbh = security.createCallbackHandler(
                  member.getUsername(), member.getPassword());
            
  -         LoginContext lc = SeamSecurityManager.instance().createLoginContext(null, cbh);
  +         LoginContext lc = security.createLoginContext(null, cbh);
            lc.login();
         }
         catch (LoginException ex)
  
  
  
  1.4       +0 -2      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Register.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Register.java	23 Jan 2007 05:25:07 -0000	1.3
  +++ Register.java	23 Jan 2007 14:54:26 -0000	1.4
  @@ -2,8 +2,6 @@
   
   import javax.ejb.Local;
   
  -import org.jboss.seam.util.UploadedFile;
  -
   @Local
   public interface Register
   {