You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/04/12 14:54:41 UTC
svn commit: r527913 - in /lenya/branches/trunk-rework-pubconf/src:
impl/test/org/apache/lenya/cms/publication/util/
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publication/util/
java/org/apache/lenya/cms/site/simple/ modules/collec...
Author: nettings
Date: Thu Apr 12 05:54:17 2007
New Revision: 527913
URL: http://svn.apache.org/viewvc?view=rev&rev=527913
Log:
re-synced to trunk
Added:
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/
- copied from r527902, lenya/trunk/src/modules/collection/java/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/org/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/lenya/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/lenya/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/lenya/modules/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/lenya/modules/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/lenya/modules/collection/
- copied from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/lenya/modules/collection/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/lenya/modules/collection/Collection.java
- copied unchanged from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/lenya/modules/collection/Collection.java
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java
- copied unchanged from r527902, lenya/trunk/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/org/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/apache/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/org/apache/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/apache/lenya/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/org/apache/lenya/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/apache/lenya/modules/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/apache/lenya/modules/collection/
- copied from r527902, lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/
lenya/branches/trunk-rework-pubconf/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java
- copied unchanged from r527902, lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java
lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/prepareCinclude.xsl
- copied unchanged from r527902, lenya/trunk/src/modules/collection/xslt/prepareCinclude.xsl
lenya/branches/trunk-rework-pubconf/src/modules/contactform/resources/
- copied from r527902, lenya/trunk/src/modules/contactform/resources/
lenya/branches/trunk-rework-pubconf/src/modules/contactform/resources/i18n/
- copied from r527902, lenya/trunk/src/modules/contactform/resources/i18n/
lenya/branches/trunk-rework-pubconf/src/modules/contactform/resources/i18n/cmsui.xml
- copied unchanged from r527902, lenya/trunk/src/modules/contactform/resources/i18n/cmsui.xml
lenya/branches/trunk-rework-pubconf/src/modules/contactform/resources/i18n/cmsui_de.xml
- copied unchanged from r527902, lenya/trunk/src/modules/contactform/resources/i18n/cmsui_de.xml
lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/usecase-news-edit.xconf
- copied unchanged from r527902, lenya/trunk/src/modules/news/config/cocoon-xconf/usecase-news-edit.xconf
lenya/branches/trunk-rework-pubconf/src/modules/news/java/
- copied from r527902, lenya/trunk/src/modules/news/java/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/
- copied from r527902, lenya/trunk/src/modules/news/java/src/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/apache/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/modules/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/modules/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/modules/news/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/modules/news/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/modules/news/NewsWrapper.java
- copied unchanged from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/modules/news/NewsWrapper.java
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/
- copied from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/
lenya/branches/trunk-rework-pubconf/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
- copied unchanged from r527902, lenya/trunk/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
lenya/branches/trunk-rework-pubconf/src/modules/news/samples/
- copied from r527902, lenya/trunk/src/modules/news/samples/
lenya/branches/trunk-rework-pubconf/src/modules/news/samples/news.xml
- copied unchanged from r527902, lenya/trunk/src/modules/news/samples/news.xml
lenya/branches/trunk-rework-pubconf/src/modules/news/usecases/
- copied from r527902, lenya/trunk/src/modules/news/usecases/
lenya/branches/trunk-rework-pubconf/src/modules/news/usecases/edit.jx
- copied unchanged from r527902, lenya/trunk/src/modules/news/usecases/edit.jx
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/
- copied from r527902, lenya/trunk/src/modules/simplesite/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/config/
- copied from r527902, lenya/trunk/src/modules/simplesite/config/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/config/cocoon-xconf/
- copied from r527902, lenya/trunk/src/modules/simplesite/config/cocoon-xconf/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/config/cocoon-xconf/site-managers.xconf
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/config/cocoon-xconf/site-managers.xconf
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/
- copied from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/DocumentStore.java
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/DocumentStore.java
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleLink.java
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleLink.java
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleSiteManager.java
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleSiteManager.java
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleSiteNode.java
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/java/src/org/apache/lenya/cms/site/simple/SimpleSiteNode.java
lenya/branches/trunk-rework-pubconf/src/modules/simplesite/module.xml
- copied unchanged from r527902, lenya/trunk/src/modules/simplesite/module.xml
Removed:
lenya/branches/trunk-rework-pubconf/src/impl/test/org/apache/lenya/cms/publication/util/XLinkCollectionTest.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/util/Collection.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/util/CollectionImpl.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/util/XlinkCollection.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/site/simple/DocumentStore.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/site/simple/DocumentStoreFactory.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/site/simple/SimpleSiteManager.java
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/site/simple/SimpleSiteNode.java
lenya/branches/trunk-rework-pubconf/src/modules/jackrabbit/
lenya/branches/trunk-rework-pubconf/src/modules/jcr/
lenya/branches/trunk-rework-pubconf/src/modules/repository/
Modified:
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/branches/trunk-rework-pubconf/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf
lenya/branches/trunk-rework-pubconf/src/modules/collection/module.xml
lenya/branches/trunk-rework-pubconf/src/modules/collection/sitemap.xmap
lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/collection2cinclude.xsl
lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/sitetree2children.xsl
lenya/branches/trunk-rework-pubconf/src/modules/contactform/config/menu.xsp
lenya/branches/trunk-rework-pubconf/src/modules/editors/usecases/forms/oneform.jx
lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/README.txt
lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
lenya/branches/trunk-rework-pubconf/src/modules/news/config/menu.xsp
lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui.xml
lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui_de.xml
lenya/branches/trunk-rework-pubconf/src/modules/news/sitemap.xmap
lenya/branches/trunk-rework-pubconf/src/modules/news/xslt/collection2include.xsl
lenya/branches/trunk-rework-pubconf/src/modules/notification/usecases/messageList.jx
lenya/branches/trunk-rework-pubconf/src/modules/tinymce/README
lenya/branches/trunk-rework-pubconf/src/modules/tinymce/resources/misc/download.xhtml
lenya/branches/trunk-rework-pubconf/src/modules/usecasedocument/sitemap.xmap
lenya/branches/trunk-rework-pubconf/src/pubs/blog/sitemap.xmap
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/ac/usecase-policies.xml
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf
lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_de
lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_en
lenya/branches/trunk-rework-pubconf/src/targets/modules-build.xml
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/misc/site-managers.xconf
Modified: lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/DocumentManager.java
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/DocumentManager.java?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/DocumentManager.java (original)
+++ lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/DocumentManager.java Thu Apr 12 05:54:17 2007
@@ -120,7 +120,6 @@
* @param contentSourceUri The URI to read the content from.
* @param pub The publication.
* @param area The area.
- * @param path The path.
* @param language The language.
* @param extension The extension to use for the document source, without the leading dot.
* @return The added document.
Modified: lenya/branches/trunk-rework-pubconf/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf Thu Apr 12 05:54:17 2007
@@ -25,6 +25,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<sample-name name="Manual">fallback://lenya/modules/collection/samples/collection.xml</sample-name>
<sample-name name="Children">fallback://lenya/modules/collection/samples/children.xml</sample-name>
+ <format name="collection" uri="cocoon://modules/collection/collection.xml"/>
</component-instance>
</xconf>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/collection/module.xml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/collection/module.xml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/collection/module.xml (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/collection/module.xml Thu Apr 12 05:54:17 2007
@@ -20,6 +20,7 @@
<module xmlns="http://apache.org/lenya/module/1.0">
<id>org.apache.lenya.modules.collection</id>
+ <export package="org.apache.lenya.modules.collection"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
<name>Collection</name>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/collection/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/collection/sitemap.xmap?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/collection/sitemap.xmap (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/collection/sitemap.xmap Thu Apr 12 05:54:17 2007
@@ -36,11 +36,13 @@
<map:transform src="fallback://lenya/modules/collection/xslt/sitetree2children.xsl">
<map:parameter name="language" value="{2}"/>
</map:transform>
+ <!--
<map:transform src="fallback://lenya/modules/collection/xslt/collection2cinclude.xsl">
<map:parameter name="uuid" value="{1}"/>
<map:parameter name="language" value="{2}"/>
</map:transform>
<map:transform type="cinclude"/>
+ -->
<map:serialize type="xml"/>
</map:match>
@@ -54,6 +56,17 @@
</map:generate>
<map:serialize type="xml"/>
</map:match>
+
+ <!-- collection format -->
+ <map:match pattern="collection.xml/*/*/*/*">
+ <map:generate src="lenya-document:{3},pub={1},area={2},lang={4}{link:rev}"/>
+ <map:transform src="fallback://lenya/modules/collection/xslt/prepareCinclude.xsl">
+ <map:parameter name="uuid" value="{3}"/>
+ <map:parameter name="language" value="{4}"/>
+ </map:transform>
+ <map:transform type="cinclude"/>
+ <map:serialize type="xml"/>
+ </map:match>
</map:pipeline>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/collection2cinclude.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/collection2cinclude.xsl?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/collection2cinclude.xsl (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/collection2cinclude.xsl Thu Apr 12 05:54:17 2007
@@ -9,18 +9,11 @@
<xsl:template match="col:collection">
- <xsl:choose>
- <xsl:when test="@type = 'children'">
- <ci:include src="cocoon://modules/collection/collectionWithChildren/{$uuid}/{$language}.xml"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <ci:include src="cocoon://modules/collection/metadata-{$uuid}.xml"/>
- <xsl:apply-templates select="col:document"/>
- </xsl:copy>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <ci:include src="cocoon://modules/collection/metadata-{$uuid}.xml"/>
+ <xsl:apply-templates select="col:document"/>
+ </xsl:copy>
</xsl:template>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/sitetree2children.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/sitetree2children.xsl?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/sitetree2children.xsl (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/collection/xslt/sitetree2children.xsl Thu Apr 12 05:54:17 2007
@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:site="http://apache.org/cocoon/lenya/sitetree/1.0"
xmlns:col="http://apache.org/cocoon/lenya/collection/1.0"
- xmlns:ci="http://apache.org/cocoon/include/1.0">
+ exclude-result-prefixes="site">
<xsl:param name="language"/>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/contactform/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/contactform/config/menu.xsp?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/contactform/config/menu.xsp (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/contactform/config/menu.xsp Thu Apr 12 05:54:17 2007
@@ -21,21 +21,12 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-request="http://apache.org/xsp/request/2.0"
- xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
>
- <xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- </xsp:structure>
-
<menu>
-
<menus>
<menu i18n:attr="name" name="File">
<block admin="false">
@@ -43,6 +34,6 @@
</block>
</menu>
</menus>
-
</menu>
+
</xsp:page>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/editors/usecases/forms/oneform.jx
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/editors/usecases/forms/oneform.jx?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/editors/usecases/forms/oneform.jx (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/editors/usecases/forms/oneform.jx Thu Apr 12 05:54:17 2007
@@ -24,7 +24,7 @@
xmlns:cinclude="http://apache.org/cocoon/include/1.0"
>
- <page:title><i18n:text>Edit</i18n:text></page:title>
+ <page:title><i18n:text>edit-news-properties</i18n:text></page:title>
<page:body>
<jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
@@ -94,13 +94,13 @@
</div>
<div>
- <input type="submit" value="Save" name="submit" />
- <input type="submit" value="Cancel" name="cancel" />
+ <input type="submit" value="Save" name="submit" i18n:attr="value"/>
+ <input type="submit" value="Cancel" name="cancel" i18n:attr="value"/>
</div>
</jx:when>
<jx:otherwise>
- <input type="submit" name="cancel" value="Cancel"/>
+ <input type="submit" name="cancel" value="Cancel" i18n:attr="value"/>
</jx:otherwise>
</jx:choose>
</form>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/README.txt
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/README.txt?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/README.txt (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/README.txt Thu Apr 12 05:54:17 2007
@@ -9,13 +9,13 @@
<module name="fckeditor"/>
4. make sure you have the appropriate usecase policies in
- <yourpub>/config/ac/usecase-policies.xconf. the following entry will allow
+ <yourpub>/config/ac/usecase-policies.xml. the following entry will allow
the "admin" and "edit" roles access to the usecase:
- <usecase id="edit.tinymce">
- <role id="admin"/>
- <role id="edit"/>
- </usecase>
+ <usecase id="fckeditor.edit">
+ <role id="admin" method="grant"/>
+ <role id="edit" method="grant"/>
+ </usecase>
or use the usecases option under the admin tab in lenya.
@@ -23,3 +23,4 @@
6. try to edit your document by clicking on "With FCKEditor" in the edit menu
+
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf Thu Apr 12 05:54:17 2007
@@ -27,7 +27,7 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="3600" />
- <sample-name>fallback://lenya/modules/collection/samples/children.xml</sample-name>
+ <sample-name>fallback://lenya/modules/news/samples/news.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/news/xhtml.xml"/>
<format name="include" uri="cocoon://modules/news/include.xml"/>
<format name="rss" uri="cocoon://modules/news/rss.xml"/>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/config/menu.xsp?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/config/menu.xsp (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/config/menu.xsp Thu Apr 12 05:54:17 2007
@@ -29,6 +29,10 @@
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
>
+ <xsp:structure>
+ <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
+ </xsp:structure>
+
<menu>
<menus>
<menu i18n:attr="name" name="File">
@@ -41,6 +45,26 @@
</item>
</block>
</menu>
+
+ <menu i18n:attr="name" name="Edit">
+ <xsp:logic>
+ try {
+ Object doc = <input:get-attribute module="page-envelope" as="object" name="document"/>;
+ if (doc instanceof Document && ((Document) doc).exists()) {
+ String doctype = <input:get-attribute module="page-envelope" as="string" name="document-type"/>;
+ if ("news".equals(doctype)) {
+ <block areas="authoring">
+ <item uc:usecase="news.edit" href="?"><i18n:text>news-settings</i18n:text></item>
+ </block>
+ }
+ }
+ }
+ catch (Exception e) {
+ throw new ProcessingException("Error during menu generation: ", e);
+ }
+ </xsp:logic>
+ </menu>
+
</menus>
</menu>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui.xml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui.xml (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui.xml Thu Apr 12 05:54:17 2007
@@ -21,5 +21,7 @@
<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml">
<message key="new-news-message-hint">To add a new news message, choose 'File' -> 'New XHTML Document'.</message>
+ <message key="news-settings">News Settings</message>
+ <message key="include-items">Number of items to display on overview page</message>
</catalogue>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui_de.xml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui_de.xml (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/resources/i18n/cmsui_de.xml Thu Apr 12 05:54:17 2007
@@ -24,5 +24,7 @@
Um eine neue News-Meldung zu erstellen,
wählen Sie 'Datei' -> 'Neues News-Dokument'.
</message>
+ <message key="news-settings">News-Einstellungen</message>
+ <message key="include-items">Anzahl der Meldungen, die auf der Ãbersicht dargestellt werden sollen</message>
</catalogue>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/sitemap.xmap?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/sitemap.xmap (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/sitemap.xmap Thu Apr 12 05:54:17 2007
@@ -46,7 +46,7 @@
</map:match>
<map:match pattern="*.xml/*/*/*/*">
- <map:generate src="lenya-document:{4},pub={2},area={3},lang={5}{link:rev}"/>
+ <map:generate src="{resource-type:collection:format-collection}/{2}/{3}/{4}/{5}"/>
<map:transform src="fallback://lenya/modules/collection/xslt/collection2cinclude.xsl">
<map:parameter name="uuid" value="{4}"/>
<map:parameter name="language" value="{5}"/>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/news/xslt/collection2include.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/news/xslt/collection2include.xsl?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/news/xslt/collection2include.xsl (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/news/xslt/collection2include.xsl Thu Apr 12 05:54:17 2007
@@ -37,6 +37,7 @@
<xsl:param name="language"/>
<xsl:param name="uuid"/>
+ <xsl:variable name="includeItems" select="/col:collection/@includeItems"/>
<xsl:template match="/col:collection">
<xsl:variable name="title" select="meta:metadata/dc:elements/dc:title"/>
@@ -45,11 +46,14 @@
<a type="application/rss+xml" href="lenya-document:{$uuid}?uuid2url.extension=rss">RSS 2.0</a>
</div>
<h1><xsl:value-of select="$title"/></h1>
- <xsl:apply-templates select="col:document">
+ <xsl:for-each select="col:document">
<xsl:sort order="descending" select="meta:metadata/dc:elements/dc:date"/>
- </xsl:apply-templates>
+ <xsl:if test="position() <= number($includeItems)">
+ <xsl:apply-templates select="."/>
+ </xsl:if>
+ </xsl:for-each>
</div>
</xsl:template>
-
+
</xsl:stylesheet>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/notification/usecases/messageList.jx
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/notification/usecases/messageList.jx?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/notification/usecases/messageList.jx (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/notification/usecases/messageList.jx Thu Apr 12 05:54:17 2007
@@ -30,6 +30,7 @@
<th style="text-align: left; padding-right: 20px;"><i18n:text>Sender</i18n:text></th>
<th style="text-align: left; padding-right: 20px;"><i18n:text>Date</i18n:text></th>
<th style="text-align: left; padding-right: 20px;"><i18n:text>Read</i18n:text></th>
+ <th> </th>
</tr>
<jx:forEach var="message" items="${inbox.getMessages()}">
@@ -57,6 +58,14 @@
</td>
<td style="text-align: center;">
<jx:if test="${message.isMarkedAsRead()}">✔</jx:if>
+ </td>
+ <td style="text-align: center;">
+ <form method="POST">
+ <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <input type="hidden" name="deleteMessageId" value="${message.getId()}"/>
+ <input type="submit" name="submit" value="Delete" i18n:attr="value"/>
+ </form>
</td>
</tr>
</jx:forEach>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/tinymce/README
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/tinymce/README?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/tinymce/README (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/tinymce/README Thu Apr 12 05:54:17 2007
@@ -16,7 +16,7 @@
- Add the appropriate permissions to
- $YOURPUB/config/ac/usecase-permissions.conf, for example:
+ $YOURPUB/config/ac/usecase-policies.xml, for example:
<usecase id="tinymce.edit">
<role id="admin" method="grant"/>
Modified: lenya/branches/trunk-rework-pubconf/src/modules/tinymce/resources/misc/download.xhtml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/tinymce/resources/misc/download.xhtml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/tinymce/resources/misc/download.xhtml (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/tinymce/resources/misc/download.xhtml Thu Apr 12 05:54:17 2007
@@ -32,7 +32,12 @@
Please <a href="http://tinymce.moxiecode.com/download.php">download the
TinyMCE editor from moxiecode.com</a>.<br />
Unpack the zip archive or tarball in your Lenya source tree under
- <code>$LENYA-SRC/src/modules/tinymce/resources</code>.<br />
+ <code>$LENYA-SRC/src/modules/tinymce/resources</code>. Alternatively, you can
+ install it $YOURPUB/lenya/modules/tinymce/resource (if you prefer not to have
+ external code in your Lenya source tree), since all calls to this code are
+ fallback-enabled.
+ </p>
+ <p>
By default, TinyMCE comes with an English localization only. If you prefer
another language, you can
<a href="http://tinymce.moxiecode.com/language.php">download additional
Modified: lenya/branches/trunk-rework-pubconf/src/modules/usecasedocument/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/usecasedocument/sitemap.xmap?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/modules/usecasedocument/sitemap.xmap (original)
+++ lenya/branches/trunk-rework-pubconf/src/modules/usecasedocument/sitemap.xmap Thu Apr 12 05:54:17 2007
@@ -62,7 +62,7 @@
<map:transform type="cinclude"/>
<map:transform type="forms" />
<map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"/>
+ <map:parameter name="locale" value="{page-envelope:document-language}"/>
</map:transform>
<map:transform src="cocoon://lenya-screen.xsl"/>
Modified: lenya/branches/trunk-rework-pubconf/src/pubs/blog/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/blog/sitemap.xmap?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/pubs/blog/sitemap.xmap (original)
+++ lenya/branches/trunk-rework-pubconf/src/pubs/blog/sitemap.xmap Thu Apr 12 05:54:17 2007
@@ -102,7 +102,7 @@
<map:transform src="fallback://lenya/xslt/rc/toDoc.xsl"/>
</map:when>
<map:otherwise>
- <map:generate src="site:/en/entries/{2}/{3}/{4}/{5}/index"/>
+ <map:generate src="site://{page-envelope:publication-id}/{1}/en/entries/{2}/{3}/{4}/{5}/index"/>
</map:otherwise>
</map:select>
<map:serialize type="xml"/>
@@ -116,7 +116,7 @@
<map:transform src="fallback://lenya/xslt/rc/toDoc.xsl"/>
</map:when>
<map:otherwise>
- <map:generate src="site:/en/entries/{2}/{3}/{4}/{5}/index"/>
+ <map:generate src="site://{page-envelope:publication-id}/{1}/en/entries/{2}/{3}/{4}/{5}/index"/>
<map:transform src="xslt/feed/atom2other.xsl">
<map:parameter name="type" value="rss"/>
<map:parameter name="url" value="{global:blog-url}"/>
Modified: lenya/branches/trunk-rework-pubconf/src/pubs/default/config/ac/usecase-policies.xml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/config/ac/usecase-policies.xml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/pubs/default/config/ac/usecase-policies.xml (original)
+++ lenya/branches/trunk-rework-pubconf/src/pubs/default/config/ac/usecase-policies.xml Thu Apr 12 05:54:17 2007
@@ -364,5 +364,8 @@
<usecase id="neutron.checkin">
<role id="edit" method="grant"/>
</usecase>
+ <usecase id="news.edit">
+ <role id="edit" method="grant"/>
+ </usecase>
</usecases>
Modified: lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf (original)
+++ lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf Thu Apr 12 05:54:17 2007
@@ -79,14 +79,16 @@
<module name="development"/>
<module name="languageselector"/>
<module name="administration"/>
- <module name="workflow"/>
<module name="news"/>
</modules>
+ <!-- TODO: The goal is to have a blog module ;-) -->
+ <!--
+ <module name="blog"/>
+ -->
<!-- You can specify a custom location for your content, outside the Lenya build tree. Note that you will probably also want
to specify custom locations for access control (see ac/ac.xconf), so that all your dynamically generated data is in one place
for easy backup. -->
-
<!--
Relative to webapp context:
<content-dir src="lenya/pubs/default"/>
Modified: lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_de
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_de?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_de (original)
+++ lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_de Thu Apr 12 05:54:17 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children"/>
+<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
Modified: lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_en
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_en?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_en (original)
+++ lenya/branches/trunk-rework-pubconf/src/pubs/default/example-content/news/index_en Thu Apr 12 05:54:17 2007
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children"/>
+<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
Modified: lenya/branches/trunk-rework-pubconf/src/targets/modules-build.xml
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/targets/modules-build.xml?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/targets/modules-build.xml (original)
+++ lenya/branches/trunk-rework-pubconf/src/targets/modules-build.xml Thu Apr 12 05:54:17 2007
@@ -85,13 +85,6 @@
<!-- Module tests -->
<!-- ================================================ -->
- <target name="copy-jackrabbit-module"
- description="Copy the jackrabbit module to the web application (necessary if modules.copy=false)">
- <copy todir="${build.webapp}/lenya/modules/jackrabbit/repository">
- <fileset dir="src/modules/jackrabbit/repository"/>
- </copy>
- </target>
-
<target name="prepare-module-test">
<xslt basedir="${build.dir}/temp"
includes="*.xconf"
@@ -104,7 +97,7 @@
file="${build.test}/org/apache/lenya/cms/LenyaTestCase.xtest"/>
</target>
- <target name="modules.test" depends="copy-jackrabbit-module, patch-modules-test">
+ <target name="modules.test" depends="patch-modules-test">
<ant antfile="${build.dir}/temp/modules-build.xml"
inheritall="true"
inheritrefs="true">
Modified: lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/misc/site-managers.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/misc/site-managers.xconf?view=diff&rev=527913&r1=527912&r2=527913
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/misc/site-managers.xconf (original)
+++ lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/misc/site-managers.xconf Thu Apr 12 05:54:17 2007
@@ -22,8 +22,5 @@
-->
<xconf xpath="/cocoon" unless="/cocoon/site-managers">
- <site-managers>
- <component-instance name="simple" logger="lenya.site"
- class="org.apache.lenya.cms.site.simple.SimpleSiteManager"/>
- </site-managers>
+ <site-managers/>
</xconf>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org