cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap ActNodeBuilder.java ActTypeNode.java ActionSetNode.java ActionSetNodeBuilder.java

2003-08-14 Thread sylvain 
sylvain 2003/08/07 01:42:20

  Modified:src/blocks/databases/samples/tutorial sitemap.xmap
   src/java/org/apache/cocoon/components/treeprocessor
DefaultTreeBuilder.java TreeBuilder.java
   src/java/org/apache/cocoon/components/treeprocessor/sitemap
ActNodeBuilder.java ActTypeNode.java
ActionSetNode.java ActionSetNodeBuilder.java
  Added:   src/blocks/databases/samples/tutorial apache.xsl
  Log:
  Fix bug #9835 (hopefully) related to nested actions in action-sets
  
  Revision  ChangesPath
  1.3   +10 -3 cocoon-2.1/src/blocks/databases/samples/tutorial/sitemap.xmap
  
  Index: sitemap.xmap
  ===
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/tutorial/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap  25 Mar 2003 17:10:36 -  1.2
  +++ sitemap.xmap  7 Aug 2003 08:42:20 -   1.3
  @@ -82,7 +82,8 @@
   
 
 
  -  
  +  
  +  
 
   
   
  @@ -94,14 +95,20 @@
   
 
 
  -  
  +  
  +  
 
   
   
 
   
  -
  +  
  +
   
  +  
  +  
  +  
  +
 
   
 
  
  
  
  1.1  cocoon-2.1/src/blocks/databases/samples/tutorial/apache.xsl
  
  Index: apache.xsl
  ===
  
  
  
  
  
  http://www.w3.org/1999/XSL/Transform";>

  

  
  

  


  
  

  

  
  

  
  

  


  


  

  
  

  

  http://xml.apache.org/"; target="new">
http://xml.apache.org/"; width="96" height="20" 
src="images/button-xml-lo.gif"
 name="xml" hspace="0" vspace="0" border="0"/>
  


  http://www.apache.org/"; target="new">
http://www.apache.org/"; width="96" height="20" 
src="images/button-asf-lo.gif"
 name="asf" hspace="0" vspace="0" border="0"/>
  


  http://www.w3.org/"; target="new">
http://www.w3.org/"; width="96" height="20" 
src="images/button-w3c-lo.gif"
 name="w3c" hspace="0" vspace="0" border="0"/>
  

  

  

  
  
  
  

  
  

  
  
  
  
  

  
  
  

  

  

  
  
  
  
  


  
Copyright © 1999-2001.
All Rights Reserved.
  

  

  

  

  

  

  

  

  
  

  

  

  

  
  http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0"; 
id="[EMAIL PROTECTED]" height="[EMAIL PROTECTED]" width="[EMAIL PROTECTED]">



http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"/>

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap ActNodeBuilder.java

2003-07-29 Thread stephan 
stephan 2003/07/29 07:29:10

  Modified:src/java/org/apache/cocoon/components/treeprocessor/sitemap
ActNodeBuilder.java
  Log:
  Throw configuration exception if the  element is missing.
  
  Revision  ChangesPath
  1.2   +11 -5 
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java
  
  Index: ActNodeBuilder.java
  ===
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ActNodeBuilder.java   9 Mar 2003 00:09:20 -   1.1
  +++ ActNodeBuilder.java   29 Jul 2003 14:29:10 -  1.2
  @@ -51,8 +51,10 @@
   package org.apache.cocoon.components.treeprocessor.sitemap;
   
   import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.cocoon.acting.Action;
   import 
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
  +import org.apache.cocoon.components.treeprocessor.CategoryNode;
   import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
   import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
   import org.apache.cocoon.components.treeprocessor.ProcessingNode;
  @@ -110,10 +112,14 @@
   
   if (this.actSetNode != null) {
   // Link action-set call to the action set
  -this.actSetNode.setActionSet(
  -(ActionSetNode)CategoryNodeBuilder.getNamedNode(
  -this.treeBuilder, "action-sets", this.actSetName)
  -);
  +CategoryNode actionSets = 
CategoryNodeBuilder.getCategoryNode(this.treeBuilder, "action-sets");
  +
  +if (actionSets == null)
  +throw new ConfigurationException("This sitemap contains no action 
sets. Cannot call at " + actSetNode.getLocation());
  +
  +ActionSetNode actionSetNode = 
(ActionSetNode)actionSets.getNodeByName(this.actSetName);
  +
  +this.actSetNode.setActionSet(actionSetNode);
   }
   }
   }