cziegeler 2003/10/26 23:29:32
Modified: src/java/org/apache/cocoon/generation
LinkStatusGenerator.java ServletGenerator.java
JXTemplateGenerator.java
SessionAttributeGenerator.java Generator.java
StatusGenerator.java MP3DirectoryGenerator.java
ImageDirectoryGenerator.java AbstractGenerator.java
DirectoryGenerator.java FileGenerator.java
StreamGenerator.java AbstractServerPage.java
RequestGenerator.java ServerPagesGenerator.java
Log:
Organizing imports
Revision Changes Path
1.6 +21 -22
cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkStatusGenerator.java 22 Oct 2003 18:02:29 -0000 1.5
+++ LinkStatusGenerator.java 27 Oct 2003 07:29:31 -0000 1.6
@@ -50,35 +50,34 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.util.Tokenizer;
+import org.apache.excalibur.mpool.Resettable;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-import org.apache.excalibur.mpool.Resettable;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URLConnection;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* Generates a list of links that are reachable from the src and their
status.
*
@@ -207,8 +206,8 @@
private String linkContentType = LINK_CONTENT_TYPE_DEFAULT;
private HashSet excludeCrawlingURL;
private HashSet includeCrawlingURL;
- private String userAgent = USER_AGENT_DEFAULT;
- private String accept = ACCEPT_DEFAULT;
+// private String userAgent = USER_AGENT_DEFAULT;
+// private String accept = ACCEPT_DEFAULT;
private HashSet crawled;
private HashSet linksToProcess;
@@ -322,7 +321,7 @@
}
}
- child = configuration.getChild(USER_AGENT_CONFIG, false);
+/* child = configuration.getChild(USER_AGENT_CONFIG, false);
if (child != null) {
value = child.getValue();
if (value != null && value.length() > 0) {
@@ -336,7 +335,7 @@
if (value != null && value.length() > 0) {
this.accept = value;
}
- }
+ }*/
}
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
1.5 +4 -6
cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletGenerator.java 22 Oct 2003 18:02:29 -0000 1.4
+++ ServletGenerator.java 27 Oct 2003 07:29:31 -0000 1.5
@@ -50,19 +50,17 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.io.IOException;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.Map;
/**
*
1.14 +6 -8
cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JXTemplateGenerator.java 22 Oct 2003 18:02:29 -0000 1.13
+++ JXTemplateGenerator.java 27 Oct 2003 07:29:31 -0000 1.14
@@ -57,12 +57,12 @@
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -100,8 +100,6 @@
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.LocatorImpl;
-import java.util.*;
-import java.text.*;
/**
* <p>(<em>JX</em> for <a
href="http://jakarta.apache.org/commons/jxpath";>Apache <em>JX</em>Path</a>
1.4 +5 -5
cocoon-2.2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
Index: SessionAttributeGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/SessionAttributeGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionAttributeGenerator.java 8 Oct 2003 12:38:58 -0000 1.3
+++ SessionAttributeGenerator.java 27 Oct 2003 07:29:31 -0000 1.4
@@ -50,21 +50,21 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.XMLUtils;
import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Generates a document from a session attribute. The attribute may be a DOM
1.3 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/generation/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/Generator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Generator.java 3 Sep 2003 13:38:39 -0000 1.2
+++ Generator.java 27 Oct 2003 07:29:31 -0000 1.3
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLProducer;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
/**
* A generator is the starting point of a pipeline. It "generates" XML
1.3 +11 -6
cocoon-2.2/src/java/org/apache/cocoon/generation/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/StatusGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatusGenerator.java 3 Sep 2003 15:00:56 -0000 1.2
+++ StatusGenerator.java 27 Oct 2003 07:29:31 -0000 1.3
@@ -50,6 +50,16 @@
*/
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.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.store.Store;
@@ -58,11 +68,6 @@
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.4 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
Index: MP3DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MP3DirectoryGenerator.java 5 Jul 2003 04:33:57 -0000 1.3
+++ MP3DirectoryGenerator.java 27 Oct 2003 07:29:31 -0000 1.4
@@ -50,11 +50,11 @@
*/
package org.apache.cocoon.generation;
-import org.xml.sax.SAXException;
-
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
+
+import org.xml.sax.SAXException;
/**
* An extension of DirectoryGenerators that adds extra attributes for MP3
1.2 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageDirectoryGenerator.java 9 Mar 2003 00:09:31 -0000 1.1
+++ ImageDirectoryGenerator.java 27 Oct 2003 07:29:31 -0000 1.2
@@ -57,7 +57,6 @@
import org.apache.cocoon.util.FileFormatException;
import org.apache.cocoon.util.ImageProperties;
import org.apache.cocoon.util.ImageUtils;
-
import org.xml.sax.SAXException;
/**
1.4 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractGenerator.java 22 Oct 2003 18:02:29 -0000 1.3
+++ AbstractGenerator.java 27 Oct 2003 07:29:31 -0000 1.4
@@ -50,14 +50,14 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.Map;
/**
* An abstract class that can be used to implement an own generator.
1.11 +8 -14
cocoon-2.2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DirectoryGenerator.java 22 Oct 2003 18:02:29 -0000 1.10
+++ DirectoryGenerator.java 27 Oct 2003 07:29:31 -0000 1.11
@@ -50,6 +50,13 @@
*/
package org.apache.cocoon.generation;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -63,19 +70,6 @@
import org.apache.regexp.RESyntaxException;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.Arrays;
-import java.util.Comparator;
/**
* Generates an XML directory listing.
1.7 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileGenerator.java 22 Oct 2003 18:02:29 -0000 1.6
+++ FileGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -59,9 +62,6 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.Map;
/**
*
1.7 +6 -6
cocoon-2.2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StreamGenerator.java 22 Oct 2003 18:02:29 -0000 1.6
+++ StreamGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
@@ -50,6 +50,11 @@
*/
package org.apache.cocoon.generation;
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -59,11 +64,6 @@
import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.IOException;
-import java.io.StringReader;
/**
*
1.6 +3 -9
cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractServerPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractServerPage.java 22 Oct 2003 18:02:29 -0000 1.5
+++ AbstractServerPage.java 27 Oct 2003 07:29:31 -0000 1.6
@@ -50,22 +50,16 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.component.Recomposable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
+import java.io.File;
+import java.io.Serializable;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.environment.Request;
-
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.File;
-import java.io.Serializable;
/**
* Base implementation of <code>ServerPagesGenerator</code>. This class
1.8 +2 -2
cocoon-2.2/src/java/org/apache/cocoon/generation/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestGenerator.java 25 Sep 2003 17:20:19 -0000 1.7
+++ RequestGenerator.java 27 Oct 2003 07:29:31 -0000 1.8
@@ -64,8 +64,8 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.XMLUtils;
import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.7 +7 -9
cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerPagesGenerator.java 22 Oct 2003 18:02:29 -0000 1.6
+++ ServerPagesGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
@@ -50,16 +50,17 @@
*/
package org.apache.cocoon.generation;
-import org.apache.commons.collections.ArrayStack;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -67,15 +68,12 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.AbstractXMLPipe;
+import org.apache.commons.collections.ArrayStack;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
/**
* This class acts as a proxy to a dynamically loaded<code>Generator</code>
