Author: nettings
Date: Mon Jan 14 13:54:33 2008
New Revision: 611947
URL: http://svn.apache.org/viewvc?rev=611947&view=rev
Log:
avoid stale continuation in aboutLenya usecase:
* don't create one in the first place
* cancel the usecase instead of invoking history/back
update 3rd party software credits and copyright notice
Modified:
lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf
lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx
lenya/trunk/src/webapp/lenya/content/about.xml
Modified: 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?rev=611947&r1=611946&r2=611947&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf (original)
+++ lenya/trunk/src/modules-core/administration/config/cocoon-xconf/usecase-admin-aboutLenya.xconf Mon Jan 14 13:54:33 2008
@@ -24,7 +24,7 @@
<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 uri="modules/administration/usecases/aboutLenya.jx" menu="true"/>
+ <view uri="modules/administration/usecases/aboutLenya.jx" menu="true" createContinuation="false"/>
</component-instance>
</xconf>
Modified: lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx?rev=611947&r1=611946&r2=611947&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/aboutLenya.jx Mon Jan 14 13:54:33 2008
@@ -24,7 +24,12 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
xmlns:ci="http://apache.org/cocoon/include/1.0"
>
+ <page:body>
+
+ <ci:include src="context://lenya/content/about.xml" select="/*/*/*"/>
- <ci:include src="context://lenya/content/about.xml" select="*/*"/>
-
-</page:page>
\ No newline at end of file
+ <form>
+ <input i18n:attr="value" type="submit" value="Back"/>
+ </form>
+ </page:body>
+</page:page>
Modified: lenya/trunk/src/webapp/lenya/content/about.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/content/about.xml?rev=611947&r1=611946&r2=611947&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/about.xml (original)
+++ lenya/trunk/src/webapp/lenya/content/about.xml Mon Jan 14 13:54:33 2008
@@ -30,18 +30,13 @@
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>.
+ Apache Lenya is based on <a href="cocoon.apache.org">Apache Cocoon</a>
+ and includes other free software developed by the
+ <a href="http://www.apache.org/">Apache Software Foundation</a> and
+ many others.
</p>
<p>
- Copyright (C) 2006 The Apache Software Foundation. All rights reserved.
+ Copyright (C) 2008 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>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.