You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2002/12/05 10:48:54 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp SOAPHelper.java XSPSessionHelper.java XSPResponseHelper.java XSPUtil.java JSGenerator.java
cziegeler 2002/12/05 01:48:54
Modified: src/java/org/apache/cocoon/components/language/markup
Logicsheet.java NamedLogicsheet.java
src/java/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java GeneratorSelector.java
src/java/org/apache/cocoon/components/language/markup/xsp
SOAPHelper.java XSPSessionHelper.java
XSPResponseHelper.java XSPUtil.java
JSGenerator.java
Log:
Removing unused imports
Revision Changes Path
1.16 +6 -8 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Logicsheet.java 31 Jul 2002 13:13:23 -0000 1.15
+++ Logicsheet.java 5 Dec 2002 09:48:53 -0000 1.16
@@ -50,18 +50,16 @@
*/
package org.apache.cocoon.components.language.markup;
+import org.apache.avalon.excalibur.xml.xslt.XSLTProcessor;
+import org.apache.avalon.excalibur.xml.xslt.XSLTProcessorException;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-import org.apache.avalon.excalibur.xml.xslt.XSLTProcessor;
-import org.apache.avalon.excalibur.xml.xslt.XSLTProcessorException;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
@@ -69,9 +67,9 @@
import org.xml.sax.helpers.XMLFilterImpl;
import javax.xml.transform.sax.TransformerHandler;
+
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URL;
import java.util.HashMap;
import java.util.Map;
1.11 +2 -4 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java
Index: NamedLogicsheet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamedLogicsheet.java 29 Apr 2002 12:53:17 -0000 1.10
+++ NamedLogicsheet.java 5 Dec 2002 09:48:53 -0000 1.11
@@ -52,13 +52,11 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceException;
-
+import org.apache.excalibur.source.SourceResolver;
import org.xml.sax.SAXException;
import java.io.IOException;
-import java.net.MalformedURLException;
/**
* An extension to <code>Logicsheet</code> that is associated with a namespace.
1.23 +7 -9 xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ProgramGeneratorImpl.java 21 Sep 2002 02:13:21 -0000 1.22
+++ ProgramGeneratorImpl.java 5 Dec 2002 09:48:53 -0000 1.23
@@ -51,37 +51,35 @@
package org.apache.cocoon.components.language.generator;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.Parameterizable;
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.thread.ThreadSafe;
-import org.apache.excalibur.source.Source;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.markup.MarkupLanguage;
import org.apache.cocoon.components.language.programming.CodeFormatter;
-import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.language.programming.Program;
+import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.IOUtils;
+import org.apache.excalibur.source.Source;
import org.xml.sax.InputSource;
import java.io.File;
import java.net.MalformedURLException;
-import java.util.Date;
/**
* The default implementation of <code>ProgramGenerator</code>
1.14 +5 -6 xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GeneratorSelector.java 27 Sep 2002 16:27:37 -0000 1.13
+++ GeneratorSelector.java 5 Dec 2002 09:48:53 -0000 1.14
@@ -52,26 +52,25 @@
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.component.LogkitLoggerManager;
+import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.programming.Program;
import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* This interface is the common base of all Compiled Components. This
1.10 +1 -4 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
Index: SOAPHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SOAPHelper.java 9 Sep 2002 15:48:46 -0000 1.9
+++ SOAPHelper.java 5 Dec 2002 09:48:53 -0000 1.10
@@ -52,12 +52,10 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.xscript.XScriptManager;
import org.apache.cocoon.components.xscript.XScriptObject;
import org.apache.cocoon.components.xscript.XScriptObjectInlineXML;
-
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpState;
@@ -68,7 +66,6 @@
import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashMap;
/**
* Helper for the SOAP logicsheet.
1.10 +1 -9 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java
Index: XSPSessionHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSPSessionHelper.java 6 Mar 2002 03:05:23 -0000 1.9
+++ XSPSessionHelper.java 5 Dec 2002 09:48:53 -0000 1.10
@@ -50,19 +50,11 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
/**
* The <code>Session</code> object helper
1.9 +4 -7 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSPResponseHelper.java 27 Feb 2002 05:33:50 -0000 1.8
+++ XSPResponseHelper.java 5 Dec 2002 09:48:53 -0000 1.9
@@ -51,18 +51,15 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import java.util.Map;
-import java.util.Locale;
-import java.util.Date;
-import java.text.ParseException;
import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
/**
* The XSP <code>Response</code> object helper
1.13 +7 -10 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSPUtil.java 21 Nov 2002 18:18:48 -0000 1.12
+++ XSPUtil.java 5 Dec 2002 09:48:53 -0000 1.13
@@ -50,32 +50,29 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.util.Tokenizer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.excalibur.source.Source;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Component;
-import org.apache.excalibur.source.Source;
-
import java.io.*;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
-import java.util.HashMap;
/**
* The XSP <code>Utility</code> object helper
1.10 +4 -8 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java
Index: JSGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JSGenerator.java 30 Jun 2002 20:46:40 -0000 1.9
+++ JSGenerator.java 5 Dec 2002 09:48:53 -0000 1.10
@@ -55,18 +55,14 @@
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.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.xml.XMLizable;
-
+import org.apache.cocoon.environment.SourceResolver;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ImporterTopLevel;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.Script;
import org.mozilla.javascript.Scriptable;
-import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -74,12 +70,12 @@
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
import java.util.Collection;
import java.util.Date;
import java.util.Locale;
import java.util.Map;
-import java.text.ParseException;
-import java.text.DateFormat;
/**
* Class representing interpreted XSP-generated
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org