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 2006/06/23 11:02:06 UTC
svn commit: r416646 - in /lenya/trunk/src:
java/org/apache/lenya/cms/editors/ java/org/apache/lenya/cms/editors/forms/
modules-core/editors/ modules-core/editors/config/
modules-core/editors/config/cocoon-xconf/ modules-core/editors/java/
modules-core/...
Author: andreas
Date: Fri Jun 23 02:02:03 2006
New Revision: 416646
URL: http://svn.apache.org/viewvc?rev=416646&view=rev
Log:
Moved editor usecases from core to editors module
Added:
lenya/trunk/src/modules-core/editors/
lenya/trunk/src/modules-core/editors/config/
lenya/trunk/src/modules-core/editors/config/cocoon-xconf/
lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-forms.xconf
- copied, changed from r416590, lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-forms.xconf
lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-oneform.xconf
- copied, changed from r416590, lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-oneform.xconf
lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit.xconf
- copied unchanged from r416590, lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit.xconf
lenya/trunk/src/modules-core/editors/java/
lenya/trunk/src/modules-core/editors/java/src/
lenya/trunk/src/modules-core/editors/java/src/org/
lenya/trunk/src/modules-core/editors/java/src/org/apache/
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/EditDocument.java (props changed)
- copied unchanged from r416590, lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java (props changed)
- copied unchanged from r416590, lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/
- copied from r416590, lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/
lenya/trunk/src/modules-core/editors/module.xml
lenya/trunk/src/modules-core/editors/sitemap.xmap
lenya/trunk/src/modules-core/editors/usecases/
lenya/trunk/src/modules-core/editors/usecases/forms/
- copied from r416590, lenya/trunk/src/webapp/lenya/usecases/edit/forms/
lenya/trunk/src/pubs/default/lenya/modules/editors/
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/homepage.xsl
- copied unchanged from r416590, lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/homepage.xsl
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/links.xsl (props changed)
- copied unchanged from r416590, lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/links.xsl
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml-common.xsl
- copied unchanged from r416590, lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml-common.xsl
lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml.xsl
- copied, changed from r416590, lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml.xsl
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java
lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/
lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/homepage.xsl
lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/links.xsl
lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml-common.xsl
lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml.xsl
lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-forms.xconf
lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-oneform.xconf
lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit.xconf
lenya/trunk/src/webapp/lenya/usecases/edit/forms/
lenya/trunk/src/webapp/lenya/usecases/edit/usecase.xmap
Modified:
lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
lenya/trunk/src/modules-core/editors/usecases/forms/forms.jx
lenya/trunk/src/modules-core/editors/usecases/forms/oneform.jx
Copied: lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-forms.xconf (from r416590, lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-forms.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-forms.xconf?p2=lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-forms.xconf&p1=lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-forms.xconf&r1=416590&r2=416646&rev=416646&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-forms.xconf (original)
+++ lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-forms.xconf Fri Jun 23 02:02:03 2006
@@ -24,7 +24,7 @@
<component-instance name="edit.forms" logger="lenya.publication"
class="org.apache.lenya.cms.editors.forms.FormsEditor">
<transaction policy="pessimistic"/>
- <view template="usecases/edit/forms/forms.jx" menu="false"/>
+ <view template="modules/editors/usecases/forms/forms.jx" menu="false"/>
<exit usecase="lucene.index">
<parameter name="indexAction" value="index"/>
<parameter name="indexArea" value="authoring"/>
Copied: lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-oneform.xconf (from r416590, lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-oneform.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-oneform.xconf?p2=lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-oneform.xconf&p1=lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-oneform.xconf&r1=416590&r2=416646&rev=416646&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/cocoon-xconf/usecases/edit/usecase-edit-oneform.xconf (original)
+++ lenya/trunk/src/modules-core/editors/config/cocoon-xconf/usecase-edit-oneform.xconf Fri Jun 23 02:02:03 2006
@@ -24,7 +24,7 @@
<component-instance name="edit.oneform" logger="lenya.publication"
class="org.apache.lenya.cms.editors.forms.OneFormEditor">
<transaction policy="pessimistic"/>
- <view template="usecases/edit/forms/oneform.jx" menu="false"/>
+ <view template="modules/editors/usecases/forms/oneform.jx" menu="false"/>
<exit usecase="lucene.index">
<parameter name="indexAction" value="index"/>
<parameter name="indexArea" value="authoring"/>
Propchange: lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/EditDocument.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/EditDocument.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java?rev=416646&r1=416590&r2=416646&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java (original)
+++ lenya/trunk/src/modules-core/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java Fri Jun 23 02:02:03 2006
@@ -129,8 +129,8 @@
public void advance() throws UsecaseException {
super.advance();
- String unnumberTagsXslUri = "context://lenya/usecases/edit/forms/unnumberTags.xsl";
- String numberTagsXslUri = "context://lenya/usecases/edit/forms/numberTags.xsl";
+ String unnumberTagsXslUri = "fallback://lenya/modules/editors/usecases/forms/unnumberTags.xsl";
+ String numberTagsXslUri = "fallback://lenya/modules/editors/usecases/forms/numberTags.xsl";
ModifiableSource xmlSource = null;
Source schemaSource = null;
Added: lenya/trunk/src/modules-core/editors/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/module.xml?rev=416646&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/editors/module.xml (added)
+++ lenya/trunk/src/modules-core/editors/module.xml Fri Jun 23 02:02:03 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed 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: publication.xml 374687 2006-02-03 15:24:55Z michi $ -->
+
+<module xmlns="http://apache.org/lenya/module/1.0">
+ <id>org.apache.lenya.modules.editors</id>
+ <depends module="org.apache.lenya.modules.repository"/>
+ <package>org.apache.lenya.modules.editors</package>
+ <version>0.1-dev</version>
+ <name>Editors</name>
+ <lenya-version>@lenya.version@</lenya-version>
+ <description>Editor base and support classes</description>
+</module>
Added: lenya/trunk/src/modules-core/editors/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/sitemap.xmap?rev=416646&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/editors/sitemap.xmap (added)
+++ lenya/trunk/src/modules-core/editors/sitemap.xmap Fri Jun 23 02:02:03 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed 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$ -->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <!-- =========================== Components ================================ -->
+ <map:components/>
+ <!-- =========================== Pipelines ================================ -->
+ <map:pipelines>
+
+ <map:component-configurations>
+ <global-variables>
+ <!-- To access core resources -->
+ <basedir>../..</basedir>
+ </global-variables>
+ </map:component-configurations>
+
+ <map:pipeline>
+ <map:match pattern="form/*/**">
+ <map:generate src="lenya://lenya/pubs/{page-envelope:publication-id}/content/authoring/{page-envelope:document-path}"/>
+ <map:select type="parameter">
+ <map:parameter name="parameter-selector-test" value="{request-param:lenya.continutation}"/>
+ <map:when test="">
+ <map:transform src="fallback://lenya/modules/editors/usecases/forms/numberTags.xsl"/>
+ </map:when>
+ </map:select>
+ <map:transform src="fallback://lenya/modules/editors/usecases/forms/{1}.xsl">
+ <map:parameter name="docid" value="{page-envelope:document-path}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-name}"/>
+ <map:parameter name="form" value="{1}"/>
+ </map:transform>
+ <map:transform src="fallback://lenya/modules/editors/usecases/forms/form-layout.xsl">
+ <map:parameter name="contextPrefix" value="{page-envelope:context-prefix}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-name}"/>
+ <map:parameter name="wfevent" value="{request-param:lenya.event}"/>
+<!-- <map:parameter name="edit" value="{flow-attribute:usecase/parameter[@name = 'editSelect']}"/> -->
+ <map:parameter name="edit" value="{2}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="oneform">
+ <map:generate src="lenya://lenya/pubs/{page-envelope:publication-id}/content/authoring/{page-envelope:document-path}"/>
+ <map:transform src="fallback://lenya/modules/editors/usecases/forms/oneform.xsl">
+ <map:parameter name="docid" value="{page-envelope:document-id}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ </map:pipeline>
+
+ </map:pipelines>
+
+</map:sitemap>
Modified: lenya/trunk/src/modules-core/editors/usecases/forms/forms.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/usecases/forms/forms.jx?rev=416646&r1=416590&r2=416646&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/editors/usecases/forms/forms.jx (original)
+++ lenya/trunk/src/modules-core/editors/usecases/forms/forms.jx Fri Jun 23 02:02:03 2006
@@ -67,7 +67,7 @@
</div>
<cinclude:includexml>
- <cinclude:src>cocoon://core/edit/form/<jx:out value="${usecase.getParameter('form')}"/>/<jx:out value="${usecase.getParameter('editSelect')}"/></cinclude:src>
+ <cinclude:src>cocoon://modules/editors/form/<jx:out value="${usecase.getParameter('form')}"/>/<jx:out value="${usecase.getParameter('editSelect')}"/></cinclude:src>
</cinclude:includexml>
</jx:when>
<jx:otherwise>
Modified: lenya/trunk/src/modules-core/editors/usecases/forms/oneform.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/editors/usecases/forms/oneform.jx?rev=416646&r1=416590&r2=416646&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/editors/usecases/forms/oneform.jx (original)
+++ lenya/trunk/src/modules-core/editors/usecases/forms/oneform.jx Fri Jun 23 02:02:03 2006
@@ -59,7 +59,7 @@
</div>
<cinclude:includexml>
- <cinclude:src>cocoon://core/edit/oneform</cinclude:src>
+ <cinclude:src>cocoon://modules/editors/oneform</cinclude:src>
</cinclude:includexml>
</jx:when>
<jx:otherwise>
Propchange: lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/links.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/links.xsl
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml.xsl (from r416590, lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml.xsl)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml.xsl?p2=lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml.xsl&p1=lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml.xsl&r1=416590&r2=416646&rev=416646&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/lenya/usecases/edit/forms/xhtml.xsl (original)
+++ lenya/trunk/src/pubs/default/lenya/modules/editors/usecases/forms/xhtml.xsl Fri Jun 23 02:02:03 2006
@@ -24,7 +24,7 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"
>
-<xsl:import href="../../../../../../usecases/edit/forms/form.xsl"/>
+<xsl:import href="../../../../../../../modules/editors/usecases/forms/form.xsl"/>
<xsl:import href="xhtml-common.xsl"/>
<xsl:template match="xhtml:html">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org