cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r409975 - in /cocoon/trunk: blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/mai...
Date Sun, 28 May 2006 18:35:35 GMT
Author: cziegeler
Date: Sun May 28 11:35:34 2006
New Revision: 409975

URL: http://svn.apache.org/viewvc?rev=409975&view=rev
Log:
Start removing SitemapConfigurable

Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/ChainedConfiguration.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/SitemapConfigurable.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/SitemapConfigurationHolder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/GlobalInputModule.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/NameForAliasAware.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/DefaultSitemapConfigurationHolder.java
Modified:
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
    cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FormDefinitionBuilder.java
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinitionBuilder.java
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/WidgetFinder.java
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/image-auth/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/simplify-sitemap.xsl
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr.xsl
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr01.xsl
    cocoon/trunk/commons/status.xml
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf
    cocoon/trunk/core/cocoon-core/META-INF/xconf/cocoon-core.xconf
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java
    cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-modules-input.xconf
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/sitemap-v06.rng
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java Sun May 28 11:35:34 2006
@@ -22,6 +22,8 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.context.Context;
@@ -34,8 +36,6 @@
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.components.SitemapConfigurable;
-import org.apache.cocoon.components.SitemapConfigurationHolder;
 import org.apache.cocoon.environment.Redirector;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
@@ -68,18 +68,15 @@
 public class DefaultAuthenticationManager
         extends AbstractLogEnabled
         implements AuthenticationManager,
-                   SitemapConfigurable,
                    Serviceable,
                    Disposable,
                    ThreadSafe,
+                   Configurable,
                    Contextualizable {
 
     /** The name of the session attribute storing the user status */
     public final static String SESSION_ATTRIBUTE_USER_STATUS = DefaultAuthenticationManager.class.getName() + "/UserStatus";
 
-    /** The manager for the authentication handlers */
-    protected SitemapConfigurationHolder holder;
-
     /** The Service Manager */
     protected ServiceManager manager;
 
@@ -98,12 +95,14 @@
     /** This is the key used to store the current request state in the request object */
     private static final String REQUEST_STATE_KEY = RequestState.class.getName();
 
+    /** The map containing the handler configurations for this sitemap. */
+    protected Map handlerConfigs;
+
     /**
-     * Set the sitemap configuration containing the handlers
+     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
      */
-    public void configure(SitemapConfigurationHolder holder)
-    throws ConfigurationException {
-        this.holder = holder;
+    public void configure(Configuration config) throws ConfigurationException {
+        this.handlerConfigs = DefaultHandlerManager.prepareHandlerConfiguration(ContextHelper.getObjectModel(this.context), config);
     }
 
     /**
@@ -111,16 +110,8 @@
      */
     private Map getHandlerConfigurations()
     throws ProcessingException {
-        Map configs = (Map) this.holder.getPreparedConfiguration();
-        if ( null == configs ) {
-            try {
-                configs = DefaultHandlerManager.prepareHandlerConfiguration(ContextHelper.getObjectModel(this.context),
-                                                                            this.holder);
-            } catch (ConfigurationException ce) {
-                throw new ProcessingException("Configuration error.", ce);
-            }
-        }
-        return configs;
+        // TODO - we have to find a way to get the parent handlers!
+        return this.handlerConfigs;
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java Sun May 28 11:35:34 2006
@@ -22,14 +22,12 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.ChainedConfiguration;
-import org.apache.cocoon.components.SitemapConfigurationHolder;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.webapps.authentication.configuration.HandlerConfiguration;
 
 
 /**
- *  This is a utility class managing the authentication handlers
+ *  This is a utility class managing the authentication handlers.
  *
  * @version $Id$
  */
@@ -38,22 +36,16 @@
     /**
      * Get the current handler configuration
      */
-    static public Map prepareHandlerConfiguration(Map            objectModel,
-                                                  SitemapConfigurationHolder holder)
+    static public Map prepareHandlerConfiguration(Map           objectModel,
+                                                  Configuration configs)
     throws ConfigurationException {
-        Map configs = (Map)holder.getPreparedConfiguration();
-        if ( null == configs ) {
-            ChainedConfiguration chainedConfig = holder.getConfiguration();
-            configs = prepare( objectModel, holder, chainedConfig );
-        }
-        return configs;
+        return prepare( objectModel, configs );
     }
     /**
      * Prepare the handler configuration
      */
-    static private Map prepare( Map            objectModel,
-                                SitemapConfigurationHolder holder,
-                                ChainedConfiguration conf) 
+    static private Map prepare( Map           objectModel,
+                                Configuration conf) 
     throws ConfigurationException {
         // test for handlers
         boolean found = false;
@@ -66,20 +58,9 @@
             }
         }
 
-        Map values = null;
-        final ChainedConfiguration parent = conf.getParent();
-        if ( null != parent ) {
-            values = prepare( objectModel, holder, parent );
-            if ( found ) {
-                values = new HashMap( values );
-            }
-        } else if ( found ){
+        final Map values;
+        if ( found ){
             values = new HashMap(10);
-        } else {
-            values = Collections.EMPTY_MAP;
-        }
-
-        if ( found ) {
             for(int i=0; i<handlers.length;i++) {
                 // check unique name
                 final String name = handlers[i].getAttribute("name");
@@ -89,18 +70,19 @@
 
                 addHandler( objectModel, handlers[i], values );
             }
+        } else {
+            values = Collections.EMPTY_MAP;
         }
-        holder.setPreparedConfiguration( conf, values );
-        
+
         return values;
     }
 
     /**
      * Add one handler configuration
      */
-    static private void addHandler(Map            objectModel,
-                                   Configuration  configuration,
-                                   Map            values)
+    static private void addHandler(Map           objectModel,
+                                   Configuration configuration,
+                                   Map           values)
     throws ConfigurationException {
         // get handler name
         final String name = configuration.getAttribute("name");
@@ -115,6 +97,4 @@
         }
         values.put( name, currentHandler );
     }
-
-
 }

Modified: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap Sun May 28 11:35:34 2006
@@ -49,15 +49,15 @@
 
   <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-    <map:component-configurations>
-      <global-variables>
          <!--+
              | (Re)Define global parameters, used in the input modules GlobalInputModule demo.
-             +-->
+    <map:component-configurations>
+      <global-variables>
          <global-sub-sitemap>This value is defined in the samples/modules/sitemap.xmap</global-sub-sitemap>
          <global-sitemap-override>This value was defined in the samples/sitemap.xmap, but was overridden by samples/modules/sitemap.xmap</global-sitemap-override>
       </global-variables>
     </map:component-configurations>
+             +-->
 
     <map:pipeline>
 

Modified: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap Sun May 28 11:35:34 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- CVS $Id: sitemap.xmap 164239 2005-04-22 13:54:29Z reinhard $ -->
+<!-- CVS $Id$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
@@ -57,15 +57,15 @@
   <!-- ========================== Pipelines ================================ -->
 
   <map:pipelines>
-    <map:component-configurations>
-      <global-variables>
          <!--+
              | Define global parameters, used in the input modules GlobalInputModule demo.
-             +-->
+    <map:component-configurations>
+      <global-variables>
          <global-sitemap>This value is defined in the samples/sitemap.xmap</global-sitemap>
          <global-sitemap-override>This value is defined in the samples/sitemap.xmap, should be overridden by samples/modules/sitemap.xmap</global-sitemap-override>
       </global-variables>
     </map:component-configurations>
+             +-->
 
     <map:pipeline>
       <map:match pattern="v">

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FormDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FormDefinitionBuilder.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FormDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FormDefinitionBuilder.java Sun May 28 11:35:34 2006
@@ -20,7 +20,6 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.forms.event.ProcessingPhaseListener;
-import org.apache.cocoon.forms.event.ValueChangedListener;
 import org.apache.cocoon.forms.formmodel.library.LibraryManager;
 import org.apache.cocoon.util.location.LocationAttributes;
 import org.w3c.dom.Element;

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java Sun May 28 11:35:34 2006
@@ -17,7 +17,6 @@
 
 import org.apache.cocoon.forms.event.RepeaterEvent;
 import org.apache.cocoon.forms.event.RepeaterListener;
-import org.apache.cocoon.forms.event.ValueChangedListener;
 import org.apache.cocoon.forms.event.WidgetEventMulticaster;
 
 /**

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinitionBuilder.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/RepeaterDefinitionBuilder.java Sun May 28 11:35:34 2006
@@ -19,7 +19,6 @@
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.cocoon.forms.event.RepeaterListener;
-import org.apache.cocoon.forms.event.ValueChangedListener;
 import org.apache.cocoon.forms.util.DomHelper;
 import org.w3c.dom.Element;
 

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/WidgetFinder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/WidgetFinder.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/WidgetFinder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/WidgetFinder.java Sun May 28 11:35:34 2006
@@ -312,7 +312,7 @@
                 refreshForClear((Repeater)event.getSourceWidget());
             }
             if (listener != null) {
-                listener.repeaterModified((RepeaterEvent)event);
+                listener.repeaterModified(event);
             }
         }
     }

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/image-auth/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/image-auth/sitemap.xmap?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/image-auth/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/image-auth/sitemap.xmap Sun May 28 11:35:34 2006
@@ -23,11 +23,6 @@
 
   <map:pipelines>
 
-    <map:component-configurations>
-        <global-variables/>
-    </map:component-configurations>
-
-
     <map:pipeline>
 
         <map:match pattern="">

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/simplify-sitemap.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/simplify-sitemap.xsl?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/simplify-sitemap.xsl (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/simplify-sitemap.xsl Sun May 28 11:35:34 2006
@@ -25,7 +25,7 @@
       ! skipping some 
       ! -->
     
-    <xsl:template match="map:components|map:views|map:view|map:component-configurations|map:parameter">
+    <xsl:template match="map:components|map:views|map:view|map:parameter">
     </xsl:template>
     
     

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr.xsl?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr.xsl (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr.xsl Sun May 28 11:35:34 2006
@@ -37,12 +37,12 @@
             <xsl:apply-templates/>
         </sitemap>
     </xsl:template>
-    
-    
-    <xsl:template match="map:components|map:views|map:component-configurations">
+
+
+    <xsl:template match="map:components|map:views">
     </xsl:template>
-    
-    
+
+
     <xsl:template match="map:match" mode="print">
         <xsl:param name="use_cnt" select="-1"/>
         <xsl:param name="depth"  select="0"/>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr01.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr01.xsl?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr01.xsl (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/transforms/sitemap2descr01.xsl Sun May 28 11:35:34 2006
@@ -32,7 +32,7 @@
     </xsl:template>
     
     
-    <xsl:template match="map:components|map:views|map:component-configurations">
+    <xsl:template match="map:components|map:views">
     </xsl:template>
     
     

Modified: cocoon/trunk/commons/status.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/status.xml?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/commons/status.xml (original)
+++ cocoon/trunk/commons/status.xml Sun May 28 11:35:34 2006
@@ -176,6 +176,10 @@
   <!-- These are the changes from the last 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="remove">
+      Remove the SitemapConfigurable interface completly. The new include and property mechanism provides
+      a cleaner way of per sitemap configurations.
+    </action>
     <action dev="CZ" type="add">
       Properties can now be defined on a per sitemap base. This includes different set of
       properties for different running modes.

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/core/META-INF/cocoon-core.xconf Sun May 28 11:35:34 2006
@@ -166,7 +166,7 @@
     <component-instance logger="core.modules.input" name="url-decode"       class="org.apache.cocoon.components.modules.input.URLDecodeModule">
       <encoding>UTF-8</encoding>
     </component-instance>
-    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
+    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.SettingsInputModule"/>
     <component-instance logger="core.modules.input" name="request"          class="org.apache.cocoon.components.modules.input.RequestModule"/>
     <component-instance logger="core.modules.input" name="baselink"         class="org.apache.cocoon.components.modules.input.BaseLinkModule" />
     <component-instance logger="core.modules.input" name="session"          class="org.apache.cocoon.components.modules.input.SessionModule"/>

Modified: cocoon/trunk/core/cocoon-core/META-INF/xconf/cocoon-core.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/META-INF/xconf/cocoon-core.xconf?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/META-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/core/cocoon-core/META-INF/xconf/cocoon-core.xconf Sun May 28 11:35:34 2006
@@ -164,7 +164,7 @@
     <component-instance logger="core.modules.input" name="url-decode"       class="org.apache.cocoon.components.modules.input.URLDecodeModule">
       <encoding>UTF-8</encoding>
     </component-instance>
-    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
+    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.SettingsInputModule"/>
     <component-instance logger="core.modules.input" name="request"          class="org.apache.cocoon.components.modules.input.RequestModule"/>
     <component-instance logger="core.modules.input" name="baselink"         class="org.apache.cocoon.components.modules.input.BaseLinkModule" />
     <component-instance logger="core.modules.input" name="session"          class="org.apache.cocoon.components.modules.input.SessionModule"/>

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java Sun May 28 11:35:34 2006
@@ -288,13 +288,6 @@
     }
 
     /**
-     * @see org.apache.cocoon.Processor#getComponentConfigurations()
-     */
-    public Map getComponentConfigurations() {
-        return null;
-    }
-
-    /**
      * Return this (Cocoon is always at the root of the processing chain).
      * 
      * @since 2.1.1

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java Sun May 28 11:35:34 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.cocoon;
 
-import java.util.Map;
-
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.components.pipeline.ProcessingPipeline;
@@ -83,12 +81,6 @@
      */
     InternalPipelineDescription buildPipeline(Environment environment)
     throws Exception;
-
-    /**
-     * Get the sitemap component configurations
-     * @since 2.1
-     */
-    Map getComponentConfigurations();
 
     /**
      * Get the root processor parent of this processor.

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Sun May 28 11:35:34 2006
@@ -24,16 +24,13 @@
 import java.util.Stack;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ProcessingUtil;
 import org.apache.cocoon.Processor;
-import org.apache.cocoon.components.ChainedConfiguration;
 import org.apache.cocoon.components.source.impl.SitemapSourceInfo;
 import org.apache.cocoon.core.container.spring.CocoonBeanFactory;
-import org.apache.cocoon.core.container.spring.NameForAliasAware;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.ForwardRedirector;
 import org.apache.cocoon.environment.ObjectModelHelper;
@@ -79,11 +76,6 @@
     /** Root node of the processing tree */
     private ProcessingNode rootNode;
 
-    private Configuration componentConfigurations;
-
-    /** The sitemap configurations. */
-    protected Map sitemapComponentConfigurations;
-
     /** Number of simultaneous uses of this processor (either by concurrent request or by internal requests) */
     private int requestCount;
 
@@ -134,61 +126,6 @@
         this.disposableNodes = disposableNodes;
         this.enterSitemapEventListeners = enterSitemapEventListeners;
         this.leaveSitemapEventListeners = leaveSitemapEventListeners;
-    }
-
-    /** Set the sitemap component configurations (called as part of the tree building process) */
-    public void setComponentConfigurations(Configuration componentConfigurations) {
-        this.componentConfigurations = componentConfigurations;
-        this.sitemapComponentConfigurations = null;
-    }
-
-    /**
-     * @see org.apache.cocoon.Processor#getComponentConfigurations()
-     */
-    public Map getComponentConfigurations() {
-        // do we have the sitemap configurations prepared for this processor?
-        if ( null == this.sitemapComponentConfigurations ) {
-
-            synchronized (this) {
-
-                if ( this.sitemapComponentConfigurations == null ) {
-                    // do we have configurations?
-                    final Configuration[] childs = (this.componentConfigurations == null
-                                                     ? null
-                                                     : this.componentConfigurations.getChildren());
-
-                    if ( null != childs ) {
-
-                        if ( null == this.wrappingProcessor.parent ) {
-                            this.sitemapComponentConfigurations = new HashMap(12);
-                        } else {
-                            // copy all configurations from parent
-                            this.sitemapComponentConfigurations = new HashMap(
-                                        this.wrappingProcessor.parent.getComponentConfigurations());
-                        }
-
-                        // and now check for new configurations
-                        for(int m = 0; m < childs.length; m++) {
-                            String r = childs[m].getName();
-                            // FIXME: No alias handling in non bean context environment
-                            if (this.beanFactory != null && this.beanFactory instanceof NameForAliasAware)
-                                r = ((NameForAliasAware)this.beanFactory).getNameForAlias(r);
-                            this.sitemapComponentConfigurations.put(r, new ChainedConfiguration(childs[m],
-                                                                             (ChainedConfiguration)this.sitemapComponentConfigurations.get(r)));
-                        }
-                    } else {
-                        // we don't have configurations
-                        if ( null == this.wrappingProcessor.parent ) {
-                            this.sitemapComponentConfigurations = Collections.EMPTY_MAP;
-                        } else {
-                            // use configuration from parent
-                            this.sitemapComponentConfigurations = this.wrappingProcessor.parent.getComponentConfigurations();
-                        }
-                    }
-                }
-            }
-        }
-        return this.sitemapComponentConfigurations;
     }
 
     /**

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Sun May 28 11:35:34 2006
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
@@ -271,13 +270,6 @@
         }
 
         return result;
-    }
-
-    /**
-     * @see org.apache.cocoon.Processor#getComponentConfigurations()
-     */
-    public Map getComponentConfigurations() {
-        return this.concreteProcessor.getComponentConfigurations();
     }
 
     /**

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java Sun May 28 11:35:34 2006
@@ -33,16 +33,12 @@
  */
 public class PipelinesNodeBuilder extends ContainerNodeBuilder implements ThreadSafe {
 
+    /**
+     * @see org.apache.cocoon.components.treeprocessor.ContainerNodeBuilder#buildNode(org.apache.avalon.framework.configuration.Configuration)
+     */
     public ProcessingNode buildNode(Configuration config)
     throws Exception {
-        // Check for component configurations
-        Configuration child = config.getChild("component-configurations", false);
-        if (child != null) {
-            checkNamespace(child);
-            this.treeBuilder.getProcessor().setComponentConfigurations(child);
-        }
-
-        PipelinesNode node = new PipelinesNode();
+        final PipelinesNode node = new PipelinesNode();
         this.treeBuilder.setupNode(node, config);
 
         Configuration[] childConfigs = config.getChildren();

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java Sun May 28 11:35:34 2006
@@ -31,9 +31,7 @@
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.components.SitemapConfigurable;
 import org.apache.cocoon.core.Settings;
-import org.apache.cocoon.core.container.util.DefaultSitemapConfigurationHolder;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
@@ -52,8 +50,7 @@
  * @version $Id$
  */
 public class CocoonBeanFactory
-    extends DefaultListableBeanFactory
-    implements NameForAliasAware {
+    extends DefaultListableBeanFactory {
 
     protected final XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this);
 
@@ -102,23 +99,6 @@
     }
 
     /**
-     * @see org.apache.cocoon.core.container.spring.NameForAliasAware#getNameForAlias(java.lang.String)
-     */
-    public String getNameForAlias(String alias) {
-        if ( this.avalonConfiguration != null ) {
-            final String value = this.avalonConfiguration.getRoleForName(alias);
-            if ( value != null ) {
-                return value;
-            }
-            if ( this.getParentBeanFactory() instanceof NameForAliasAware ) {
-                return ((NameForAliasAware)this.getParentBeanFactory()).getNameForAlias(alias);
-            }
-        }
-        // default: we just return the alias
-        return alias;
-    }
-
-    /**
      * Instantiate and invoke all registered BeanPostProcessor beans,
      * respecting explicit order if given.
      * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#preInstantiateSingletons()
@@ -215,9 +195,6 @@
                         }
                         ContainerUtil.parameterize(bean, p);
                     }
-                }
-                if ( bean instanceof SitemapConfigurable ) {
-                    ((SitemapConfigurable)bean).configure(new DefaultSitemapConfigurationHolder(beanName));
                 }
                 ContainerUtil.initialize(bean);
             } catch (Exception e) {

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-modules-input.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-modules-input.xconf?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-modules-input.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-modules-input.xconf Sun May 28 11:35:34 2006
@@ -49,7 +49,7 @@
     <component-instance logger="core.modules.input" name="url-decode"       class="org.apache.cocoon.components.modules.input.URLDecodeModule">
       <encoding>UTF-8</encoding>
     </component-instance>
-    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
+    <component-instance logger="core.modules.input" name="global"           class="org.apache.cocoon.components.modules.input.SettingsInputModule"/>
     <component-instance logger="core.modules.input" name="request"          class="org.apache.cocoon.components.modules.input.RequestModule"/>
     <component-instance logger="core.modules.input" name="baselink"         class="org.apache.cocoon.components.modules.input.BaseLinkModule" />
     <component-instance logger="core.modules.input" name="session"          class="org.apache.cocoon.components.modules.input.SessionModule"/>

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.roles Sun May 28 11:35:34 2006
@@ -221,10 +221,6 @@
         shorthand="output-modules"
         default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
 
-  <role name="org.apache.cocoon.components.modules.input.SitemapVariableHolder"
-        shorthand="global-variables"
-        default-class="org.apache.cocoon.components.modules.input.SitemapVariableHolder"/>
-
   <!-- Storing data in the current request -->
   <role name="org.apache.cocoon.components.persistence.RequestDataStore"
         shorthand="request-data-store"

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml Sun May 28 11:35:34 2006
@@ -101,7 +101,6 @@
 
       <node name="pipelines" builder="org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNodeBuilder">
         <allowed-children>pipeline, handle-errors</allowed-children>
-        <ignored-children>component-configurations</ignored-children>
       </node>
 
       <node name="pipeline" builder="org.apache.cocoon.components.treeprocessor.sitemap.PipelineNodeBuilder">

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java Sun May 28 11:35:34 2006
@@ -44,13 +44,6 @@
     }
     
     /**
-     * @see org.apache.cocoon.Processor#getComponentConfigurations()
-     */
-    public Map getComponentConfigurations() {
-        return null;
-    }
-    
-    /**
      * @see org.apache.cocoon.Processor#getContext()
      */
     public String getContext() {

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/sitemap-v06.rng
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/sitemap-v06.rng?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/sitemap-v06.rng (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/entities/sitemap-v06.rng Sun May 28 11:35:34 2006
@@ -1215,9 +1215,6 @@
   <define name="map.pipelines">
     <element name="map:pipelines">
       <ref name="map.pipelines.attlist"/>
-      <optional>
-        <ref name="map.component-configurations"/>
-      </optional>
       <zeroOrMore>
         <ref name="map.pipeline"/>
       </zeroOrMore>
@@ -1558,437 +1555,6 @@
   <define name="map.handle-errors.attlist" combine="interleave">
     <ref name="universal.attr"/>
     <ref name="type.attr"/>
-  </define>
-
-  <define name="map.component-configurations">
-    <element name="map:component-configurations">
-      <ref name="map.component-configurations.attlist"/>
-      <optional>
-        <ref name="global-variables"/>
-      </optional>
-      <optional>
-        <ref name="authentication-manager"/>
-      </optional>
-    </element>
-  </define>
-  <define name="map.component-configurations.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="global-variables">
-    <element name="global-variables">
-      <ref name="global-variables.attlist"/>
-      <zeroOrMore>
-        <ref name="anyElement"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="global-variables.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="authentication-manager">
-    <element name="authentication-manager">
-      <ref name="authentication-manager.attlist"/>
-      <ref name="handlers"/>
-    </element>
-  </define>
-  <define name="authentication-manager.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="handlers">
-    <element name="handlers">
-      <ref name="handlers.attlist"/>
-      <oneOrMore>
-        <ref name="handler"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="handlers.attlist" combine="interleave">
-    <empty/>
-  </define>
-
-  <define name="handler">
-    <element name="handler">
-      <ref name="handler.attlist"/>
-      <ref name="redirect-to"/>
-      <ref name="authentication"/>
-      <optional>
-        <ref name="applications"/>
-      </optional>
-    </element>
-  </define>
-  <define name="handler.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="name.attr"/>
-    <empty/>
-  </define>
-
-  <define name="redirect-to">
-    <element name="redirect-to">
-      <ref name="redirect-to.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="redirect-to.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="authentication">
-    <element name="authentication">
-      <ref name="authentication.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="authentication.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="applications">
-    <element name="applications">
-      <ref name="applications.attlist"/>
-      <oneOrMore>
-        <ref name="application"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="applications.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="application">
-    <element name="application">
-      <ref name="application.attlist"/>
-      <oneOrMore>
-        <ref name="configuration"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="application.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <attribute name="loadondemand"/>
-    <ref name="name.attr"/>
-  </define>
-
-  <define name="configuration">
-    <element name="configuration">
-      <ref name="configuration.attlist"/>
-      <zeroOrMore> <!-- CPA: not sure - maybe interleave optionals? TODO -->
-        <choice>
-          <ref name="auth-redirect"/>
-          <ref name="portal-uri"/>
-          <ref name="profile-cache"/>
-          <ref name="default-coplet-timeout"/>
-          <ref name="profile"/>
-          <ref name="load-users"/>
-          <ref name="load-roles"/>
-          <ref name="new-user"/>
-          <ref name="new-role"/>
-          <ref name="change-user"/>
-          <ref name="delete-role"/>
-          <ref name="delete-user"/>
-          <ref name="process-coplets-parallel"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="configuration.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="name.attr"/>
-  </define>
-
-  <define name="auth-redirect">
-    <element name="auth-redirect">
-      <ref name="auth-redirect.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <define name="auth-redirect.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="portal-uri">
-    <element name="portal-uri">
-      <ref name="portal-uri.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <define name="portal-uri.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="profile-cache">
-    <element name="profile-cache">
-      <ref name="profile-cache.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <define name="profile-cache.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="default-coplet-timeout">
-    <element name="default-coplet-timeout">
-      <ref name="default-coplet-timeout.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <define name="default-coplet-timeout.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="process-coplets-parallel">
-    <element name="process-coplets-parallel">
-      <ref name="process-coplets-parallel.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <define name="process-coplets-parallel.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="profile">
-    <element name="profile">
-      <ref name="profile.attlist"/>
-      <ref name="layout-base"/>
-      <ref name="coplet-base"/>
-      <ref name="coplet-base-save"/>
-      <ref name="type-base"/>
-      <ref name="admin-type-base"/>
-      <ref name="global-delta-load"/>
-      <ref name="global-delta-save"/>
-      <ref name="role-delta-load"/>
-      <ref name="role-delta-save"/>
-      <ref name="user-delta-load"/>
-      <ref name="user-delta-save"/>
-      <ref name="user-status-load"/>
-      <ref name="user-status-save"/>
-    </element>
-  </define>
-  <define name="profile.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-  </define>
-
-  <define name="layout-base">
-    <element name="layout-base">
-      <ref name="layout-base.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="layout-base.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="coplet-base">
-    <element name="coplet-base">
-      <ref name="coplet-base.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="coplet-base.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="coplet-base-save">
-    <element name="coplet-base-save">
-      <ref name="coplet-base-save.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="coplet-base-save.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="type-base">
-    <element name="type-base">
-      <ref name="type-base.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="type-base.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="admin-type-base">
-    <element name="admin-type-base">
-      <ref name="admin-type-base.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="admin-type-base.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="global-delta-load">
-    <element name="global-delta-load">
-      <ref name="global-delta-load.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="global-delta-load.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="global-delta-save">
-    <element name="global-delta-save">
-      <ref name="global-delta-save.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="global-delta-save.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="role-delta-load">
-    <element name="role-delta-load">
-      <ref name="role-delta-load.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="role-delta-load.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="role-delta-save">
-    <element name="role-delta-save">
-      <ref name="role-delta-save.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="role-delta-save.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="user-delta-load">
-    <element name="user-delta-load">
-      <ref name="user-delta-load.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="user-delta-load.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="user-delta-save">
-    <element name="user-delta-save">
-      <ref name="user-delta-save.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="user-delta-save.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="user-status-load">
-    <element name="user-status-load">
-      <ref name="user-status-load.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="user-status-load.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="user-status-save">
-    <element name="user-status-save">
-      <ref name="user-status-save.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="user-status-save.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="load-users">
-    <element name="load-users">
-      <ref name="load-users.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="load-users.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-  <define name="load-roles">
-    <element name="load-roles">
-      <ref name="load-roles.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="load-roles.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="new-user">
-    <element name="new-user">
-      <ref name="new-user.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="new-user.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="new-role">
-    <element name="new-role">
-      <ref name="new-role.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="new-role.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="change-user">
-    <element name="change-user">
-      <ref name="change-user.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="change-user.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="delete-user">
-    <element name="delete-user">
-      <ref name="delete-user.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="delete-user.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
-  </define>
-
-  <define name="delete-role">
-    <element name="delete-role">
-      <ref name="delete-role.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="delete-role.attlist" combine="interleave">
-    <ref name="universal.attr"/>
-    <ref name="uri.attr"/>
   </define>
 
   <define name="map.flow-interpreters">

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap?rev=409975&r1=409974&r2=409975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap Sun May 28 11:35:34 2006
@@ -118,20 +118,6 @@
      | You may have as many pipelines in your sitemap as you like.
      +-->
  <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-       <!--+
-           | Define global parameters here:
-           |   <skin>my_skin</skin>
-           |   ...
-           | You can access them by {global:*name*}, e.g. {global:skin}.
-           | These values are inherited into sub-sitemaps and can
-           | be extended there.
-           +-->
-    </global-variables>
-  </map:component-configurations>
-
   <!-- main pipeline -->
   <map:pipeline>
 



Mime
View raw message