vgritsenko 2002/08/07 20:21:28
Modified:
src/java/org/apache/cocoon/components/language/markup/sitemap/java
Tag: cocoon_2_0_3_branch sitemap.xsl
src/java/org/apache/cocoon/components/treeprocessor/sitemap
Tag: cocoon_2_0_3_branch 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
No revision
No revision
1.11.2.5 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- sitemap.xsl 27 Jun 2002 18:52:01 -0000 1.11.2.4
+++ sitemap.xsl 8 Aug 2002 03:21:28 -0000 1.11.2.5
@@ -305,9 +305,9 @@
try {
<!-- configure well known components first -->
- load_component (Sitemap.GENERATOR, "!notifying-generator!",
"org.apache.cocoon.sitemap.NotifyingGenerator", new DefaultConfiguration("",
LOCATION), null);
- load_component (Sitemap.GENERATOR, "!content-aggregator!",
"org.apache.cocoon.sitemap.ContentAggregator", new DefaultConfiguration("",
LOCATION), null);
- load_component (Sitemap.TRANSFORMER, "!link-translator!",
"org.apache.cocoon.sitemap.LinkTranslator", new DefaultConfiguration("",
LOCATION), null);
+ load_component (Sitemap.GENERATOR, "<notifier>",
"org.apache.cocoon.sitemap.NotifyingGenerator", new DefaultConfiguration("",
LOCATION), null);
+ load_component (Sitemap.GENERATOR, "<aggregator>",
"org.apache.cocoon.sitemap.ContentAggregator", new DefaultConfiguration("",
LOCATION), null);
+ load_component (Sitemap.TRANSFORMER, "<translator>",
"org.apache.cocoon.sitemap.LinkTranslator", new DefaultConfiguration("",
LOCATION), null);
Configurer configurer = new Configurer(this, LOCATION);
configurer.configGenerators();
@@ -797,7 +797,7 @@
if (debug_enabled) getLogger().debug("Built " +
currentNotifying);
objectModel.put(Constants.NOTIFYING_OBJECT, currentNotifying );
if (debug_enabled) getLogger().debug("Added to objectModel" +
currentNotifying);
- eventPipeline.setGenerator ("!notifying-generator!",
e.getMessage(), Parameters.EMPTY_PARAMETERS);
+ eventPipeline.setGenerator ("<notifier>",
e.getMessage(), Parameters.EMPTY_PARAMETERS);
<xsl:apply-templates/>
} catch (Exception ex) {
@@ -1402,7 +1402,7 @@
<!-- generate the code to match a aggregate definition -->
<xsl:template match="map:aggregate">
<xsl:call-template name="setup-component">
- <xsl:with-param
name="default-component">!content-aggregator!</xsl:with-param>
+ <xsl:with-param
name="default-component"><aggregator></xsl:with-param>
<xsl:with-param
name="method">eventPipeline.setGenerator</xsl:with-param>
<xsl:with-param name="prefix">aggregator</xsl:with-param>
</xsl:call-template>
@@ -1641,7 +1641,7 @@
</xsl:for-each>
// performing link translation
if (environment.getObjectModel().containsKey(Constants.LINK_OBJECT))
{
- eventPipeline.addTransformer ("!link-translator!", null,
Parameters.EMPTY_PARAMETERS);
+ eventPipeline.addTransformer ("<translator>", null,
Parameters.EMPTY_PARAMETERS);
}
</xsl:if>
</xsl:if>
No revision
No revision
1.3.2.1 +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.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- AggregateNode.java 22 Mar 2002 22:26:13 -0000 1.3
+++ AggregateNode.java 8 Aug 2002 03:21:28 -0000 1.3.2.1
@@ -126,7 +126,7 @@
// Setup aggregator
EventPipeline eventPipeline = context.getEventPipeline();
- eventPipeline.setGenerator("!content-aggregator!", null,
Parameters.EMPTY_PARAMETERS);
+ eventPipeline.setGenerator("<aggregator>", null,
Parameters.EMPTY_PARAMETERS);
ContentAggregator aggregator =
(ContentAggregator)eventPipeline.getGenerator();
aggregator.setRootElement(
1.1.2.1 +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.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ComponentsSelector.java 5 Mar 2002 08:26:23 -0000 1.1
+++ ComponentsSelector.java 8 Aug 2002 03:21:28 -0000 1.1.2.1
@@ -208,7 +208,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*/ {
@@ -222,15 +222,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.1.2.1 +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.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- HandleErrorsNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ HandleErrorsNode.java 8 Aug 2002 03:21:28 -0000 1.1.2.1
@@ -96,7 +96,7 @@
getLogger().info("Processing handle-errors at " + getLocation());
}
- context.getEventPipeline().setGenerator("!notifying-generator!", "",
Parameters.EMPTY_PARAMETERS);
+ context.getEventPipeline().setGenerator("<notifier>", "",
Parameters.EMPTY_PARAMETERS);
return invokeNodes(this.children, env, context);
}
1.1.2.2 +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.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PipelineNode.java 17 Jun 2002 01:21:18 -0000 1.1.2.1
+++ PipelineNode.java 8 Aug 2002 03:21:28 -0000 1.1.2.2
@@ -204,7 +204,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) {
1.1.2.1 +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.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SerializeNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ SerializeNode.java 8 Aug 2002 03:21:28 -0000 1.1.2.1
@@ -119,7 +119,7 @@
// Perform link translation if requested
if (env.getObjectModel().containsKey(Constants.LINK_OBJECT)) {
context.getEventPipeline().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]
