svn commit: r520419 - in /lenya/trunk/src: modules/kupu/config/cocoon-xconf/usecase-kupu.xconf modules/kupu/sitemap.xmap modules/xhtml/config/menu.xsp pubs/default/config/ac/usecase-policies.xml pubs/default/modules/homepage/config/menus/homepage.xsp

Author: andreas
Date: Tue Mar 20 08:08:29 2007
New Revision: 520419

URL: http://svn.apache.org/viewvc?view=rev&rev=520419
Log:
Add usecase declaration for Kupu

Added:
    lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf
Modified:
    lenya/trunk/src/modules/kupu/sitemap.xmap
    lenya/trunk/src/modules/xhtml/config/menu.xsp
    lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml
    lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp

Added: lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf?view=auto&rev=520419
==============================================================================
--- lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf (added)
+++ lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf Tue Mar 
20 08:08:29 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+
+<!--
+    This file defines the publication specific use-cases
+-->
+
+  <xconf xpath="/cocoon/usecases" 
unless="/cocoon/usecases/component-instance[@name = 'kupu.edit']">
+    
+    <component-instance name="kupu.edit" logger="lenya.publication" 
+    class="org.apache.lenya.cms.workflow.usecases.CheckWorkflow">
+      <view uri="cocoon://modules/kupu/kupu.open" menu="false" 
createContinuation="false"/>
+      <event id="edit"/>
+    </component-instance>
+    
+  </xconf>

Modified: lenya/trunk/src/modules/kupu/sitemap.xmap
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/sitemap.xmap?view=diff&rev=520419&r1=520418&r2=520419
==============================================================================
--- lenya/trunk/src/modules/kupu/sitemap.xmap (original)
+++ lenya/trunk/src/modules/kupu/sitemap.xmap Tue Mar 20 08:08:29 2007
@@ -91,55 +91,55 @@
       </map:match>
     </map:pipeline>   
     
-    <map:pipeline>           
-        <map:match pattern="open" type="step">
-          <map:match pattern="*/authoring/**.html">
-            <!-- Check if Kupu is installed -->
-            <map:act type="resource-exists" 
-              
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html">
-              <map:act type="reserved-checkout">
-                <map:generate type="serverpages" 
-                  src="fallback://lenya/content/rc/{exception}.xsp">
-                  <map:parameter name="user" value="{user}"/>
-                  <map:parameter name="filename" value="{filename}"/>
-                  <map:parameter name="date" value="{date}"/>
-                  <map:parameter name="message" value="{message}"/>
-                </map:generate>
-                <map:transform 
src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
-                <map:call resource="style-cms-page"/>
-                <map:serialize />
-              </map:act>
-              <map:generate 
-                
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
-              <map:transform 
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/kupumacros.xsl">
-                <map:parameter name="contentfile" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=content"/>
-                <map:parameter name="context-prefix" 
value="{request:contextPath}/{page-envelope:publication-id}/modules/kupu"/>
-                <!-- Only used to display the document path of the edited doc  
-->
-                <map:parameter name="document-path" 
value="{page-envelope:document-path}"/>
-                <map:parameter name="save-destination" 
-                  value="{request:requestURI}"/>
-                <map:parameter name="exit-destination" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=exit"/>
-                <map:parameter name="reload-after-save" value="1"/>
-                <map:parameter name="use-css" value="1"/>
-                <map:parameter name="imagedrawer-xsl-uri" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=imagedrawerxsl"/>
-                <map:parameter name="linkdrawer-xsl-uri" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=linkdrawerxsl"/>
-                <map:parameter name="image-libraries-uri" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=image_libraries"/>
-                <map:parameter name="link-libraries-uri" 
-                  
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=link_libraries"/>
-              </map:transform>
-              <map:serialize type="xhtml"/>
-            </map:act>
-            <!-- If Kupu is not installed; Action failed -->
-            <map:generate 
src="fallback://lenya/resources/misc/kupu/download.xhtml"/>
+    <map:pipeline>
+      
+      <map:match pattern="kupu.open">
+        <!-- Check if Kupu is installed -->
+        <map:act type="resource-exists" 
+          
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html">
+          <map:act type="reserved-checkout">
+            <map:generate type="serverpages" 
+              src="fallback://lenya/content/rc/{exception}.xsp">
+              <map:parameter name="user" value="{user}"/>
+              <map:parameter name="filename" value="{filename}"/>
+              <map:parameter name="date" value="{date}"/>
+              <map:parameter name="message" value="{message}"/>
+            </map:generate>
+            <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
             <map:call resource="style-cms-page"/>
             <map:serialize />
-          </map:match>
-        </map:match>
+          </map:act>
+          <map:generate 
+            
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
+          <map:transform 
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/kupumacros.xsl">
+            <map:parameter name="contentfile" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=content"/>
+            <map:parameter name="context-prefix" 
value="{request:contextPath}/{page-envelope:publication-id}/modules/kupu"/>
+            <!-- Only used to display the document path of the edited doc  -->
+            <map:parameter name="document-path" 
value="{page-envelope:document-path}"/>
+            <map:parameter name="save-destination" 
+              value="{request:requestURI}?lenya.event=edit"/>
+            <map:parameter name="exit-destination" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=exit"/>
+            <map:parameter name="reload-after-save" value="1"/>
+            <map:parameter name="use-css" value="1"/>
+            <map:parameter name="imagedrawer-xsl-uri" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=imagedrawerxsl"/>
+            <map:parameter name="linkdrawer-xsl-uri" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=linkdrawerxsl"/>
+            <map:parameter name="image-libraries-uri" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=image_libraries"/>
+            <map:parameter name="link-libraries-uri" 
+              
value="{request:requestURI}?lenya.module=kupu&amp;lenya.step=link_libraries"/>
+          </map:transform>
+          <map:serialize type="xhtml"/>
+        </map:act>
+        <!-- If Kupu is not installed; Action failed -->
+        <map:generate 
src="fallback://lenya/resources/misc/kupu/download.xhtml"/>
+        <map:call resource="style-cms-page"/>
+        <map:serialize />
+      </map:match>
+        
         <!-- Requested by Kupu to load the document into the editor -->    
         <map:match pattern="content" type="step">
           <map:match pattern="*/authoring/**">

Modified: lenya/trunk/src/modules/xhtml/config/menu.xsp
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/config/menu.xsp?view=diff&rev=520419&r1=520418&r2=520419
==============================================================================
--- lenya/trunk/src/modules/xhtml/config/menu.xsp (original)
+++ lenya/trunk/src/modules/xhtml/config/menu.xsp Tue Mar 20 08:08:29 2007
@@ -39,8 +39,7 @@
     <menus>
       <menu i18n:attr="name" name="File">
         <block areas="site authoring">
-          <item uc:usecase="sitemanagement.create" href="?doctype=xhtml">
-            <i18n:translate>
+          <item uc:usecase="sitemanagement.create" 
href="?doctype=xhtml"><i18n:translate>
               <i18n:text>New Document</i18n:text>
               <i18n:param>XHTML</i18n:param>
             </i18n:translate>
@@ -56,10 +55,10 @@
                   String doctype = <input:get-attribute module="page-envelope" 
as="string" name="document-type"/>;
                   if ("xhtml".equals(doctype)) {
                       <block areas="authoring">
-                        <item wf:event="edit"><xsp:attribute 
name="href"><xsp:expr>"?lenya.module=kupu&amp;lenya.step=open"</xsp:expr></xsp:attribute><i18n:text>With
 Kupu</i18n:text></item>
-                        <item wf:event="edit" uc:usecase="bxe.edit" 
href="?"><i18n:text>With BXE</i18n:text></item>
-                        <item wf:event="edit" 
uc:usecase="editors.forms"><xsp:attribute name="href"><xsp:expr>"?form=" + 
doctype</xsp:expr></xsp:attribute><i18n:text>With Forms</i18n:text></item>
-                        <item wf:event="edit" uc:usecase="editors.oneform" 
href="?"><i18n:text>With one Form</i18n:text></item>
+                        <item uc:usecase="kupu.edit" href="?"><i18n:text>With 
Kupu</i18n:text></item>
+                        <item uc:usecase="bxe.edit" href="?"><i18n:text>With 
BXE</i18n:text></item>
+                        <item uc:usecase="editors.forms"><xsp:attribute 
name="href"><xsp:expr>"?form=" + 
doctype</xsp:expr></xsp:attribute><i18n:text>With Forms</i18n:text></item>
+                        <item uc:usecase="editors.oneform" 
href="?"><i18n:text>With one Form</i18n:text></item>
                       </block>
                   }
               }

Modified: lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml?view=diff&rev=520419&r1=520418&r2=520419
==============================================================================
--- lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml (original)
+++ lenya/trunk/src/pubs/default/config/ac/usecase-policies.xml Tue Mar 20 
08:08:29 2007
@@ -313,7 +313,7 @@
     <role id="review" method="grant"/>
     <role id="edit" method="grant"/>
   </usecase>
-  <usecase id="kupu">
+  <usecase id="kupu.edit">
     <role id="admin" method="grant"/>
     <role id="edit" method="grant"/>
   </usecase>

Modified: 
lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp?view=diff&rev=520419&r1=520418&r2=520419
==============================================================================
--- lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp 
(original)
+++ lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp Tue 
Mar 20 08:08:29 2007
@@ -45,20 +45,17 @@
                     String doctype = <input:get-attribute 
module="page-envelope" as="string" name="document-type"/>;
                     if ("homepage".equals(doctype)) {
                         <block areas="authoring">
-                          <item wf:event="edit">
-                             <xsp:attribute name="href">
-                               
<xsp:expr>"?lenya.module=kupu&amp;lenya.step=open"</xsp:expr>
-                             </xsp:attribute>
+                          <item uc:usecase="kupu.edit" href="?">
                              <i18n:text>With Kupu</i18n:text>
                           </item>
-                          <item wf:event="edit" uc:usecase="bxe.edit" href="?">
+                          <item uc:usecase="bxe.edit" href="?">
                             <i18n:text>With BXE</i18n:text>
                           </item>
-                          <item wf:event="edit" uc:usecase="editors.forms">
+                          <item uc:usecase="editors.forms">
                             <xsp:attribute name="href"><xsp:expr>"?form=" + 
doctype</xsp:expr></xsp:attribute>
                             <i18n:text>With Forms</i18n:text>
                           </item>
-                          <item wf:event="edit" uc:usecase="editors.oneform" 
href="?">
+                          <item uc:usecase="editors.oneform" href="?">
                             <i18n:text>With one Form</i18n:text>
                           </item>
                         </block>