You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2002/04/29 16:46:16 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap ActSetNode.java GenerateNode.java MatchNode.java MountNode.java PipelineNode.java PipelinesNode.java PreparableMatchNode.java
cziegeler 02/04/29 07:46:16
Modified: src/java/org/apache/cocoon/components/treeprocessor
AbstractParentProcessingNode.java CategoryNode.java
ContainerNode.java NamedContainerNode.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
ActSetNode.java GenerateNode.java MatchNode.java
MountNode.java PipelineNode.java PipelinesNode.java
PreparableMatchNode.java
Log:
Cleaned up imports
Revision Changes Path
1.3 +2 -4 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
Index: AbstractParentProcessingNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractParentProcessingNode.java 12 Mar 2002 22:19:30 -0000 1.2
+++ AbstractParentProcessingNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -51,8 +51,6 @@
package org.apache.cocoon.components.treeprocessor;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import java.util.List;
import java.util.Map;
@@ -60,7 +58,7 @@
/**
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: AbstractParentProcessingNode.java,v 1.2 2002/03/12 22:19:30 ovidiu Exp $
+ * @version CVS $Id: AbstractParentProcessingNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public abstract class AbstractParentProcessingNode extends AbstractProcessingNode {
@@ -92,7 +90,7 @@
// No success
context.popMap();
}
-
+
return false;
}
1.2 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/CategoryNode.java
Index: CategoryNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/CategoryNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CategoryNode.java 5 Mar 2002 08:26:22 -0000 1.1
+++ CategoryNode.java 29 Apr 2002 14:46:16 -0000 1.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.ProcessingException;
@@ -61,7 +59,7 @@
* A generic container node that just invokes its children.
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: CategoryNode.java,v 1.1 2002/03/05 08:26:22 sylvain Exp $
+ * @version CVS $Id: CategoryNode.java,v 1.2 2002/04/29 14:46:16 cziegeler Exp $
*/
public final class CategoryNode extends AbstractParentProcessingNode {
1.2 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNode.java
Index: ContainerNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerNode.java 5 Mar 2002 08:26:22 -0000 1.1
+++ ContainerNode.java 29 Apr 2002 14:46:16 -0000 1.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
import java.util.*;
@@ -60,7 +58,7 @@
* A generic container node that just invokes its children.
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: ContainerNode.java,v 1.1 2002/03/05 08:26:22 sylvain Exp $
+ * @version CVS $Id: ContainerNode.java,v 1.2 2002/04/29 14:46:16 cziegeler Exp $
*/
public class ContainerNode extends SimpleParentProcessingNode {
1.2 +1 -5 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNode.java
Index: NamedContainerNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamedContainerNode.java 5 Mar 2002 08:26:22 -0000 1.1
+++ NamedContainerNode.java 29 Apr 2002 14:46:16 -0000 1.2
@@ -50,15 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.environment.Environment;
-
/**
* A named container node that just invokes its children.
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: NamedContainerNode.java,v 1.1 2002/03/05 08:26:22 sylvain Exp $
+ * @version CVS $Id: NamedContainerNode.java,v 1.2 2002/04/29 14:46:16 cziegeler Exp $
*/
public class NamedContainerNode extends ContainerNode implements NamedProcessingNode {
1.3 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActSetNode.java
Index: ActSetNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActSetNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActSetNode.java 27 Mar 2002 15:13:40 -0000 1.2
+++ ActSetNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -60,8 +60,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.sitemap.PatternException;
@@ -78,7 +76,7 @@
* Handles <map:act type="..."> (action-sets calls are handled by {@link ActSetNode}).
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: ActSetNode.java,v 1.2 2002/03/27 15:13:40 sylvain Exp $
+ * @version CVS $Id: ActSetNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public class ActSetNode extends SimpleParentProcessingNode
1.2 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java
Index: GenerateNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenerateNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ GenerateNode.java 29 Apr 2002 14:46:16 -0000 1.2
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.sitemap.PatternException;
@@ -66,7 +65,7 @@
/**
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: GenerateNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: GenerateNode.java,v 1.2 2002/04/29 14:46:16 cziegeler Exp $
*/
public class GenerateNode extends AbstractProcessingNode implements ParameterizableProcessingNode {
1.3 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java
Index: MatchNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MatchNode.java 22 Apr 2002 15:43:36 -0000 1.2
+++ MatchNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -51,8 +51,6 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.MapStackResolver;
@@ -72,7 +70,7 @@
/**
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: MatchNode.java,v 1.2 2002/04/22 15:43:36 cziegeler Exp $
+ * @version CVS $Id: MatchNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public class MatchNode extends SimpleSelectorProcessingNode
1.3 +3 -6 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
Index: MountNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MountNode.java 15 Mar 2002 10:51:11 -0000 1.2
+++ MountNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -52,9 +52,6 @@
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.sitemap.PatternException;
@@ -70,7 +67,7 @@
/**
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: MountNode.java,v 1.2 2002/03/15 10:51:11 sylvain Exp $
+ * @version CVS $Id: MountNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public class MountNode extends AbstractProcessingNode implements Composable {
@@ -141,11 +138,11 @@
}
private synchronized TreeProcessor getProcessor(Environment env, String source) throws Exception {
-
+
TreeProcessor processor = (TreeProcessor)processors.get(source);
if (processor == null) {
-
+
// Handle directory mounts
String actualSource;
if (source.charAt(source.length() - 1) == '/') {
1.3 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Index: PipelineNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipelineNode.java 22 Apr 2002 15:43:36 -0000 1.2
+++ PipelineNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -63,8 +63,6 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.components.notification.Notifying;
import org.apache.cocoon.components.notification.NotifyingBuilder;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
import org.apache.cocoon.components.treeprocessor.MapStackResolver;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
@@ -76,7 +74,7 @@
*
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: PipelineNode.java,v 1.2 2002/04/22 15:43:36 cziegeler Exp $
+ * @version CVS $Id: PipelineNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public class PipelineNode extends AbstractParentProcessingNode implements Composable {
1.4 +2 -4 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java
Index: PipelinesNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipelinesNode.java 27 Mar 2002 15:13:40 -0000 1.3
+++ PipelinesNode.java 29 Apr 2002 14:46:16 -0000 1.4
@@ -60,8 +60,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ForwardRedirector;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.components.treeprocessor.SimpleParentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
@@ -74,7 +72,7 @@
* Handles <map:pipelines>
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: PipelinesNode.java,v 1.3 2002/03/27 15:13:40 sylvain Exp $
+ * @version CVS $Id: PipelinesNode.java,v 1.4 2002/04/29 14:46:16 cziegeler Exp $
*/
public final class PipelinesNode extends SimpleParentProcessingNode
@@ -83,7 +81,7 @@
private static final String REDIRECTOR_ATTR = "sitemap:redirector";
private ComponentManager manager;
-
+
private Processor processor;
public PipelinesNode(Processor processor) {
1.3 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
Index: PreparableMatchNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreparableMatchNode.java 22 Apr 2002 15:43:36 -0000 1.2
+++ PreparableMatchNode.java 29 Apr 2002 14:46:16 -0000 1.3
@@ -51,8 +51,6 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.MapStackResolver;
@@ -73,7 +71,7 @@
/**
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: PreparableMatchNode.java,v 1.2 2002/04/22 15:43:36 cziegeler Exp $
+ * @version CVS $Id: PreparableMatchNode.java,v 1.3 2002/04/29 14:46:16 cziegeler Exp $
*/
public class PreparableMatchNode extends SimpleSelectorProcessingNode implements ParameterizableProcessingNode, Composable {
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org