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:39:26 UTC
svn commit: r719106 - in
/lenya/sandbox/access_control_redesign/src/modules-core/acusecases:
java/src/org/apache/lenya/cms/ac/usecases/Login.java
java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java usecases/login.jx
Author: andreas
Date: Wed Nov 19 14:39:26 2008
New Revision: 719106
URL: http://svn.apache.org/viewvc?rev=719106&view=rev
Log:
Committing changes to acusecases module.
Modified:
lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java
lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java
lenya/sandbox/access_control_redesign/src/modules-core/acusecases/usecases/login.jx
Modified: lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java?rev=719106&r1=719105&r2=719106&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java Wed Nov 19 14:39:26 2008
@@ -23,6 +23,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.lenya.ac.Identity;
+import org.apache.lenya.ac.UserReference;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationUtil;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -39,7 +40,7 @@
protected static final String USERNAME = "username";
protected static final String REFERRER_QUERY_STRING = "referrerQueryString";
protected static final String PUBLICATION = "publication";
- protected static final String CURRENT_USER = "currentUser";
+ protected static final String CURRENT_USER_ID = "currentUserId";
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
@@ -56,8 +57,11 @@
setParameter(PUBLICATION, publication);
}
Identity identity = this.getSession().getIdentity();
- if (identity != null && identity.getUser() != null) {
- setParameter(CURRENT_USER, this.getSession().getIdentity().getUser());
+ if (identity != null) {
+ UserReference ref = identity.getUserReference();
+ if (ref != null) {
+ setParameter(CURRENT_USER_ID, ref.getId());
+ }
}
} catch (Exception e) {
throw new RuntimeException(e);
@@ -93,9 +97,9 @@
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
*/
protected void doCheckExecutionConditions() throws Exception {
-
+
validate();
-
+
if (!hasErrors()) {
Map objectModel = ContextHelper.getObjectModel(getContext());
Request request = ObjectModelHelper.getRequest(objectModel);
Modified: lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java?rev=719106&r1=719105&r2=719106&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/acusecases/java/test/org/apache/lenya/cms/ac/usecases/LoginTest.java Wed Nov 19 14:39:26 2008
@@ -23,7 +23,7 @@
import org.apache.cocoon.environment.Session;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Identity;
-import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserReference;
import org.apache.lenya.cms.usecase.AbstractUsecaseTest;
/**
@@ -52,7 +52,7 @@
protected void checkPostconditions() {
Session session = getRequest().getSession();
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
- User user = identity.getUser();
+ UserReference user = identity.getUserReference();
assertNotNull(user);
assertEquals(user.getId(), USER_ID);
}
Modified: lenya/sandbox/access_control_redesign/src/modules-core/acusecases/usecases/login.jx
URL: http://svn.apache.org/viewvc/lenya/sandbox/access_control_redesign/src/modules-core/acusecases/usecases/login.jx?rev=719106&r1=719105&r2=719106&view=diff
==============================================================================
--- lenya/sandbox/access_control_redesign/src/modules-core/acusecases/usecases/login.jx (original)
+++ lenya/sandbox/access_control_redesign/src/modules-core/acusecases/usecases/login.jx Wed Nov 19 14:39:26 2008
@@ -27,7 +27,7 @@
<page:title>
<jx:choose>
- <jx:when test="${usecase.getParameter('currentUser') != null}">
+ <jx:when test="${usecase.getParameter('currentUserId') != null}">
<i18n:text>Access Denied</i18n:text>
</jx:when>
<jx:otherwise>
@@ -39,7 +39,7 @@
</jx:choose>
</page:title>
<page:body>
- <jx:if test="${usecase.getParameter('currentUser') != null}">
+ <jx:if test="${usecase.getParameter('currentUserId') != null}">
<div class="lenya-box">
<div class="lenya-box-title">
<i18n:text>Access Denied</i18n:text>
@@ -47,7 +47,7 @@
<div class="lenya-box-body">
<i18n:translate>
<i18n:text i18n:key="user-not-authorized"/>
- <i18n:param><jx:out value="${usecase.getParameter('currentUser').getId()}"/></i18n:param>
+ <i18n:param><jx:out value="${usecase.getParameter('currentUserId')}"/></i18n:param>
<i18n:param><jx:out value="${request.getRequestURI()}"/></i18n:param>
</i18n:translate>
<br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org