Changeset 675

Timestamp:

02/24/10 16:35:19 (7 months ago)

Author:

fabman

Message:

more pub user fixes for freshly-created repos

Location:

trunk/src/com/calenco

Files:

• CalencoV2.java (modified) (3 diffs)
• security/SUSecurityManager.java (modified) (1 diff)

trunk/src/com/calenco/CalencoV2.java

@@ -67 +67 @@
     private static final Logger log = Logger.getLogger(CalencoV2.class);
 
-    private static SUSecurityManager suSecMgr = SUSecurityManager.getInstance();
-
     public CalencoV2() throws Exception {
         initRepo();
+        SUSecurityManager.getInstance();
     }
 
@@ -201 +200 @@
 
     /**
-     * Store some files on the content root, and basic users and groups
+     * Store system resources
      *
      * @param session the <code>javax.jcr.Session</code> used for item storage
@@ -217 +216 @@
             admin = udao.addOrUpdate(admin);
         }
-        // Create, or update, publication user
-        User pubuser = new User();
-        pubuser.setEmail(User.PUB_USER_EMAIL); // NOI18N
-        pubuser.setName("Special User Running Publications"); // NOI18N
-        pubuser.setPassword(suSecMgr.getPubPass());
-        pubuser = udao.addOrUpdate(pubuser);
     }
 

trunk/src/com/calenco/security/SUSecurityManager.java

@@ -63 +63 @@
                 isAdminPassSet = false;
             }
-            /* Generate and store the password for the pub user */
+            // Create, or update, publication user
+            User pubuser = new User();
+            pubuser.setEmail(User.PUB_USER_EMAIL);
+            pubuser.setName("Special User Running Publications"); // NOI18N
             SecureRandom rng = new SecureRandom();
             byte[] passBytes = new byte[20];
             rng.nextBytes(passBytes);
             pubPass = new String(passBytes);
-            UserDAO udao = new UserDAO(session);
-            User pubUser = udao.findByName(User.PUB_USER_EMAIL);
-            pubUser.setPassword(pubPass);
-            pubUser = udao.addOrUpdate(pubUser);
+            pubuser.setPassword(pubPass);
+            pubuser = new UserDAO(session).addOrUpdate(pubuser);
+            log.debug(String.format("%s instantiated.", getClass()));
         } catch (Exception e) {
             log.error("Cannot instantiate system users security manager", e);