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:41:35 UTC
svn commit: r719108 - in
/lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases:
Create.java ForceCheckIn.java
Author: andreas
Date: Wed Nov 19 14:41:35 2008
New Revision: 719108
URL: http://svn.apache.org/viewvc?rev=719108&view=rev
Log:
Committing changes to sitemanagement module.
Modified:
lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
Modified: lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?rev=719108&r1=719107&r2=719108&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java Wed Nov 19 14:41:35 2008
@@ -30,7 +30,7 @@
import org.apache.cocoon.environment.Request;
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.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.cms.metadata.dublincore.DublinCore;
@@ -292,7 +292,7 @@
Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(false);
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
- User user = identity.getUser();
+ UserReference user = identity.getUserReference();
if (user != null) {
setDublinCoreParameter(DublinCore.ELEMENT_CREATOR, user.getId());
} else {
Modified: lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java?rev=719108&r1=719107&r2=719108&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java Wed Nov 19 14:41:35 2008
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpSession;
import org.apache.lenya.ac.Identity;
-import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserReference;
import org.apache.lenya.cms.metadata.dublincore.DublinCoreHelper;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.repository.Node;
@@ -59,7 +59,7 @@
Node node = getSourceDocument().getRepositoryNode();
if (node.isCheckedOut()) {
String userId = node.getCheckoutUserId();
- User currentUser = getSession().getIdentity().getUser();
+ UserReference currentUser = getSession().getIdentity().getUserReference();
if (currentUser == null || !userId.equals(currentUser.getId())) {
String[] params = { userId };
if (isLoggedIn(userId)) {
@@ -89,7 +89,7 @@
continue;
}
- User user = identity.getUser();
+ UserReference user = identity.getUserReference();
Vector history = (Vector) nextsession.getAttribute(HISTORY);
String publicationID = getPublicationIDfromHistory(history);
if (publicationID.equals(pubId) && user != null && user.getId().equals(userId)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org