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 2003/11/13 17:20:09 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/util session-attributes.xsp
andreas 2003/11/13 08:20:09
Modified: src/webapp/lenya/content/info access-control.xsp ac-live.xsp
src/webapp/lenya/content/authoring parent-child.xsp
src/webapp/lenya/content/ac passwd.js login.xsp logout.xsp
src/webapp/lenya/content/util session-attributes.xsp
Log:
refactoring access control package structure
Revision Changes Path
1.2 +8 -8 cocoon-lenya/src/webapp/lenya/content/info/access-control.xsp
Index: access-control.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/access-control.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- access-control.xsp 20 Aug 2003 18:58:29 -0000 1.1
+++ access-control.xsp 13 Nov 2003 16:20:08 -0000 1.2
@@ -16,14 +16,14 @@
<xsp:structure>
<xsp:include>java.io.IOException</xsp:include>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Item</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.ItemManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Role</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.RoleManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.Accreditable</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.Credential</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.xsp.PolicyHelper</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.xsp.CredentialWrapper</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Item</xsp:include>
+ <xsp:include>org.apache.lenya.ac.ItemManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Role</xsp:include>
+ <xsp:include>org.apache.lenya.ac.RoleManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Accreditable</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Credential</xsp:include>
+ <xsp:include>org.apache.lenya.cms.ac.cocoon.PolicyHelper</xsp:include>
+ <xsp:include>org.apache.lenya.cms.ac.cocoon.CredentialWrapper</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
<xsp:include>org.apache.lenya.xml.DocumentHelper</xsp:include>
</xsp:structure>
1.2 +8 -8 cocoon-lenya/src/webapp/lenya/content/info/ac-live.xsp
Index: ac-live.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/ac-live.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ac-live.xsp 11 Aug 2003 13:30:38 -0000 1.1
+++ ac-live.xsp 13 Nov 2003 16:20:08 -0000 1.2
@@ -16,14 +16,14 @@
<xsp:structure>
<xsp:include>java.io.IOException</xsp:include>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Item</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.ItemManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Role</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.RoleManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.Accreditable</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.Credential</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.xsp.PolicyHelper</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac2.xsp.CredentialWrapper</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Item</xsp:include>
+ <xsp:include>org.apache.lenya.ac.ItemManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Role</xsp:include>
+ <xsp:include>org.apache.lenya.ac.RoleManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Accreditable</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Credential</xsp:include>
+ <xsp:include>org.apache.lenya.cms.ac.cocoon.PolicyHelper</xsp:include>
+ <xsp:include>org.apache.lenya.cms.ac.cocoon.CredentialWrapper</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
<xsp:include>org.apache.lenya.xml.DocumentHelper</xsp:include>
</xsp:structure>
1.7 +1 -1 cocoon-lenya/src/webapp/lenya/content/authoring/parent-child.xsp
Index: parent-child.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/authoring/parent-child.xsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- parent-child.xsp 23 Jul 2003 13:21:48 -0000 1.6
+++ parent-child.xsp 13 Nov 2003 16:20:08 -0000 1.7
@@ -7,7 +7,7 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Identity</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Identity</xsp:include>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
</xsp:structure>
1.9 +2 -2 cocoon-lenya/src/webapp/lenya/content/ac/passwd.js
Index: passwd.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/ac/passwd.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- passwd.js 25 Apr 2003 10:36:10 -0000 1.8
+++ passwd.js 13 Nov 2003 16:20:08 -0000 1.9
@@ -18,9 +18,9 @@
var sitemapPath = resolver.resolve("").getSystemId().substring(5);
var session = cocoon.request.getSession(false);
var authenticatorId = session.getAttribute("org.apache.lenya.cms.cocoon.acting.Authenticator.id");
- var identityFromSession = session.getAttribute("org.apache.lenya.cms.ac.Identity");
+ var identityFromSession = session.getAttribute("org.apache.lenya.ac.Identity");
var filename = sitemapPath + "pubs/" + authenticatorId + "/config/ac/passwd/" + identityFromSession.getUsername() + ".iml";
- var identity = new Packages.org.apache.lenya.cms.ac.Identity(filename);
+ var identity = new Packages.org.apache.lenya.ac.Identity(filename);
if (identity.changePassword(oldpassword, newpassword, confirmednewpassword)) {
identity.writeDocument(filename);
break;
1.8 +1 -1 cocoon-lenya/src/webapp/lenya/content/ac/login.xsp
Index: login.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/ac/login.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- login.xsp 23 Jul 2003 13:21:45 -0000 1.7
+++ login.xsp 13 Nov 2003 16:20:08 -0000 1.8
@@ -8,7 +8,7 @@
<xsp:structure>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Identity</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Identity</xsp:include>
</xsp:structure>
<page>
1.8 +1 -1 cocoon-lenya/src/webapp/lenya/content/ac/logout.xsp
Index: logout.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/ac/logout.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logout.xsp 18 Jul 2003 17:03:24 -0000 1.7
+++ logout.xsp 13 Nov 2003 16:20:08 -0000 1.8
@@ -18,7 +18,7 @@
<xsp:logic>
Session session = request.getSession(false);
if(session != null){
- session.removeAttribute("org.apache.lenya.cms.ac2.Identity");
+ session.removeAttribute("org.apache.lenya.ac.Identity");
Vector history = (Vector) session.getAttribute("org.apache.lenya.cms.cocoon.acting.History");
if (history != null) {
for (int i = 0; i < history.size(); i++) {
1.8 +2 -2 cocoon-lenya/src/webapp/lenya/content/util/session-attributes.xsp
Index: session-attributes.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/util/session-attributes.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- session-attributes.xsp 23 Jul 2003 13:21:36 -0000 1.7
+++ session-attributes.xsp 13 Nov 2003 16:20:09 -0000 1.8
@@ -12,7 +12,7 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Identity</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Identity</xsp:include>
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
</xsp:structure>
@@ -54,7 +54,7 @@
String sitemap_uri=request.getSitemapURI();
String prefix=request_uri.substring(0,request_uri.length()-sitemap_uri.length()-1);
if(session != null){
- id=(Identity)session.getAttribute("org.apache.lenya.cms.ac.Identity");
+ id=(Identity)session.getAttribute("org.apache.lenya.ac.Identity");
if(id != null){
<xsp:content><session:current_username><xsp:expr>id.getUsername()</xsp:expr></session:current_username></xsp:content>
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org