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 2005/02/23 23:24:17 UTC

svn commit: r155091 - in lenya/trunk/src: java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java webapp/lenya/pubs/default/config/menus/generic.xsp

Author: andreas
Date: Wed Feb 23 14:24:16 2005
New Revision: 155091

URL: http://svn.apache.org/viewcvs?view=rev&rev=155091
Log:
check for usecase preconditions in UsecaseMenuTransformer

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
    lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp

Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java?view=diff&r1=155090&r2=155091
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java Wed Feb 23 14:24:16 2005
@@ -20,6 +20,7 @@
 package org.apache.lenya.cms.cocoon.transformation;
 
 import java.io.IOException;
+import java.util.Enumeration;
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
@@ -30,6 +31,7 @@
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.servlet.multipart.Part;
 import org.apache.cocoon.transformation.AbstractSAXTransformer;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccessController;
@@ -42,14 +44,16 @@
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.publication.PublicationException;
 import org.apache.lenya.cms.publication.PublicationFactory;
+import org.apache.lenya.cms.usecase.Usecase;
+import org.apache.lenya.cms.usecase.UsecaseResolver;
 import org.apache.lenya.util.ServletHelper;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
 /**
- * This transformer disables menu items (by removing the href attribute)
- * which are not allowed with respect to the usecase policies.
+ * This transformer disables menu items (by removing the href attribute) which
+ * are not allowed with respect to the usecase policies.
  */
 public class UsecaseMenuTransformer extends AbstractSAXTransformer implements Disposable {
 
@@ -66,37 +70,71 @@
      */
     public static final String USECASE_ATTRIBUTE = "usecase";
     /**
+     * Comment for <code>HREF_ATTRIBUTE</code> The href attribute
+     */
+    public static final String HREF_ATTRIBUTE = "href";
+    /**
      * <code>NAMESPACE</code> The usecase namespace
      */
     public static final String NAMESPACE = "http://apache.org/cocoon/lenya/usecase/1.0";
 
-    /** (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+    /**
+     * (non-Javadoc)
+     * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
+     *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
      */
     public void startElement(String uri, String localName, String raw, Attributes attr)
-        throws SAXException {
+            throws SAXException {
 
         Attributes attributes = attr;
 
-        if (this.authorizer != null && localName.equals(ITEM_ELEMENT)) {
-            String usecase = attr.getValue(NAMESPACE, USECASE_ATTRIBUTE);
+        UsecaseResolver usecaseResolver = null;
+        try {
+            usecaseResolver = (UsecaseResolver) this.manager.lookup(UsecaseResolver.ROLE);
 
-            // filter item if usecase not allowed 
-            if (usecase != null) {
-                getLogger().debug("Found usecase [" + usecase + "]");
-
-                try {
-                    if (!this.authorizer.authorizeUsecase(usecase, this.roles, this.publication)) {
-                        getLogger().debug("Usecase not authorized");
-                        int hrefIndex = attributes.getIndex("href");
-                        if (hrefIndex > -1) {
-                            attributes = new AttributesImpl(attr);
-                            ((AttributesImpl) attributes).removeAttribute(hrefIndex);
+            if (this.authorizer != null && localName.equals(ITEM_ELEMENT)) {
+                String usecaseName = attr.getValue(NAMESPACE, USECASE_ATTRIBUTE);
+
+                // filter item if usecase not allowed
+                if (usecaseName != null) {
+                    if (getLogger().isDebugEnabled()) {
+                        getLogger().debug("Found usecase [" + usecaseName + "]");
+                    }
+                    if (!this.authorizer
+                            .authorizeUsecase(usecaseName, this.roles, this.publication)) {
+                        if (getLogger().isDebugEnabled()) {
+                            getLogger().debug("Usecase not authorized");
                         }
+                        attributes = removeHrefAttribute(attr);
                     }
-                } catch (final AccessControlException e) {
-                    throw new SAXException(e);
                 }
+
+                if (usecaseResolver.isRegistered(usecaseName)) {
+                    Usecase usecase = null;
+                    try {
+                        usecase = usecaseResolver.resolve(usecaseName);
+                        if (attr.getValue(HREF_ATTRIBUTE) != null) {
+                            passRequestParameters(usecase, attr.getValue(HREF_ATTRIBUTE));
+                        }
+                        usecase.checkPreconditions();
+                        if (!usecase.getErrorMessages().isEmpty()) {
+                            if (getLogger().isDebugEnabled()) {
+                                getLogger().debug("Usecase preconditions not complied");
+                            }
+                            attributes = removeHrefAttribute(attr);
+                        }
+                    } finally {
+                        if (usecase != null) {
+                            usecaseResolver.release(usecase);
+                        }
+                    }
+                }
+            }
+        } catch (final Exception e) {
+            throw new SAXException(e);
+        } finally {
+            if (usecaseResolver != null) {
+                this.manager.release(usecaseResolver);
             }
         }
 
@@ -104,6 +142,43 @@
 
     }
 
+    /**
+     * Removes the <code>href</code> attribute.
+     * @param attr The original attributes.
+     * @return An attributes object.
+     */
+    protected Attributes removeHrefAttribute(Attributes attr) {
+        Attributes attributes = attr;
+        int hrefIndex = attributes.getIndex(HREF_ATTRIBUTE);
+        if (hrefIndex > -1) {
+            attributes = new AttributesImpl(attr);
+            ((AttributesImpl) attributes).removeAttribute(hrefIndex);
+        }
+        return attributes;
+    }
+
+    /**
+     * Pass the request parameters from the <code>href</code> attribute to the
+     * usecase handler.
+     * @param usecase The usecase handler.
+     * @param href The value of the <code>href</code> attribute.
+     */
+    void passRequestParameters(Usecase usecase, String href) {
+        int questionMarkIndex = href.indexOf("?");
+        if (questionMarkIndex > -1) {
+            String queryString = href.substring(questionMarkIndex + 1);
+            String[] nameValuePairs = queryString.split("&");
+            for (int i = 0; i < nameValuePairs.length; i++) {
+                String[] pair = nameValuePairs[i].split("=");
+                if (pair.length == 2) {
+                    String name = pair[0];
+                    String value = pair[1];
+                    usecase.setParameter(name, value);
+                }
+            }
+        }
+    }
+
     private UsecaseAuthorizer authorizer;
     private ServiceSelector serviceSelector = null;
     private Role[] roles;
@@ -111,11 +186,13 @@
     private AccessControllerResolver acResolver;
 
     /**
-     * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
+     * @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver,
+     *      java.util.Map, java.lang.String,
+     *      org.apache.avalon.framework.parameters.Parameters)
      */
     public void setup(SourceResolver _resolver, Map _objectModel, String src, Parameters _parameters)
-        throws ProcessingException, SAXException, IOException {
-        
+            throws ProcessingException, SAXException, IOException {
+
         super.setup(_resolver, _objectModel, src, _parameters);
 
         getLogger().debug("Setting up transformer");
@@ -132,19 +209,17 @@
             PublicationFactory factory = PublicationFactory.getInstance(getLogger());
             this.publication = factory.getPublication(_objectModel);
 
-            this.serviceSelector =
-                (ServiceSelector) this.manager.lookup(AccessControllerResolver.ROLE + "Selector");
-            this.acResolver =
-                (AccessControllerResolver) this.serviceSelector.select(
-                    AccessControllerResolver.DEFAULT_RESOLVER);
+            this.serviceSelector = (ServiceSelector) this.manager
+                    .lookup(AccessControllerResolver.ROLE + "Selector");
+            this.acResolver = (AccessControllerResolver) this.serviceSelector
+                    .select(AccessControllerResolver.DEFAULT_RESOLVER);
             getLogger().debug("Resolved AC resolver [" + this.acResolver + "]");
 
             String webappUrl = ServletHelper.getWebappURI(_request);
             AccessController accessController = this.acResolver.resolveAccessController(webappUrl);
 
             if (accessController instanceof DefaultAccessController) {
-                DefaultAccessController defaultAccessController =
-                    (DefaultAccessController) accessController;
+                DefaultAccessController defaultAccessController = (DefaultAccessController) accessController;
                 Authorizer[] authorizers = defaultAccessController.getAuthorizers();
                 for (int i = 0; i < authorizers.length; i++) {
                     if (authorizers[i] instanceof UsecaseAuthorizer) {
@@ -177,4 +252,4 @@
         }
     }
 
-}
+}
\ No newline at end of file

Modified: lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp?view=diff&r1=155090&r2=155091
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp Wed Feb 23 14:24:16 2005
@@ -38,9 +38,7 @@
     <xsp:logic>
       String projectid = parameters.getParameter("projectid","null");
       
-      String xmlSource = <input:get-attribute module="page-envelope" as="string" name="document-path"/>;
       String documentId = <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/authoring" + <input:get-attribute module="page-envelope" as="string" name="document-id"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
-      String urisParameter = "uris=" + <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/live" + <input:get-attribute module="page-envelope" as="string" name="document-url"/>;
       String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
       
       Object documentObject = <input:get-attribute as="object" module="page-envelope" name="document"/>;
@@ -64,56 +62,13 @@
     
     <menus>
       <menu i18n:attr="name" name="File">
-            <block>
-          
-          <xsp:logic>
-            {
-                if (Publication.ARCHIVE_AREA.equals(area) || Publication.TRASH_AREA.equals(area)) {
-                    <item><i18n:text>XHTML Document</i18n:text></item>
-                    <item><i18n:text>Links Document</i18n:text></item>
-                }
-                else {
-                    <item uc:usecase="site.create" href="?doctype=xhtml"><i18n:text>XHTML Document</i18n:text></item>
-                    <item uc:usecase="site.create" href="?doctype=links"><i18n:text>Links Document</i18n:text></item>
-                }
-            }
-          </xsp:logic>
+        <block>
+          <item uc:usecase="site.create" href="?doctype=xhtml"><i18n:text>XHTML Document</i18n:text></item>
+          <item uc:usecase="site.create" href="?doctype=links"><i18n:text>Links Document</i18n:text></item>
         </block>
         <block>
-          <xsp:logic>
-            {
-            
-              String[] availableLanguages = { };
-              if (isDocument) {
-                  availableLanguages = (String[]) <input:get-attribute module="page-envelope" as="object" name="document-languages"/>;
-              }
-            
-              if (isDocument &amp;&amp; Publication.AUTHORING_AREA.equals(area)) {
-                  String[] allLanguages = document.getPublication().getLanguages();
-                  
-                  if (availableLanguages.length &lt; allLanguages.length) {
-              <xsp:content>
-                <item uc:usecase="site.createLanguage" href="?"><i18n:text>New Language Version</i18n:text></item>
-              </xsp:content>
-                  }
-                  else {
-              <xsp:content>
-                <item><i18n:text>New Language Version</i18n:text></item>
-              </xsp:content>
-                  }
-              }
-            
-              if (isDocument &amp;&amp; Publication.AUTHORING_AREA.equals(area) &amp;&amp; availableLanguages.length &gt; 1) {
-                <xsp:content>
-                  <item uc:usecase="site.deleteLanguage" href="?"><i18n:text>Remove Language Version</i18n:text></item>
-                </xsp:content>
-              } else {
-                <xsp:content>
-                  <item><i18n:text>Remove Language Version</i18n:text></item>
-                </xsp:content>
-              } 
-            }
-          </xsp:logic>
+          <item uc:usecase="site.createLanguage" href="?"><i18n:text>New Language Version</i18n:text></item>
+          <item uc:usecase="site.deleteLanguage" href="?"><i18n:text>Remove Language Version</i18n:text></item>
         </block>
         <block>
           <item uc:usecase="ac.logout" href="?"><i18n:text>Logout</i18n:text></item>
@@ -130,7 +85,7 @@
         </block>
         <block info="false">
           <item wf:event="edit" uc:usecase="info-meta" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-context-path/>/<input:get-attribute module="page-envelope" as="string" name="publication-id"/>/info-<input:get-attribute module="page-envelope" as="string" name="area"/><input:get-attribute module="page-envelope" as="string" name="document-url"/>?</xsp:attribute><i18n:text>Edit Metadata</i18n:text></item>
-          <item wf:event="edit" uc:usecase="site.changeLabel"><xsp:attribute name="href"><xsp-request:get-uri/>?</xsp:attribute><i18n:text>Edit Navigation Title</i18n:text></item>
+          <item wf:event="edit" uc:usecase="site.changeLabel" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
         </block>
 
         <block authoring="false">
@@ -177,22 +132,8 @@
         
       </block>
       <block authoring="false">
-        <xsp:logic>
-          if (isDocument &amp;&amp; "".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)
-              &amp;&amp; Publication.AUTHORING_AREA.equals(area)) {
-            <item uc:usecase="site.changeNodeID" href="?"><i18n:text>Rename URL</i18n:text></item>
-          }
-          else {
-            <item>Rename URL</item>
-          }
-          
-          if (isDocument) {
-            <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
-          }
-          else {
-            <item>Edit Navigation Title</item>
-          }
-        </xsp:logic>
+        <item uc:usecase="site.changeNodeID" href="?"><i18n:text>Rename URL</i18n:text></item>
+        <item uc:usecase="site.changeLabel" href="?"><i18n:text>Edit Navigation Title</i18n:text></item>
       </block>
       <block authoring="false">
         <xsp:logic>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org