vgritsenko 2002/08/07 20:21:28
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
AggregateNode.java ComponentsSelector.java
HandleErrorsNode.java PipelineNode.java
SerializeNode.java
Log:
Rename internal components to shorten names and increase 'security'
(decorate name with <> instead of !!)
Revision Changes Path
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AggregateNode.java 24 Jun 2002 20:32:19 -0000 1.5
+++ AggregateNode.java 8 Aug 2002 03:21:28 -0000 1.6
@@ -126,7 +126,7 @@
// Setup aggregator
ProcessingPipeline processingPipeline =
context.getProcessingPipeline();
- processingPipeline.setGenerator("!content-aggregator!", null,
Parameters.EMPTY_PARAMETERS);
+ processingPipeline.setGenerator("<aggregator>", null,
Parameters.EMPTY_PARAMETERS);
ContentAggregator aggregator =
(ContentAggregator)processingPipeline.getGenerator();
aggregator.setRootElement(
1.3 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java
Index: ComponentsSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentsSelector.java 27 May 2002 11:12:13 -0000 1.2
+++ ComponentsSelector.java 8 Aug 2002 03:21:28 -0000 1.3
@@ -213,7 +213,7 @@
}
/**
- * Ensure system-defined components exist (e.g. !content-aggregator!)
and initialize
+ * Ensure system-defined components exist (e.g. <aggregator>) and
initialize
* the selector.
*/
public void initialize() /*throws Exception*/ {
@@ -227,15 +227,15 @@
// NOTE : checking this here means they can be user-defined in
the sitemap
switch(this.roleId) {
case GENERATOR :
- ensureExists("!notifying-generator!",
+ ensureExists("<notifier>",
org.apache.cocoon.sitemap.NotifyingGenerator.class,
emptyConfig);
- ensureExists("!content-aggregator!",
+ ensureExists("<aggregator>",
org.apache.cocoon.sitemap.ContentAggregator.class,
emptyConfig);
break;
case TRANSFORMER :
- ensureExists("!link-translator!",
+ ensureExists("<translator>",
org.apache.cocoon.sitemap.LinkTranslator.class,
emptyConfig);
break;
}
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Index: HandleErrorsNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandleErrorsNode.java 27 May 2002 13:14:52 -0000 1.2
+++ HandleErrorsNode.java 8 Aug 2002 03:21:28 -0000 1.3
@@ -96,7 +96,7 @@
getLogger().info("Processing handle-errors at " + getLocation());
}
-
context.getProcessingPipeline().setGenerator("!notifying-generator!", "",
Parameters.EMPTY_PARAMETERS);
+ context.getProcessingPipeline().setGenerator("<notifier>", "",
Parameters.EMPTY_PARAMETERS);
return invokeNodes(this.children, env, context);
}
1.13 +2 -2
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PipelineNode.java 31 Jul 2002 13:13:26 -0000 1.12
+++ PipelineNode.java 8 Aug 2002 03:21:28 -0000 1.13
@@ -215,7 +215,7 @@
// Add it to the object model
env.getObjectModel().put(Constants.NOTIFYING_OBJECT,
currentNotifying );
- // notifying-generator is added in HandleErrorsNode
+ // <notifier> is added in HandleErrorsNode
return node.invoke(env, errorContext);
} catch (Exception subEx) {
getLogger().error("Error notifier is unable to notify the
problem. Please check the logs. In the default webapp, look in the WEB-INF/logs
dir.", subEx);
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SerializeNode.java 15 Jul 2002 08:17:29 -0000 1.3
+++ SerializeNode.java 8 Aug 2002 03:21:28 -0000 1.4
@@ -123,7 +123,7 @@
// Perform link translation if requested
if (env.getObjectModel().containsKey(Constants.LINK_OBJECT)) {
context.getProcessingPipeline().addTransformer(
- "!link-translator!", null, Parameters.EMPTY_PARAMETERS
+ "<translator>", null, Parameters.EMPTY_PARAMETERS
);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
