You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2012/01/19 08:56:59 UTC
svn commit: r1233235 - in
/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src:
main/java/org/apache/cocoon/sax/builder/
main/java/org/apache/cocoon/sax/component/ test/java/org/apache/cocoon/sax/
test/java/org/apache/cocoon/sax/component/
Author: reinhard
Date: Thu Jan 19 07:56:58 2012
New Revision: 1233235
URL: http://svn.apache.org/viewvc?rev=1233235&view=rev
Log:
only keep a few components for our experiments
Removed:
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/AbstractLinkRewriterTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/I18nTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/LinkRewriterException.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/LogAsXMLTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/LogTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/RegexpLinkRewriterTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TextSerializer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/VariableExpanderTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/SchemaProcessorTransformerTest.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/I18NTransformerTest.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/LinkRewriterTransformerTest.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/LogAsXMLTransformerTestCase.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/LogTransformerTestCase.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/TextSerializerTest.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/VariableExpanderTransformerTestCase.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/test/java/org/apache/cocoon/sax/component/XIncludeTransformerTest.java
Modified:
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java?rev=1233235&r1=1233234&r2=1233235&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilder.java Thu Jan 19 07:56:58 2012
@@ -16,44 +16,19 @@
*/
package org.apache.cocoon.sax.builder;
-import java.io.File;
-import java.io.IOException;
import java.net.URL;
-import java.text.SimpleDateFormat;
import java.util.Map;
import org.apache.cocoon.pipeline.builder.LinkedPipelineConfigurationBuilder;
import org.apache.cocoon.sax.SAXPipelineComponent;
/**
- *
- *
* @version $Id$
*/
public interface LinkedSAXPipelineComponentBuilder {
LinkedSAXPipelineComponentBuilder addCleaningTransformer();
- LinkedSAXPipelineComponentBuilder addIncludeTransformer();
-
- LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer();
-
- LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer(File logFile);
-
- LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile) throws IOException;
-
- LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append) throws IOException;
-
- LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, String datePattern) throws IOException;
-
- LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, SimpleDateFormat dateFormat) throws IOException;
-
- LinkedSAXPipelineComponentBuilder addSchemaProcessorTransformer(URL source);
-
- LinkedSAXPipelineComponentBuilder addXIncludeTransformer();
-
- LinkedSAXPipelineComponentBuilder addXIncludeTransformer(URL baseUrl);
-
LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL source);
LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL source, Map<String, Object> attributes);
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java?rev=1233235&r1=1233234&r2=1233235&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-sax/src/main/java/org/apache/cocoon/sax/builder/LinkedSAXPipelineComponentBuilderImpl.java Thu Jan 19 07:56:58 2012
@@ -16,11 +16,8 @@
*/
package org.apache.cocoon.sax.builder;
-import java.io.File;
-import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
-import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Map;
@@ -29,17 +26,10 @@ import org.apache.cocoon.pipeline.builde
import org.apache.cocoon.pipeline.builder.LinkedPipelineSetupBuilder;
import org.apache.cocoon.sax.SAXPipelineComponent;
import org.apache.cocoon.sax.component.CleaningTransformer;
-import org.apache.cocoon.sax.component.IncludeTransformer;
-import org.apache.cocoon.sax.component.LogAsXMLTransformer;
-import org.apache.cocoon.sax.component.LogTransformer;
-import org.apache.cocoon.sax.component.SchemaProcessorTransformer;
-import org.apache.cocoon.sax.component.XIncludeTransformer;
import org.apache.cocoon.sax.component.XMLSerializer;
import org.apache.cocoon.sax.component.XSLTTransformer;
/**
- *
- *
* @version $Id$
*/
public final class LinkedSAXPipelineComponentBuilderImpl implements LinkedSAXPipelineComponentBuilder {
@@ -60,92 +50,6 @@ public final class LinkedSAXPipelineComp
/**
* {@inheritDoc}
*/
- public LinkedSAXPipelineComponentBuilder addIncludeTransformer() {
- return this.addComponent(new IncludeTransformer());
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer() {
- return this.addComponent(new LogAsXMLTransformer());
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogAsXMLTransformer(File logFile) {
- if (logFile == null) {
- throw new IllegalArgumentException("Parameter 'logFile' must be not null");
- }
- return this.addComponent(new LogAsXMLTransformer(logFile));
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile) throws IOException {
- return this.addLogTransformer(logFile, false);
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append) throws IOException {
- return this.addLogTransformer(logFile, append, "yyyy-MM-dd'T'hh:mm:ss");
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, String datePattern) throws IOException {
- if (datePattern == null) {
- throw new IllegalArgumentException("Parameter 'datePattern' must be not null");
- }
- return this.addLogTransformer(logFile, append, new SimpleDateFormat(datePattern));
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addLogTransformer(File logFile, boolean append, SimpleDateFormat dateFormat) throws IOException {
- if (logFile == null) {
- throw new IllegalArgumentException("Parameter 'logFile' must be not null");
- }
- if (dateFormat == null) {
- throw new IllegalArgumentException("Parameter 'dateFormat' must be not null");
- }
- return this.addComponent(new LogTransformer(logFile, append, dateFormat));
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addSchemaProcessorTransformer(URL source) {
- if (source == null) {
- throw new IllegalArgumentException("Parameter 'source' must be not null");
- }
- return this.addComponent(new SchemaProcessorTransformer(source));
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addXIncludeTransformer() {
- return this.addXIncludeTransformer(null);
- }
-
- /**
- * {@inheritDoc}
- */
- public LinkedSAXPipelineComponentBuilder addXIncludeTransformer(URL baseUrl) {
- // baseUrl can be null, but only if documents don't have relative paths inside
- return this.addComponent(new XIncludeTransformer(baseUrl));
- }
-
- /**
- * {@inheritDoc}
- */
public LinkedSAXPipelineComponentBuilder addXSLTTransformer(URL source) {
return this.addXSLTTransformer(source, null);
}
@@ -205,5 +109,4 @@ public final class LinkedSAXPipelineComp
};
}
-
}