You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/03/04 19:35:09 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content about.xml
gregor 2004/03/04 10:35:09
Modified: src/webapp/WEB-INF cocoon-xconf.xsl
src/webapp/lenya/content/info assets.xsp access-control.xsp
meta.xsp overview.xsp revisions.xsp
src/webapp/lenya/config/parameters default.xsp
src/webapp/lenya/content/ac login.xsp
src/webapp/lenya/content/admin/groups overview.xsp
groups.xsp
src/webapp/lenya/content/admin/ipranges overview.xsp
ipranges.xsp
src/webapp/lenya/content/admin/users overview.xsp users.xsp
src/webapp/lenya/content/menus admin.xsp live.xsp info.xsp
src/webapp/lenya/content about.xml
Removed: src/java/org/apache/lenya/cms/cocoon/logicsheets util.xsl
Log:
the lenya-util logicsheet is no more.
Revision Changes Path
1.41 +1 -7 cocoon-lenya/src/webapp/WEB-INF/cocoon-xconf.xsl
Index: cocoon-xconf.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/WEB-INF/cocoon-xconf.xsl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cocoon-xconf.xsl 23 Feb 2004 06:40:39 -0000 1.40
+++ cocoon-xconf.xsl 4 Mar 2004 18:35:08 -0000 1.41
@@ -21,13 +21,7 @@
<xsl:apply-templates/>
<xsl:comment>Lenya Logicsheets</xsl:comment>
-
- <builtin-logicsheet>
- <parameter name="prefix" value="xsp-lenya"/>
- <parameter name="uri" value="http://apache.org/cocoon/lenya/xsp/1.0"/>
- <parameter name="href" value="resource://org/apache/lenya/cms/cocoon/logicsheets/util.xsl"/>
- </builtin-logicsheet>
-
+
<builtin-logicsheet>
<parameter name="prefix" value="xsp-scheduler"/>
<parameter name="uri" value="http://apache.org/cocoon/lenya/xsp/scheduler/1.0"/>
1.7 +0 -1 cocoon-lenya/src/webapp/lenya/content/info/assets.xsp
Index: assets.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/assets.xsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- assets.xsp 14 Feb 2004 14:56:15 -0000 1.6
+++ assets.xsp 4 Mar 2004 18:35:08 -0000 1.7
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:lenya-info="http://apache.org/cocoon/lenya/info/1.0"
xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
1.6 +1 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- access-control.xsp 29 Jan 2004 17:15:20 -0000 1.5
+++ access-control.xsp 4 Mar 2004 18:35:08 -0000 1.6
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:lenya-info="http://apache.org/cocoon/lenya/info/1.0"
xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
@@ -42,7 +41,7 @@
Role[] roles = roleManager.getRoles();
String visitorRole = "";
for (int i = 0; i < roles.length; i++) {
- if (roles[i].getId().equals("visitor") || roles[i].getId().equals("visit")) {
+ if (roles[i].getId().equals("visit")) {
visitorRole = roles[i].getId();
}
}
1.8 +0 -1 cocoon-lenya/src/webapp/lenya/content/info/meta.xsp
Index: meta.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/meta.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- meta.xsp 20 Feb 2004 16:37:11 -0000 1.7
+++ meta.xsp 4 Mar 2004 18:35:08 -0000 1.8
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:lenya-info="http://apache.org/cocoon/lenya/info/1.0"
xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
1.10 +0 -1 cocoon-lenya/src/webapp/lenya/content/info/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/overview.xsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- overview.xsp 5 Sep 2003 14:41:10 -0000 1.9
+++ overview.xsp 4 Mar 2004 18:35:08 -0000 1.10
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:lenya-info="http://apache.org/cocoon/lenya/info/1.0"
xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
1.4 +0 -1 cocoon-lenya/src/webapp/lenya/content/info/revisions.xsp
Index: revisions.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/revisions.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- revisions.xsp 25 Aug 2003 20:48:40 -0000 1.3
+++ revisions.xsp 4 Mar 2004 18:35:08 -0000 1.4
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:lenya-info="http://apache.org/cocoon/lenya/info/1.0"
xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
1.2 +0 -1 cocoon-lenya/src/webapp/lenya/config/parameters/default.xsp
Index: default.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/config/parameters/default.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.xsp 8 Jan 2004 15:49:12 -0000 1.1
+++ default.xsp 4 Mar 2004 18:35:09 -0000 1.2
@@ -5,7 +5,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
>
<parameter xmlns="http://apache.org/cocoon/lenya/uri-parameters/1.0"><xsp:expr>parameters.getParameter("value", "")</xsp:expr></parameter>
1.9 +0 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- login.xsp 13 Nov 2003 16:20:08 -0000 1.8
+++ login.xsp 4 Mar 2004 18:35:09 -0000 1.9
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
>
<xsp:structure>
1.5 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/groups/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/overview.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- overview.xsp 29 Jan 2004 17:15:18 -0000 1.4
+++ overview.xsp 4 Mar 2004 18:35:09 -0000 1.5
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
1.6 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/groups/groups.xsp
Index: groups.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/groups.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- groups.xsp 29 Jan 2004 17:15:18 -0000 1.5
+++ groups.xsp 4 Mar 2004 18:35:09 -0000 1.6
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
>
1.5 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/overview.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- overview.xsp 29 Jan 2004 17:15:18 -0000 1.4
+++ overview.xsp 4 Mar 2004 18:35:09 -0000 1.5
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
1.4 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/ipranges.xsp
Index: ipranges.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/ipranges.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ipranges.xsp 29 Jan 2004 17:15:18 -0000 1.3
+++ ipranges.xsp 4 Mar 2004 18:35:09 -0000 1.4
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
>
1.8 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/users/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/overview.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- overview.xsp 29 Jan 2004 17:15:19 -0000 1.7
+++ overview.xsp 4 Mar 2004 18:35:09 -0000 1.8
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
1.5 +0 -1 cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp
Index: users.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- users.xsp 29 Jan 2004 17:15:19 -0000 1.4
+++ users.xsp 4 Mar 2004 18:35:09 -0000 1.5
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:jpath="http://apache.org/xsp/jpath/1.0"
>
1.9 +0 -3 cocoon-lenya/src/webapp/lenya/content/menus/admin.xsp
Index: admin.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/menus/admin.xsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- admin.xsp 16 Feb 2004 18:28:58 -0000 1.8
+++ admin.xsp 4 Mar 2004 18:35:09 -0000 1.9
@@ -4,7 +4,6 @@
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
@@ -23,8 +22,6 @@
<menus>
<menu i18n:attr="name" name="File" label="File">
<block>
- <item><i18n:text>Passwd</i18n:text></item>
- <item><i18n:text>Switch User</i18n:text></item>
<item href="?lenya.usecase=logout&lenya.step=showscreen"><i18n:text>Logout</i18n:text></item>
</block>
</menu>
1.7 +6 -8 cocoon-lenya/src/webapp/lenya/content/menus/live.xsp
Index: live.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/menus/live.xsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- live.xsp 23 Jul 2003 13:21:50 -0000 1.6
+++ live.xsp 4 Mar 2004 18:35:09 -0000 1.7
@@ -3,20 +3,18 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
>
<menu>
<!-- Import Lenya Page Envelope -->
- <xsp-lenya:util/>
<url-info>
- <context-prefix><xsp-lenya:context-prefix/></context-prefix>
- <publication-id><xsp-lenya:publication-id/></publication-id>
- <area><xsp-lenya:area/></area>
- <document-id><xsp-lenya:document-id/></document-id>
- <servlet-context-path><xsp-lenya:servlet-context-path/></servlet-context-path>
- <publication><xsp-lenya:publication/></publication>
+ <context-prefix></context-prefix>
+ <publication-id></publication-id>
+ <area></area>
+ <document-id></document-id>
+ <servlet-context-path></servlet-context-path>
+ <publication></publication>
</url-info>
</menu>
1.16 +2 -14 cocoon-lenya/src/webapp/lenya/content/menus/info.xsp
Index: info.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/menus/info.xsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- info.xsp 5 Sep 2003 16:07:49 -0000 1.15
+++ info.xsp 4 Mar 2004 18:35:09 -0000 1.16
@@ -3,7 +3,6 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
@@ -16,8 +15,6 @@
<menu>
- <xsp-lenya:util/>
-
<xsp:logic>
Publication publication = (Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>;
</xsp:logic>
@@ -39,8 +36,6 @@
<menus>
<menu name="File" label="File">
<block>
- <item>Passwd</item>
- <item>Switch User</item>
<item><xsp:attribute name="href"><xsp-request:get-servlet-path/><xsp-request:get-context-path/>/logout</xsp:attribute>Logout</item>
</block>
</menu>
@@ -65,13 +60,6 @@
<item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=rename&lenya.step=showscreen</xsp:attribute>Rename</item>
<item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=up</xsp:attribute>Move Up</item>
<item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=down</xsp:attribute>Move Down</item>
-<!--
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=add-child&lenya.step=showscreen</xsp:attribute>Add Child Element</item>
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=add-sibling&lenya.step=showscreen</xsp:attribute>Insert New Document</item>
- </block>
- <block>
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=deleteTrash&lenya.step=showscreen</xsp:attribute>Delete Trash</item>
--->
</block>
</menu>
@@ -81,8 +69,8 @@
<item wf:event="delete"><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=delete&lenya.step=showscreen</xsp:attribute>Delete</item>
<item wf:event="archive"><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=archive&lenya.step=showscreen</xsp:attribute>Archive</item>
<item wf:event="restore"><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=restore&lenya.step=showscreen</xsp:attribute>Restore</item>
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=approval-submit&lenya.step=showscreen</xsp:attribute>Submit for Approval</item>
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=approval-reject&lenya.step=showscreen</xsp:attribute>Reject</item>
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=submit&lenya.step=showscreen</xsp:attribute>Submit for Approval</item>
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=reject&lenya.step=showscreen</xsp:attribute>Reject</item>
<item wf:event="deactivate"><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=deactivate&lenya.step=showscreen</xsp:attribute>Deactivate</item>
</block>
</menu>
1.4 +1 -1 cocoon-lenya/src/webapp/lenya/content/about.xml
Index: about.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/about.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- about.xml 8 Jan 2004 14:15:40 -0000 1.3
+++ about.xml 4 Mar 2004 18:35:09 -0000 1.4
@@ -13,7 +13,7 @@
Apache Lenya includes software developed by the <a href="http://www.apache.org/">Apache Software Foundation</a>,
<a href="http://w3c.org">W3C</a>, <br /><a href="http://dom4j.org">DOM4J</a>, and <a href="http://sf.net/projects/websphinx">WebSHPINX</a>.
<br /><br />
-Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved.
</p>
<form>
<input type="button" value="Back" onClick="history.go(-1)"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org