cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r740554 [2/2] - in /cocoon/cocoon3/trunk: cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/ cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/ cocoon-optional/src/ma...
Date Wed, 04 Feb 2009 01:10:42 GMT
Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
Wed Feb  4 01:10:39 2009
@@ -24,14 +24,14 @@
 
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.SetupException;
-import org.apache.cocoon.pipeline.component.sax.AbstractSerializer;
-import org.apache.cocoon.pipeline.util.SaxBuffer;
 import org.apache.cocoon.pipeline.util.URLConnectionUtils;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXSerializer;
+import org.apache.cocoon.sax.util.SaxBuffer;
+import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.commons.io.IOUtils;
 import org.xml.sax.SAXException;
 
-public class ServletServiceSerializer extends AbstractSerializer {
+public class ServletServiceSerializer extends AbstractSAXSerializer {
 
     private URL service;
     private SaxBuffer saxBuffer = new SaxBuffer();

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
Wed Feb  4 01:10:39 2009
@@ -23,12 +23,12 @@
 import java.util.Map;
 
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.component.sax.AbstractTransformer;
-import org.apache.cocoon.pipeline.util.SaxBuffer;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXTransformer;
+import org.apache.cocoon.sax.util.SaxBuffer;
+import org.apache.cocoon.sax.util.XMLUtils;
 import org.xml.sax.SAXException;
 
-public class ServletServiceTransformer extends AbstractTransformer {
+public class ServletServiceTransformer extends AbstractSAXTransformer {
 
     private URL service;
     private URLConnection servletConnection;

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
(from r740223, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractReader.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java&p1=cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractReader.java&r1=740223&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractReader.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sitemap.component;
 
 import java.io.OutputStream;
 import java.net.URL;

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java
Wed Feb  4 01:10:39 2009
@@ -25,14 +25,14 @@
 
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.component.Starter;
-import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.sax.AbstractSAXProducer;
 import org.apache.cocoon.sitemap.util.ParameterHelper;
 import org.apache.cocoon.sitemap.xml.AttributesImpl;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
-public class ExceptionGenerator extends AbstractXMLProducer implements Starter {
+public class ExceptionGenerator extends AbstractSAXProducer implements Starter {
 
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy'
'HH:mm:ss' 'Z", Locale.US);
 

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
(from r740223, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/FileReaderComponent.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java&p1=cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/FileReaderComponent.java&r1=740223&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/FileReaderComponent.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sitemap.component;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
Wed Feb  4 01:10:39 2009
@@ -25,7 +25,7 @@
     class="org.apache.cocoon.sitemap.spring.PrototypePipelineComponentFactory">
   </bean>
 
-  <bean name="serializer:xhtml" class="org.apache.cocoon.pipeline.component.sax.XMLSerializer"
scope="prototype">
+  <bean name="serializer:xhtml" class="org.apache.cocoon.sax.component.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.pipeline.component.sax.XMLSerializer"
scope="prototype">
+  <bean name="serializer:xml" class="org.apache.cocoon.sax.component.XMLSerializer" scope="prototype">
     <property name="contentType" value="text/xml" />
     <property name="format">
       <props>
@@ -47,7 +47,7 @@
     </property>
   </bean>  
   
-  <bean name="serializer:html" class="org.apache.cocoon.pipeline.component.sax.XMLSerializer"
scope="prototype">
+  <bean name="serializer:html" class="org.apache.cocoon.sax.component.XMLSerializer" scope="prototype">
     <property name="contentType" value="text/html;charset=utf-8" />
     <property name="format">
       <props>
@@ -58,18 +58,17 @@
     </property>
   </bean>  
 
-  <bean name="generator:file" class="org.apache.cocoon.pipeline.component.sax.FileGenerator"
scope="prototype" />
+  <bean name="generator:file" class="org.apache.cocoon.sax.component.FileGenerator" scope="prototype"
/>
 
   <bean name="generator:exception" class="org.apache.cocoon.sitemap.component.ExceptionGenerator"
scope="prototype" />
 
-  <bean name="reader:file" class="org.apache.cocoon.pipeline.component.sax.FileReaderComponent"
scope="prototype" />
+  <bean name="transformer:xslt" class="org.apache.cocoon.sax.component.XSLTTransformer"
scope="prototype" />
 
-  <bean name="transformer:xslt" class="org.apache.cocoon.pipeline.component.sax.XSLTTransformer"
scope="prototype" />
+  <bean name="transformer:schema" class="org.apache.cocoon.sax.component.SchemaProcessorTransformer"
scope="prototype" />
 
-  <bean name="transformer:schema" class="org.apache.cocoon.pipeline.component.sax.SchemaProcessorTransformer"
scope="prototype" />
+  <bean name="transformer:include" class="org.apache.cocoon.sax.component.IncludeTransformer"
scope="prototype" />
 
-  <bean name="transformer:include" class="org.apache.cocoon.pipeline.component.sax.IncludeTransformer"
scope="prototype" />
-
-  <bean name="transformer:cleaning" class="org.apache.cocoon.pipeline.component.sax.CleaningTransformer"
scope="prototype" />
+  <bean name="transformer:cleaning" class="org.apache.cocoon.sax.component.CleaningTransformer"
scope="prototype" />
 
+  <bean name="reader:file" class="org.apache.cocoon.sitemap.component.FileReaderComponent"
scope="prototype" />
 </beans>



Mime
View raw message