[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao ...

[Christian Bauer]

  User: cbauer  
  Date: 07/04/04 06:38:13

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao  
                        UserRoleAccessFactory.java NodeDAO.java
  Log:
  Switched to AJAX forms
  
  Revision  Changes    Path
  1.3       +4 -5      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserRoleAccessFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserRoleAccessFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/UserRoleAccessFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UserRoleAccessFactory.java	2 Apr 2007 18:25:06 -0000	1.2
  +++ UserRoleAccessFactory.java	4 Apr 2007 10:38:13 -0000	1.3
  @@ -1,6 +1,7 @@
   package org.jboss.seam.wiki.core.dao;
   
   import org.jboss.seam.ScopeType;
  +import org.jboss.seam.Component;
   import org.jboss.seam.wiki.core.model.Role;
   import org.jboss.seam.wiki.core.model.User;
   import org.jboss.seam.wiki.core.action.prefs.UserManagementPreferences;
  @@ -23,9 +24,6 @@
       @In
       EntityManager entityManager;
   
  -    @In
  -    private UserManagementPreferences userManagementPreferences;
  -
       @Factory(value = "guestUser", scope = ScopeType.SESSION)
       public User getGuestUser() {
           try {
  @@ -93,13 +91,14 @@
   
       @Factory(value = "newUserDefaultRole", scope = ScopeType.SESSION)
       public Role getDefaultRole() {
  +        UserManagementPreferences userPrefs = (UserManagementPreferences) Component.getInstance("userManagementPreferences");
           try {
               entityManager.joinTransaction();
               return (Role) entityManager
  -                    .createQuery("select r from Role r where r.name = '"+userManagementPreferences.getNewUserInRole()+"'")
  +                    .createQuery("select r from Role r where r.name = '"+userPrefs.getNewUserInRole()+"'")
                               .getSingleResult();
           } catch (NoResultException ex) {
  -            throw new RuntimeException("Configured default role for new users '"+userManagementPreferences.getNewUserInRole()+"' not found");
  +            throw new RuntimeException("Configured default role for new users '"+userPrefs.getNewUserInRole()+"' not found");
           }
       }
   
  
  
  
  1.9       +3 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/NodeDAO.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- NodeDAO.java	2 Apr 2007 18:25:06 -0000	1.8
  +++ NodeDAO.java	4 Apr 2007 10:38:13 -0000	1.9
  @@ -44,6 +44,9 @@
       // Make sure that these methods do not return detached objects!
       @In protected EntityManager entityManager;
   
  +    public void flushRegularEntityManager() {
  +        restrictedEntityManager.flush();
  +    }
   
       public void makePersistent(Node node) {
           entityManager.joinTransaction();