svn commit: r719107 - in /lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl: UsecaseCronJob.java UsecaseSchedulerImpl.java

Author: andreas
Date: Wed Nov 19 14:40:42 2008
New Revision: 719107

URL: http://svn.apache.org/viewvc?rev=719107&view=rev
Log:
Committing changes to usecase module.

Modified:
    lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java
    lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java

Modified: lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java?rev=719107&r1=719106&r2=719107&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java Wed Nov 19 14:40:42 2008
@@ -40,9 +40,11 @@
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccessController;
 import org.apache.lenya.ac.AccessControllerResolver;
+import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.Identifiable;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.Machine;
+import org.apache.lenya.ac.ManagedUserReference;
 import org.apache.lenya.ac.User;
 import org.apache.lenya.ac.UserManager;
 import org.apache.lenya.cms.usecase.Usecase;
@@ -181,7 +183,8 @@
                 identity.removeIdentifiable(identifiables[i]);
             }
 
-            UserManager userManager = controller.getAccreditableManager().getUserManager();
+            AccreditableManager accrMgr = controller.getAccreditableManager();
+            UserManager userManager = accrMgr.getUserManager();
             if (this.userId != null) {
                 User user = userManager.getUser(this.userId);
 
@@ -189,7 +192,7 @@
                     throw new RuntimeException("User [" + this.userId + "] does not exist!");
                 }
 
-                identity.addIdentifiable(user);
+                identity.addIdentifiable(new ManagedUserReference(user.getId(), accrMgr.getId()));
             }
             if (this.machineIp != null) {
                 Machine machine = new Machine(this.machineIp);

Modified: lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?rev=719107&r1=719106&r2=719107&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Wed Nov 19 14:40:42 2008
@@ -37,7 +37,7 @@
 import org.apache.cocoon.environment.Session;
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.Machine;
-import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserReference;
 import org.apache.lenya.cms.publication.URLInformation;
 import org.apache.lenya.cms.usecase.Usecase;
 import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
@@ -88,7 +88,7 @@
             if (session != null) {
                 Identity identity = (Identity) session.getAttribute(Identity.class.getName());
                 if (identity != null) {
-                    User user = identity.getUser();
+                    UserReference user = identity.getUserReference();
                     if (user != null) {
                         userId = user.getId();
                         objects.put(UsecaseCronJob.USER_ID, userId);