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 2008/07/26 09:09:36 UTC
svn commit: r679961 - in /cocoon/whiteboard/corona/trunk:
corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/
corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/
corona-pipeline/src/main/java/org/apache/cocoon/corona...
Author: reinhard
Date: Sat Jul 26 00:09:34 2008
New Revision: 679961
URL: http://svn.apache.org/viewvc?rev=679961&view=rev
Log:
. move SAX components into own package
. remove SourceResolver interface and implementation (was a relict of pre-JNet times)
Added:
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java (contents, props changed)
- copied, changed from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractSerializer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java (contents, props changed)
- copied, changed from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractXMLProducer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CleaningTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java (contents, props changed)
- copied, changed from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/IncludeTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/StringGenerator.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/TraxErrorListener.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumerAdapter.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLProducer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java (contents, props changed)
- copied, changed from r677192, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTProcessorErrorListener.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java (contents, props changed)
- copied, changed from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTTransformer.java
Removed:
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractSerializer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractXMLProducer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CleaningTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/IncludeTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/StringGenerator.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/TraxErrorListener.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumerAdapter.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLProducer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTProcessorErrorListener.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTTransformer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/resource/
Modified:
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CachingPipelineComponent.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/AbstractXMLPipe.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/EmbeddedXMLPipe.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/IncludeXMLConsumer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/NullXMLConsumer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/SaxBuffer.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/StringRepresentation.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/TransformationUtils.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/URLConnectionUtils.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/XMLUtils.java
cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServiceConsumerGenerator.java
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceGenerator.java
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceSerializer.java
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceTransformer.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java Sat Jul 26 00:09:34 2008
@@ -30,25 +30,22 @@
/**
* <p>
* A pipeline expects one or more {@link PipelineComponent}s that passed by using
- * {@link #addComponent(PipelineComponent)}. Then these components get linked with
- * each other in the order they were added.
- * The {@link #setup(Map, OutputStream)} method, calls the setup method on
- * all pipeline components and assembles the pipeline.
- * Finally the {@link #execute()} method produces the result and writes it
- * to the {@link OutputStream} which has been passed to the {@link #setup(Map, OutputStream)}
- * method.
+ * {@link #addComponent(PipelineComponent)}. Then these components get linked with each other in the order they were
+ * added. The {@link #setup(Map, OutputStream)} method, calls the setup method on all pipeline components and assembles
+ * the pipeline. Finally the {@link #execute()} method produces the result and writes it to the {@link OutputStream}
+ * which has been passed to the {@link #setup(Map, OutputStream)} method.
* </p>
- *
+ *
* <p>
* A pipeline works based on two fundamental concepts:
- *
+ *
* <ul>
* <li>The first component of a pipeline is of type {@link Starter}. The last component is of type {@link Finisher}.
* </li>
* <li>In order to link components with each other, the first has to be a {@link Producer}, the latter
* {@link Consumer}. </li>
* </ul>
- *
+ *
* <p>
* When the pipeline links the components, it merely checks whether the above mentioned interfaces are present. So the
* pipeline does not know about the specific capabilities or the compatibility of the components. It is the
@@ -62,7 +59,7 @@
/**
* Add a {@link PipelineComponent} to the pipeline. The order of when the components are passed is significant.
- *
+ *
* @param pipelineComponent The {@link PipelineComponent}.
*/
void addComponent(PipelineComponent pipelineComponent);
@@ -70,24 +67,29 @@
/**
* After the pipeline has been prepared ({@link #addComponent(PipelineComponent)}, this method can be invoked in
* order to setup and initialize the pipeline and its components.
- *
+ *
* @param parameters A {@link Map} of parameters that are available to all {@link PipelineComponent}s.
*/
void setup(Map<String, Object> parameters, OutputStream outputStream);
/**
- * After the pipeline has been setup ({@link #setup(Map, OutputStream)}, this method can be invoked in
- * order to produce the result.
- *
+ * After the pipeline has been setup ({@link #setup(Map, OutputStream)}, this method can be invoked in order to
+ * produce the result.
+ *
* @throws Exception Any problem that might occur while processing the pipeline.
*/
void execute() throws Exception;
+ /**
+ * Get the mime-type {@link http://tools.ietf.org/html/rfc2046} of the content produced by the pipeline.
+ *
+ * @return The mime-type of the content.
+ */
String getContentType();
/**
* Get the time of the last modification.
- *
+ *
* @return The last modification date
*/
long getLastModified();
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CachingPipelineComponent.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CachingPipelineComponent.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CachingPipelineComponent.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CachingPipelineComponent.java Sat Jul 26 00:09:34 2008
@@ -18,7 +18,6 @@
*/
package org.apache.cocoon.corona.pipeline.component;
-
import org.apache.cocoon.corona.pipeline.caching.CacheKey;
public interface CachingPipelineComponent {
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java (from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractSerializer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractSerializer.java&r1=677971&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractSerializer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java Sat Jul 26 00:09:34 2008
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.OutputStream;
import java.util.Map;
+import org.apache.cocoon.corona.pipeline.component.Finisher;
+import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
import org.apache.cocoon.corona.pipeline.util.AbstractXMLPipe;
import org.apache.cocoon.corona.pipeline.util.StringRepresentation;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractSerializer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractTransformer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.util.ArrayList;
import java.util.List;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractTransformer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java (from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractXMLProducer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractXMLProducer.java&r1=677971&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/AbstractXMLProducer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java Sat Jul 26 00:09:34 2008
@@ -16,8 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
+import org.apache.cocoon.corona.pipeline.component.AbstractPipelineComponent;
+import org.apache.cocoon.corona.pipeline.component.Consumer;
+import org.apache.cocoon.corona.pipeline.component.Producer;
import org.apache.cocoon.corona.pipeline.util.StringRepresentation;
public abstract class AbstractXMLProducer extends AbstractPipelineComponent implements XMLProducer {
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/AbstractXMLProducer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CleaningTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CleaningTransformer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/CleaningTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java Sat Jul 26 00:09:34 2008
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import org.apache.cocoon.corona.pipeline.caching.CacheKey;
import org.apache.cocoon.corona.pipeline.caching.SimpleCacheKey;
+import org.apache.cocoon.corona.pipeline.component.CachingPipelineComponent;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.IOException;
import java.net.URL;
@@ -25,6 +25,8 @@
import org.apache.cocoon.corona.pipeline.caching.CacheKey;
import org.apache.cocoon.corona.pipeline.caching.TimestampCacheKey;
+import org.apache.cocoon.corona.pipeline.component.CachingPipelineComponent;
+import org.apache.cocoon.corona.pipeline.component.Starter;
import org.apache.cocoon.corona.pipeline.util.StringRepresentation;
import org.apache.cocoon.corona.pipeline.util.URLConnectionUtils;
import org.apache.commons.logging.Log;
@@ -83,7 +85,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.component.AbstractXMLProducer#setConfiguration(java.util.Map)
+ * @see org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer#setConfiguration(java.util.Map)
*/
@Override
public void setConfiguration(Map<String, ? extends Object> configuration) {
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileGenerator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java (from r677971, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java&r1=677971&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +27,11 @@
import org.apache.cocoon.corona.pipeline.caching.CacheKey;
import org.apache.cocoon.corona.pipeline.caching.TimestampCacheKey;
+import org.apache.cocoon.corona.pipeline.component.AbstractPipelineComponent;
+import org.apache.cocoon.corona.pipeline.component.CachingPipelineComponent;
+import org.apache.cocoon.corona.pipeline.component.Finisher;
+import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
+import org.apache.cocoon.corona.pipeline.component.Starter;
import org.apache.cocoon.corona.pipeline.util.URLConnectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/FileReaderComponent.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/IncludeTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/IncludeTransformer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/IncludeTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.BufferedInputStream;
import java.io.IOException;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/IncludeTransformer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/StringGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/StringGenerator.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/StringGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java Sat Jul 26 00:09:34 2008
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.ByteArrayInputStream;
+import org.apache.cocoon.corona.pipeline.component.Starter;
import org.apache.cocoon.corona.pipeline.util.StringRepresentation;
import org.apache.cocoon.corona.pipeline.util.XMLUtils;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/StringGenerator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/TraxErrorListener.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/TraxErrorListener.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/TraxErrorListener.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/TraxErrorListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java Sat Jul 26 00:09:34 2008
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
+import org.apache.cocoon.corona.pipeline.component.Consumer;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumerAdapter.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumerAdapter.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLConsumerAdapter.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLConsumerAdapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLProducer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLProducer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLProducer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
+
+import org.apache.cocoon.corona.pipeline.component.Producer;
public interface XMLProducer extends Producer {
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLProducer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java (from r677192, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java&r1=677192&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.io.OutputStream;
import java.util.Map;
@@ -31,6 +31,7 @@
import org.apache.cocoon.corona.pipeline.ProcessingException;
import org.apache.cocoon.corona.pipeline.caching.CacheKey;
import org.apache.cocoon.corona.pipeline.caching.SimpleCacheKey;
+import org.apache.cocoon.corona.pipeline.component.CachingPipelineComponent;
public class XMLSerializer extends AbstractSerializer implements CachingPipelineComponent {
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XMLSerializer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTProcessorErrorListener.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTProcessorErrorListener.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTProcessorErrorListener.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTProcessorErrorListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java (from r677021, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java?p2=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTTransformer.java&r1=677021&r2=679961&rev=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/XSLTTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java Sat Jul 26 00:09:34 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.pipeline.component.sax;
import java.net.URL;
import java.util.HashMap;
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/XSLTTransformer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/AbstractXMLPipe.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/AbstractXMLPipe.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/AbstractXMLPipe.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/AbstractXMLPipe.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
*/
package org.apache.cocoon.corona.pipeline.util;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumerAdapter;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumerAdapter;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/EmbeddedXMLPipe.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/EmbeddedXMLPipe.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/EmbeddedXMLPipe.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/EmbeddedXMLPipe.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
*/
package org.apache.cocoon.corona.pipeline.util;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/IncludeXMLConsumer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/IncludeXMLConsumer.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/IncludeXMLConsumer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/IncludeXMLConsumer.java Sat Jul 26 00:09:34 2008
@@ -16,7 +16,7 @@
*/
package org.apache.cocoon.corona.pipeline.util;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/NullXMLConsumer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/NullXMLConsumer.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/NullXMLConsumer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/NullXMLConsumer.java Sat Jul 26 00:09:34 2008
@@ -18,7 +18,7 @@
*/
package org.apache.cocoon.corona.pipeline.util;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/SaxBuffer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/SaxBuffer.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/SaxBuffer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/SaxBuffer.java Sat Jul 26 00:09:34 2008
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/StringRepresentation.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/StringRepresentation.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/StringRepresentation.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/StringRepresentation.java Sat Jul 26 00:09:34 2008
@@ -24,14 +24,15 @@
public static String buildString(Object instance, String... additionalOutputStrings) {
StringBuilder sb = new StringBuilder();
sb.append(instance.getClass().getSimpleName());
- sb.append("(hashCode=");
- sb.append(instance.hashCode());
+ sb.append("(hashCode=").append(instance.hashCode());
+
if (additionalOutputStrings != null) {
for (String outputString : additionalOutputStrings) {
sb.append(" ").append(outputString);
}
}
sb.append(")");
+
return sb.toString();
}
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/TransformationUtils.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/TransformationUtils.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/TransformationUtils.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/TransformationUtils.java Sat Jul 26 00:09:34 2008
@@ -24,9 +24,9 @@
import org.apache.cocoon.corona.pipeline.NonCachingPipeline;
import org.apache.cocoon.corona.pipeline.Pipeline;
-import org.apache.cocoon.corona.pipeline.component.StringGenerator;
-import org.apache.cocoon.corona.pipeline.component.XMLSerializer;
-import org.apache.cocoon.corona.pipeline.component.XSLTTransformer;
+import org.apache.cocoon.corona.pipeline.component.sax.StringGenerator;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLSerializer;
+import org.apache.cocoon.corona.pipeline.component.sax.XSLTTransformer;
/**
* This class contains utility methods to transform an XML string by using XSLT. It hides all the details of the Java
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/URLConnectionUtils.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/URLConnectionUtils.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/URLConnectionUtils.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/URLConnectionUtils.java Sat Jul 26 00:09:34 2008
@@ -21,7 +21,7 @@
import java.io.OutputStream;
import java.net.URLConnection;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/XMLUtils.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/XMLUtils.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/util/XMLUtils.java Sat Jul 26 00:09:34 2008
@@ -26,7 +26,7 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.cocoon.corona.pipeline.component.XMLConsumer;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLConsumer;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/java/org/apache/cocoon/corona/pipeline/PipelineTest.java Sat Jul 26 00:09:34 2008
@@ -22,10 +22,10 @@
import junit.framework.TestCase;
-import org.apache.cocoon.corona.pipeline.component.FileReaderComponent;
-import org.apache.cocoon.corona.pipeline.component.StringGenerator;
-import org.apache.cocoon.corona.pipeline.component.XMLSerializer;
-import org.apache.cocoon.corona.pipeline.component.XSLTTransformer;
+import org.apache.cocoon.corona.pipeline.component.sax.FileReaderComponent;
+import org.apache.cocoon.corona.pipeline.component.sax.StringGenerator;
+import org.apache.cocoon.corona.pipeline.component.sax.XMLSerializer;
+import org.apache.cocoon.corona.pipeline.component.sax.XSLTTransformer;
import org.custommonkey.xmlunit.Diff;
public class PipelineTest extends TestCase {
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java Sat Jul 26 00:09:34 2008
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.cocoon.corona.pipeline.component.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.component.Starter;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer;
import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
import org.apache.cocoon.corona.sitemap.InvocationException;
import org.xml.sax.SAXException;
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServiceConsumerGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServiceConsumerGenerator.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServiceConsumerGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServiceConsumerGenerator.java Sat Jul 26 00:09:34 2008
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.cocoon.corona.pipeline.ProcessingException;
-import org.apache.cocoon.corona.pipeline.component.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.component.Starter;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.util.XMLUtils;
import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceGenerator.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceGenerator.java Sat Jul 26 00:09:34 2008
@@ -19,8 +19,8 @@
import java.net.URL;
import java.util.Map;
-import org.apache.cocoon.corona.pipeline.component.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.component.Starter;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.util.URLConnectionUtils;
public class ServletServiceGenerator extends AbstractXMLProducer implements Starter {
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceSerializer.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceSerializer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceSerializer.java Sat Jul 26 00:09:34 2008
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.cocoon.corona.pipeline.ProcessingException;
-import org.apache.cocoon.corona.pipeline.component.AbstractSerializer;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractSerializer;
import org.apache.cocoon.corona.pipeline.util.SaxBuffer;
import org.apache.cocoon.corona.pipeline.util.URLConnectionUtils;
import org.apache.cocoon.corona.pipeline.util.XMLUtils;
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceTransformer.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/ServletServiceTransformer.java Sat Jul 26 00:09:34 2008
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.cocoon.corona.pipeline.ProcessingException;
-import org.apache.cocoon.corona.pipeline.component.AbstractTransformer;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractTransformer;
import org.apache.cocoon.corona.pipeline.util.SaxBuffer;
import org.apache.cocoon.corona.pipeline.util.URLConnectionUtils;
import org.apache.cocoon.corona.pipeline.util.XMLUtils;
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java Sat Jul 26 00:09:34 2008
@@ -18,8 +18,6 @@
*/
package org.apache.cocoon.corona.sitemap;
-import java.net.URL;
-
import org.apache.cocoon.corona.pipeline.Pipeline;
import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
import org.apache.cocoon.corona.sitemap.action.Action;
@@ -34,6 +32,4 @@
Pipeline createPipeline(String type);
LanguageInterpreter getLanguageInterpreter(String language);
-
- URL resolve(String resource);
}
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java Sat Jul 26 00:09:34 2008
@@ -18,11 +18,8 @@
*/
package org.apache.cocoon.corona.sitemap;
-import java.net.URL;
-
import org.apache.cocoon.corona.pipeline.Pipeline;
import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
-import org.apache.cocoon.corona.pipeline.resource.ResourceResolver;
import org.apache.cocoon.corona.sitemap.action.Action;
import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory;
@@ -38,8 +35,6 @@
private PipelineFactory pipelineFactory;
- private ResourceResolver resourceResolver;
-
private LanguageInterpreterFactory languageInterpreterFactory;
/**
@@ -73,15 +68,6 @@
return this.languageInterpreterFactory.getLanguageInterpreter(language);
}
- /**
- * {@inheritDoc}
- *
- * @see org.apache.cocoon.corona.sitemap.ComponentProvider#resolve(java.lang.String)
- */
- public URL resolve(String resource) {
- return this.resourceResolver.resolve(resource);
- }
-
public void setActionFactory(ActionFactory actionFactory) {
this.actionFactory = actionFactory;
}
@@ -97,8 +83,4 @@
public void setPipelineFactory(PipelineFactory pipelineFactory) {
this.pipelineFactory = pipelineFactory;
}
-
- public void setResourceResolver(ResourceResolver resourceResolver) {
- this.resourceResolver = resourceResolver;
- }
}
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java Sat Jul 26 00:09:34 2008
@@ -20,8 +20,8 @@
import java.io.StringWriter;
import java.util.Map;
-import org.apache.cocoon.corona.pipeline.component.AbstractXMLProducer;
import org.apache.cocoon.corona.pipeline.component.Starter;
+import org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer;
import org.apache.cocoon.corona.sitemap.util.ParameterHelper;
import org.apache.cocoon.corona.sitemap.xml.AttributesImpl;
import org.xml.sax.Attributes;
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml?rev=679961&r1=679960&r2=679961&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml Sat Jul 26 00:09:34 2008
@@ -25,7 +25,7 @@
class="org.apache.cocoon.corona.sitemap.spring.PrototypePipelineComponentFactory">
</bean>
- <bean name="serializer:xhtml" class="org.apache.cocoon.corona.pipeline.component.XMLSerializer" scope="prototype">
+ <bean name="serializer:xhtml" class="org.apache.cocoon.corona.pipeline.component.sax.XMLSerializer" scope="prototype">
<property name="contentType" value="text/html;charset=utf-8" />
<property name="format">
<props>
@@ -37,7 +37,7 @@
</property>
</bean>
- <bean name="serializer:xml" class="org.apache.cocoon.corona.pipeline.component.XMLSerializer" scope="prototype">
+ <bean name="serializer:xml" class="org.apache.cocoon.corona.pipeline.component.sax.XMLSerializer" scope="prototype">
<property name="contentType" value="text/xml" />
<property name="format">
<props>
@@ -47,16 +47,16 @@
</property>
</bean>
- <bean name="generator:file" class="org.apache.cocoon.corona.pipeline.component.FileGenerator" scope="prototype" />
+ <bean name="generator:file" class="org.apache.cocoon.corona.pipeline.component.sax.FileGenerator" scope="prototype" />
<bean name="generator:exception" class="org.apache.cocoon.corona.sitemap.component.ExceptionGenerator" scope="prototype" />
- <bean name="reader:file" class="org.apache.cocoon.corona.pipeline.component.FileReaderComponent" scope="prototype" />
+ <bean name="reader:file" class="org.apache.cocoon.corona.pipeline.component.sax.FileReaderComponent" scope="prototype" />
- <bean name="transformer:xslt" class="org.apache.cocoon.corona.pipeline.component.XSLTTransformer" scope="prototype" />
+ <bean name="transformer:xslt" class="org.apache.cocoon.corona.pipeline.component.sax.XSLTTransformer" scope="prototype" />
- <bean name="transformer:include" class="org.apache.cocoon.corona.pipeline.component.IncludeTransformer" scope="prototype" />
+ <bean name="transformer:include" class="org.apache.cocoon.corona.pipeline.component.sax.IncludeTransformer" scope="prototype" />
- <bean name="transformer:cleaning" class="org.apache.cocoon.corona.pipeline.component.CleaningTransformer" scope="prototype" />
+ <bean name="transformer:cleaning" class="org.apache.cocoon.corona.pipeline.component.sax.CleaningTransformer" scope="prototype" />
</beans>