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 2007/05/25 10:52:07 UTC
svn commit: r541590 - in /lenya/trunk/src:
modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf
modules-core/administration/usecases/aboutLenya.jx
webapp/global-sitemap.xmap webapp/lenya/content/about.xml webapp/readme.xml
Author: andreas
Date: Fri May 25 01:52:05 2007
New Revision: 541590
URL: http://svn.apache.org/viewvc?view=rev&rev=541590
Log:
Converted 'About Lenya' page to usecase. This makes it independent from proxying. See bug 42050 for more information.
Added:
lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf
lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx
Modified:
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/content/about.xml
lenya/trunk/src/webapp/readme.xml
Added: lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf?view=auto&rev=541590
==============================================================================
--- lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf (added)
+++ lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf Fri May 25 01:52:05 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
+<!--
+ This file defines the publication specific use-cases
+-->
+
+<xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'admin.groups']">
+
+ <component-instance name="admin.aboutLenya" logger="lenya.admin" class="org.apache.lenya.cms.usecase.DummyUsecase">
+ <view template="modules/administration/usecases/aboutLenya.jx" menu="true"/>
+ </component-instance>
+
+</xconf>
Added: lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx?view=auto&rev=541590
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx (added)
+++ lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx Fri May 25 01:52:05 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id: addGroup.jx 496697 2007-01-16 14:12:36Z andreas $ -->
+
+<page:page
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ xmlns:ci="http://apache.org/cocoon/include/1.0"
+ >
+
+ <ci:include src="context://lenya/content/about.xml" select="*/*"/>
+
+</page:page>
\ No newline at end of file
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&rev=541590&r1=541589&r2=541590
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Fri May 25 01:52:05 2007
@@ -319,11 +319,6 @@
<map:call resource="style-cms-page"/>
<map:serialize />
</map:match>
- <map:match pattern="about.html">
- <map:generate src="lenya/content/about.xml"/>
- <map:call resource="style-cms-page"/>
- <map:serialize />
- </map:match>
<map:match pattern="*">
<map:redirect-to uri="index.html"/>
Modified: lenya/trunk/src/webapp/lenya/content/about.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/content/about.xml?view=diff&rev=541590&r1=541589&r2=541590
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/about.xml (original)
+++ lenya/trunk/src/webapp/lenya/content/about.xml Fri May 25 01:52:05 2007
@@ -20,31 +20,28 @@
<page:page
xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
- xmlns="http://www.w3.org/1999/xhtml">
- <page:title>Apache Lenya @lenya.version@ (Revision: @lenya.revision@)</page:title>
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ xmlns="http://www.w3.org/1999/xhtml"
+ >
<page:body>
- <div class="lenya-box">
- <div class="lenya-box-title">
- About Apache Lenya
- </div>
- <div class="lenya-box-body">
- <p>
- This software consists of voluntary contributions made by many individuals
- on behalf of the <br /><a href="http://www.apache.org/">Apache Software Foundation</a>.
- </p>
- <p>
- Apache Lenya includes software developed by the
- <a href="http://www.apache.org/">Apache Software Foundation</a>,
- <a href="http://w3c.org">W3C</a>, and
- <a href="http://sf.net/projects/websphinx">WebSPHINX</a>.
- </p>
- <p>
- Copyright (C) 2006 The Apache Software Foundation. All rights reserved.
- </p>
- <form id="form-about-back">
- <input type="button" value="Back" onClick="history.go(-1)" name="input-back"/>
- </form>
- </div>
- </div>
+ <h2>Apache Lenya @lenya.version@ (Revision: @lenya.revision@)</h2>
+ <p>
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the <br /><a href="http://www.apache.org/">Apache Software Foundation</a>.
+ </p>
+ <p>
+ Apache Lenya includes software developed by the
+ <a href="http://www.apache.org/">Apache Software Foundation</a>,
+ <a href="http://w3c.org">W3C</a>, and
+ <a href="http://sf.net/projects/websphinx">WebSPHINX</a>.
+ </p>
+ <p>
+ Copyright (C) 2006 The Apache Software Foundation. All rights reserved.
+ </p>
+ <form id="form-about-back">
+ <p>
+ <input type="button" value="Back" onClick="history.go(-1)" name="input-back" i18n:attr="value"/>
+ </p>
+ </form>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/readme.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/readme.xml?view=diff&rev=541590&r1=541589&r2=541590
==============================================================================
--- lenya/trunk/src/webapp/readme.xml (original)
+++ lenya/trunk/src/webapp/readme.xml Fri May 25 01:52:05 2007
@@ -35,6 +35,13 @@
<h2>Important notes for beta testers of Lenya 1.4-RC</h2>
+ <h3>2007-05-25: Converted "About Lenya" page to usecase</h3>
+ <p>
+ To enable the "About Lenya" usecase, please set the permissions for the <code>admin.aboutLenya</code>
+ usecase in your <code>config/access-control/usecase-policies.xml</code> file, or use the
+ tab "Usecases" in the administration GUI.
+ </p>
+
<h3>2007-05-08: Fixed <code>create-use-case</code> attribute</h3>
<p>
The value of the <code>create-use-case</code> attribute of the <code>user-type</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org