You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/11/19 23:38:57 UTC
svn commit: r719105 - in
/lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases:
ChangePassword.java SessionViewer.java Users.java
Author: andreas
Date: Wed Nov 19 14:38:57 2008
New Revision: 719105
URL: http://svn.apache.org/viewvc?rev=719105&view=rev
Log:
Committing changes to administration module.
Modified:
lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java
lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java
lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java
Modified: lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java?rev=719105&r1=719104&r2=719105&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ChangePassword.java Wed Nov 19 14:38:57 2008
@@ -30,7 +30,8 @@
* @return Always returns the currently logged in user.
*/
protected User getUser() {
- return getSession().getIdentity().getUser();
+ String id = getSession().getIdentity().getUserReference().getId();
+ return getUserManager().getUser(id);
}
/**
Modified: lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java?rev=719105&r1=719104&r2=719105&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java Wed Nov 19 14:38:57 2008
@@ -28,6 +28,7 @@
import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserReference;
import org.apache.lenya.cms.ac.usecases.AccessControlUsecase;
import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.modules.monitoring.SessionListener;
@@ -68,12 +69,13 @@
continue;
}
- User user = identity.getUser();
- if (user != null) {
+ UserReference ref = identity.getUserReference();
+ if (ref != null) {
+ User user = getUserManager().getUser(ref.getId());
Vector history = (Vector) nextsession.getAttribute(HISTORY);
String publicationID = getPublicationIDfromHistory(history);
if (publicationID.equals(getPublicationIDfromURL())) {
- userList.add(identity.getUser());
+ userList.add(user);
}
}
}
Modified: lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java?rev=719105&r1=719104&r2=719105&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java Wed Nov 19 14:38:57 2008
@@ -27,6 +27,7 @@
import org.apache.cocoon.environment.Session;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserReference;
import org.apache.lenya.ac.UserType;
/**
@@ -57,7 +58,10 @@
if (session != null) {
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
if (identity != null) {
- setParameter(CURRENT_USER, identity.getUser());
+ UserReference ref = identity.getUserReference();
+ if (ref != null) {
+ setParameter(CURRENT_USER, getUserManager().getUser(ref.getId()));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org