svn commit: r1450156 - in /cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder: LinkedSAXPipelineComponentBuilder.java LinkedSAXPipelineComponentBuilderImpl.java
[email protected] Tue, 26 Feb 2013 12:53:26 -0000
Newsgroups
gmane.text.xml.cocoon.cvs
Message-ID
<[email protected] >
Author: ilgrosso
Date: Tue Feb 26 12:53:26 2013
New Revision: 1450156
URL: http://svn.apache.org/r1450156
Log:
[COCOON3-70] #resolve
Modified:
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java?rev=1450156&r1=1450155&r2=1450156&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java Tue Feb 26 12:53:26 2013
@@ -26,11 +26,6 @@ import javax.xml.transform.Source;
import org.apache.cocoon.pipeline.builder.LinkedPipelineConfigurationBuilder;
import org.apache.cocoon.sax.SAXPipelineComponent;
-/**
- *
- *
- * @version $Id$
- */
public interface LinkedSAXPipelineComponentBuilder {
LinkedSAXPipelineComponentBuilder addCleaningTransformer();
@@ -45,8 +40,8 @@ public interface LinkedSAXPipelineCompon
LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append) throws IOException;
- LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, String datePattern) throws
- IOException;
+ LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, String datePattern)
+ throws IOException;
LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, SimpleDateFormat dateFormat)
throws IOException;
@@ -63,11 +58,23 @@ public interface LinkedSAXPipelineCompon
LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL url, Map<String, Object> attributes);
+ LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(URL url,
+ Map<String, ? extends Object> parameters);
+
+ LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(URL url, Map<String, Object> attributes,
+ Map<String, ? extends Object> parameters);
+
LinkedSAXPipelineComponentBuilder addXSLTTransformer(Source source, long lastModified);
LinkedSAXPipelineComponentBuilder addXSLTTransformer(Source source, long lastModified,
Map<String, Object> attributes);
+ LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(Source source, long lastModified,
+ Map<String, ? extends Object> parameters);
+
+ LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(Source source, long lastModified,
+ Map<String, Object> attributes, Map<String, ? extends Object> parameters);
+
<SPC extends SAXPipelineComponent> LinkedSAXPipelineComponentBuilder addComponent(SPC pipelineComponent);
LinkedPipelineConfigurationBuilder<SAXPipelineComponent> addSerializer();
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java?rev=1450156&r1=1450155&r2=1450156&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java Tue Feb 26 12:53:26 2013
@@ -38,10 +38,6 @@ import org.apache.cocoon.sax.component.X
import org.apache.cocoon.sax.component.XMLSerializer;
import org.apache.cocoon.sax.component.XSLTTransformer;
-/**
- *
- * @version $Id$
- */
public final class LinkedSAXPipelineComponentBuilderImpl implements LinkedSAXPipelineComponentBuilder {
private final Pipeline<SAXPipelineComponent> pipeline;
@@ -189,6 +185,28 @@ public final class LinkedSAXPipelineComp
* {@inheritDoc}
*/
@Override
+ public LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(final URL url,
+ final Map<String, ? extends Object> parameters) {
+
+ return this.addXSLTTransformerWithParameters(url, null, parameters);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(final URL url,
+ final Map<String, Object> attributes, final Map<String, ? extends Object> parameters) {
+
+ final XSLTTransformer xslt = new XSLTTransformer(url, attributes);
+ xslt.setParameters(parameters);
+ return this.addComponent(xslt);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public LinkedSAXPipelineComponentBuilder addXSLTTransformer(final Source source, final long lastModified) {
return this.addXSLTTransformer(source, lastModified, null);
}
@@ -207,6 +225,29 @@ public final class LinkedSAXPipelineComp
* {@inheritDoc}
*/
@Override
+ public LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(final Source source,
+ final long lastModified, final Map<String, ? extends Object> parameters) {
+
+ return this.addXSLTTransformerWithParameters(source, lastModified, null, parameters);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public LinkedSAXPipelineComponentBuilder addXSLTTransformerWithParameters(final Source source,
+ final long lastModified, final Map<String, Object> attributes,
+ final Map<String, ? extends Object> parameters) {
+
+ final XSLTTransformer xslt = new XSLTTransformer(source, lastModified, attributes);
+ xslt.setParameters(parameters);
+ return this.addComponent(xslt);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public <SPC extends SAXPipelineComponent> LinkedSAXPipelineComponentBuilder addComponent(
final SPC pipelineComponent) {