cziegeler 2003/01/31 04:46:34
Modified: src/java/org/apache/cocoon/generation Tag:
cocoon_2_0_3_branch ScriptGenerator.java
XMLDBCollectionGenerator.java StatusGenerator.java
RequestGenerator.java VelocityGenerator.java
ServerPagesGenerator.java PhpGenerator.java
SessionAttributeGenerator.java XMLDBGenerator.java
StreamGenerator.java
src/java/org/apache/cocoon/components/source Tag:
cocoon_2_0_3_branch AbstractStreamSource.java
Log:
Organizing imports
Revision Changes Path
No revision
No revision
1.8.2.2 +7 -6
xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/ScriptGenerator.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- ScriptGenerator.java 16 Apr 2002 01:16:25 -0000 1.8.2.1
+++ ScriptGenerator.java 31 Jan 2003 12:46:32 -0000 1.8.2.2
@@ -50,9 +50,14 @@
*/
package org.apache.cocoon.generation;
+import java.io.FileNotFoundException;
+import java.io.Reader;
+import java.io.StringReader;
+
import com.ibm.bsf.BSFException;
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.util.IOUtils;
+
import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -62,10 +67,6 @@
import org.apache.cocoon.environment.Source;
import org.xml.sax.InputSource;
-import java.io.FileNotFoundException;
-import java.io.Reader;
-import java.io.StringReader;
-
/**
* The Scriptgenerator executes arbitraty scripts using the BSF framework
* and additional interpreter (Rhino, Jython, etc.) as a Cocoon Generator.
@@ -171,7 +172,7 @@
{
getLogger().debug("adding BSF language " +
this.additionalLanguages[i].name + " with engine " +
this.additionalLanguages[i].engineSrc);
- mgr.registerScriptingEngine(this.additionalLanguages[i].name,
+
BSFManager.registerScriptingEngine(this.additionalLanguages[i].name,
this.additionalLanguages[i].engineSrc,
this.additionalLanguages[i].extensions);
}
1.6.2.1 +4 -9
xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/XMLDBCollectionGenerator.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- XMLDBCollectionGenerator.java 23 Feb 2002 16:47:39 -0000 1.6
+++ XMLDBCollectionGenerator.java 31 Jan 2003 12:46:32 -0000 1.6.2.1
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -64,18 +67,10 @@
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.XMLResource;
-
-import java.io.IOException;
-import java.util.Map;
/**
* This class implements generation of a XML:DB collection
1.5.2.2 +12 -10
xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StatusGenerator.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- StatusGenerator.java 22 Oct 2002 03:53:45 -0000 1.5.2.1
+++ StatusGenerator.java 31 Jan 2003 12:46:32 -0000 1.5.2.2
@@ -50,22 +50,24 @@
*/
package org.apache.cocoon.generation;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-
-import org.apache.cocoon.components.store.StoreJanitor;
import org.apache.cocoon.components.store.Store;
-
+import org.apache.cocoon.components.store.StoreJanitor;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.text.DateFormat;
-import java.util.*;
/**
* Generates an XML representation of the current status of Cocoon.
1.6.2.2 +6 -8
xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- RequestGenerator.java 21 Nov 2002 15:06:49 -0000 1.6.2.1
+++ RequestGenerator.java 31 Jan 2003 12:46:32 -0000 1.6.2.2
@@ -50,22 +50,20 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Map;
+
import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
/**
* Generates an XML representation of the incoming request.
1.8.2.1 +13 -15
xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/VelocityGenerator.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- VelocityGenerator.java 22 Feb 2002 07:03:51 -0000 1.8
+++ VelocityGenerator.java 31 Jan 2003 12:46:32 -0000 1.8.2.1
@@ -50,6 +50,16 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
@@ -60,32 +70,20 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.log.Logger;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.log.Logger;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.log.LogSystem;
import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.runtime.log.LogSystem;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
/**
* <p>Cocoon {@link Generator} that produces dynamic XML SAX events
1.13.2.3 +5 -11
xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- ServerPagesGenerator.java 21 Sep 2002 02:26:07 -0000 1.13.2.2
+++ ServerPagesGenerator.java 31 Jan 2003 12:46:32 -0000 1.13.2.3
@@ -50,6 +50,10 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.avalon.excalibur.collections.ArrayStack;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -58,27 +62,17 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.avalon.excalibur.collections.ArrayStack;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.CompositeCacheValidity;
-import org.apache.cocoon.caching.ParametersCacheValidity;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.xml.AbstractXMLPipe;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
/**
* This class acts as a proxy to a dynamically loaded<code>Generator</code>
1.6.2.2 +13 -13
xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- PhpGenerator.java 21 Nov 2002 15:06:49 -0000 1.6.2.1
+++ PhpGenerator.java 31 Jan 2003 12:46:32 -0000 1.6.2.2
@@ -50,25 +50,25 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.Enumeration;
/**
* Allows PHP to be used as a generator. Builds upon the PHP servlet
1.1.2.3 +10 -15
xml-cocoon2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
Index: SessionAttributeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SessionAttributeGenerator.java 23 Oct 2002 03:42:22 -0000 1.1.2.2
+++ SessionAttributeGenerator.java 31 Jan 2003 12:46:32 -0000 1.1.2.3
@@ -50,25 +50,20 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.io.IOException;
+import java.util.Map;
-import org.apache.cocoon.components.language.markup.xsp.XSPObjectHelper;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.generation.AbstractGenerator;
-import org.apache.cocoon.xml.XMLizable;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.XMLUtils;
-import org.apache.cocoon.ProcessingException;
-
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.SAXException;
-
+import org.apache.cocoon.xml.XMLizable;
import org.w3c.dom.Node;
-
-import java.io.IOException;
-import java.util.Map;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* Generates a document from a session attribute. The attribute may be a DOM
1.6.2.1 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/Attic/XMLDBGenerator.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- XMLDBGenerator.java 23 Feb 2002 16:47:39 -0000 1.6
+++ XMLDBGenerator.java 31 Jan 2003 12:46:32 -0000 1.6.2.1
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -63,18 +66,11 @@
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
-
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
import org.xmldb.api.base.XMLDBException;
import org.xmldb.api.modules.XMLResource;
-
-import java.io.IOException;
-import java.util.Map;
/**
* This class implements generation of XML documents from a
1.8.2.3 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- StreamGenerator.java 19 May 2002 22:59:54 -0000 1.8.2.2
+++ StreamGenerator.java 31 Jan 2003 12:46:32 -0000 1.8.2.3
@@ -50,19 +50,18 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.http.HttpEnvironment;
-import javax.servlet.http.HttpServletRequest;
import org.apache.cocoon.util.PostInputStream;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.StringReader;
/**
*
No revision
No revision
1.2.2.3 +14 -24
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractStreamSource.java
Index: AbstractStreamSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractStreamSource.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- AbstractStreamSource.java 21 Sep 2002 02:21:37 -0000 1.2.2.2
+++ AbstractStreamSource.java 31 Jan 2003 12:46:33 -0000 1.2.2.3
@@ -55,38 +55,29 @@
package org.apache.cocoon.components.source;
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceUtil;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Document;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URLConnection;
-import java.net.URL;
-import java.util.Iterator;
import java.util.Properties;
+
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.cocoon.util.ClassUtils;
+import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
/**
* This abstract class provides convenience methods to implement
* a stream based Source. Implement getInputStream(), getSystemId() and
@@ -172,8 +163,7 @@
m = jtidyClass.getMethod("parseDOM", new Class[] {
Class.forName("java.io.InputStream"), Class.forName("java.io.OutputStream")});
final Document doc = (Document)m.invoke(xhtmlconvert, new Object[]
{ stream, null });
final StringWriter writer = new StringWriter();
- final Transformer transformer;
- transformer = transformerFactory.newTransformer();
+ final Transformer transformer = transformerFactory.newTransformer();
transformer.setOutputProperties(xmlProperties);
transformer.transform(new DOMSource(doc), new StreamResult(writer));
final String xmlstring = writer.toString();
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
