cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/portal/conf modules.xconf
Date Thu, 11 Dec 2003 10:27:35 GMT
cziegeler    2003/12/11 02:27:35

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input
                        CopletModule.java
               src/blocks/portal/conf modules.xconf
  Added:       src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input
                        LayoutModule.java
  Log:
  Adding new input module to get layout information
  
  Revision  Changes    Path
  1.7       +3 -3      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
  
  Index: CopletModule.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CopletModule.java	9 Dec 2003 10:21:56 -0000	1.6
  +++ CopletModule.java	11 Dec 2003 10:27:35 -0000	1.7
  @@ -50,9 +50,9 @@
   */
   package org.apache.cocoon.portal.components.modules.input;
   
  +import java.util.Collections;
   import java.util.Iterator;
   import java.util.Map;
  -import java.util.Vector;
   
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -157,7 +157,7 @@
        * Overridden from superclass.
        */
   	public Iterator getAttributeNames(Configuration modeConf, Map objectModel) {
  -        return new Vector().iterator();
  +        return Collections.EMPTY_LIST.iterator();
   	}
   
       /**
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
  
  Index: LayoutModule.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.portal.components.modules.input;
  
  import java.util.Collections;
  import java.util.Iterator;
  import java.util.Map;
  
  import org.apache.avalon.framework.configuration.Configuration;
  import org.apache.avalon.framework.configuration.ConfigurationException;
  import org.apache.avalon.framework.service.ServiceException;
  import org.apache.avalon.framework.service.ServiceManager;
  import org.apache.avalon.framework.service.Serviceable;
  import org.apache.avalon.framework.thread.ThreadSafe;
  import org.apache.cocoon.components.modules.input.InputModule;
  import org.apache.cocoon.environment.ObjectModelHelper;
  import org.apache.cocoon.portal.Constants;
  import org.apache.cocoon.portal.PortalService;
  import org.apache.commons.jxpath.JXPathContext;
  
  /**
   * This input module gives access to information stored in a layout object
   * by using JXPathExpressions.
   * The syntax to use is LAYOUT_ID/PATH or LAYOUT_KEY:LAYOUT_ID/PATH
   *
   * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
   * @version CVS $Id: LayoutModule.java,v 1.1 2003/12/11 10:27:35 cziegeler Exp $
   */
  public class LayoutModule 
  implements InputModule, Serviceable, ThreadSafe {
      
      /**
       * The component manager.
       */
      private ServiceManager manager;
      
      /* (non-Javadoc)
       * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
       */
      public void service(ServiceManager manager) throws ServiceException {
          this.manager = manager;
      }
  
  	/* (non-Javadoc)
  	 * @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String,
org.apache.avalon.framework.configuration.Configuration, java.util.Map)
  	 */
  	public Object getAttribute(String name, Configuration modeConf, Map objectModel) 
      throws ConfigurationException {
          PortalService portalService = null;
          try {
  
              portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
  
              // are we running inside a coplet?
              final Map context = (Map)objectModel.get(ObjectModelHelper.PARENT_CONTEXT);
              if (context == null) {
                  // set portal name
                  portalService.setPortalName((String)objectModel.get(Constants.PORTAL_NAME_KEY));
              }
              
              int pos = name.indexOf('/');
              String path;
              if ( pos == -1 ) {
                  path = null;
              } else {
                  path = name.substring(pos + 1);
                  name = name.substring(0, pos);
              }
              // is the layout key specified?
              pos = name.indexOf(':');
              String layoutKey = null;
              String layoutId = name;
              if ( pos != -1 ) {
                  layoutKey = name.substring(0, pos);
                  layoutId = name.substring(pos + 1);
              }
  
              // get the layout
              final Object layout = portalService.getComponentManager().getProfileManager().getPortalLayout(layoutKey,
layoutId);
              Object value = layout;
              if ( layout != null && path != null ) {
                  final JXPathContext jxpathContext = JXPathContext.newContext(layout);
                  value = jxpathContext.getValue(path);
              }
              return value;
              
          } catch (ServiceException e) {
              throw new ConfigurationException("ComponentException ", e);
          } finally {
              this.manager.release(portalService);
          }
  	}
  
  	/* (non-Javadoc)
  	 * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeNames(org.apache.avalon.framework.configuration.Configuration,
java.util.Map)
  	 */
  	public Iterator getAttributeNames(Configuration modeConf, Map objectModel) {
          return Collections.EMPTY_LIST.iterator();
  	}
  
  
      /* (non-Javadoc)
       * @see org.apache.cocoon.components.modules.input.InputModule#getAttributeValues(java.lang.String,
org.apache.avalon.framework.configuration.Configuration, java.util.Map)
       */
      public Object[] getAttributeValues(String name, Configuration modeConf, Map objectModel)
      throws ConfigurationException {
          Object[] result = new Object[1];
          result[0] = this.getAttribute(name, modeConf, objectModel);
          return result;
  	}
  }
  
  
  
  1.3       +1 -0      cocoon-2.1/src/blocks/portal/conf/modules.xconf
  
  Index: modules.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/modules.xconf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- modules.xconf	1 Jun 2003 15:50:18 -0000	1.2
  +++ modules.xconf	11 Dec 2003 10:27:35 -0000	1.3
  @@ -3,5 +3,6 @@
   <xconf xpath="/cocoon/input-modules" unless="component-instance[@class='org.apache.cocoon.portal.components.modules.input.CopletModule']">
   
         <component-instance logger="core.modules.input" name="coplet" class="org.apache.cocoon.portal.components.modules.input.CopletModule"/>
  +      <component-instance logger="core.modules.input" name="portal-layout" class="org.apache.cocoon.portal.components.modules.input.LayoutModule"/>
   
   </xconf>
  
  
  

Mime
View raw message