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:23:36 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/acting/modular TestAction.java
cziegeler 2002/12/05 01:23:36
Modified: src/java/org/apache/cocoon/acting ServerPagesAction.java
ClearCacheAction.java HelloAction.java
RequestParameterExistsAction.java
SessionInvalidatorAction.java
SessionPropagatorAction.java
ResourceExistsAction.java ScriptAction.java
SessionStateAction.java SessionIsValidAction.java
AbstractXMLFormAction.java
ClearPersistentStoreAction.java
RequestParamAction.java
src/java/org/apache/cocoon Main.java Constants.java
src/java/org/apache/cocoon/acting/modular TestAction.java
Log:
Removing unused imports
Revision Changes Path
1.10 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ServerPagesAction.java 11 Sep 2002 08:26:44 -0000 1.9
+++ ServerPagesAction.java 5 Dec 2002 09:23:33 -0000 1.10
@@ -58,7 +58,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
import org.apache.cocoon.environment.ObjectModelHelper;
1.2 +1 -7 xml-cocoon2/src/java/org/apache/cocoon/acting/ClearCacheAction.java
Index: ClearCacheAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ClearCacheAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClearCacheAction.java 20 Aug 2002 06:41:03 -0000 1.1
+++ ClearCacheAction.java 5 Dec 2002 09:23:33 -0000 1.2
@@ -50,18 +50,12 @@
*/
package org.apache.cocoon.acting;
-/*
- * Standard imports
- */
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.caching.Cache;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.caching.Cache;
-import java.util.HashMap;
import java.util.Map;
/**
1.7 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HelloAction.java 22 Feb 2002 06:59:26 -0000 1.6
+++ HelloAction.java 5 Dec 2002 09:23:33 -0000 1.7
@@ -52,7 +52,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.9 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Index: RequestParameterExistsAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RequestParameterExistsAction.java 11 Sep 2002 08:26:44 -0000 1.8
+++ RequestParameterExistsAction.java 5 Dec 2002 09:23:33 -0000 1.9
@@ -57,7 +57,6 @@
import java.util.StringTokenizer;
import java.util.Iterator;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.9 +1 -4 xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SessionInvalidatorAction.java 11 Sep 2002 08:26:44 -0000 1.8
+++ SessionInvalidatorAction.java 5 Dec 2002 09:23:34 -0000 1.9
@@ -52,15 +52,12 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
/**
1.10 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SessionPropagatorAction.java 11 Sep 2002 12:44:09 -0000 1.9
+++ SessionPropagatorAction.java 5 Dec 2002 09:23:34 -0000 1.10
@@ -54,7 +54,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.10 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceExistsAction.java 22 Oct 2002 03:14:05 -0000 1.9
+++ ResourceExistsAction.java 5 Dec 2002 09:23:34 -0000 1.10
@@ -56,8 +56,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
/**
1.11 +2 -7 xml-cocoon2/src/java/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ScriptAction.java 11 Sep 2002 08:26:44 -0000 1.10
+++ ScriptAction.java 5 Dec 2002 09:23:34 -0000 1.11
@@ -50,22 +50,17 @@
*/
package org.apache.cocoon.acting;
-// Cocoon imports
-
-import com.ibm.bsf.BSFException;
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.util.IOUtils;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.source.Source;
-import java.io.FileNotFoundException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Collections;
1.10 +2 -3 xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java
Index: SessionStateAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SessionStateAction.java 22 Oct 2002 02:10:31 -0000 1.9
+++ SessionStateAction.java 5 Dec 2002 09:23:34 -0000 1.10
@@ -54,9 +54,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
1.9 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SessionIsValidAction.java 11 Sep 2002 08:26:44 -0000 1.8
+++ SessionIsValidAction.java 5 Dec 2002 09:23:34 -0000 1.9
@@ -52,14 +52,12 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Collections;
import java.util.Map;
1.9 +17 -38 xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractXMLFormAction.java
Index: AbstractXMLFormAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractXMLFormAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractXMLFormAction.java 27 Oct 2002 07:24:43 -0000 1.8
+++ AbstractXMLFormAction.java 5 Dec 2002 09:23:35 -0000 1.9
@@ -63,49 +63,28 @@
package org.apache.cocoon.acting;
-// Java classes
-import java.util.Map;
-import java.util.HashMap;
-import java.util.SortedSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.File;
-
-// XML classes
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.InputSource;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-// Framework classes
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.excalibur.source.Source;
-
-// Cocoon classes
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.Context;
import org.apache.cocoon.components.source.SourceUtil;
-// Schematron classes
-import org.apache.cocoon.components.validation.SchemaFactory;
import org.apache.cocoon.components.validation.Schema;
+import org.apache.cocoon.components.validation.SchemaFactory;
import org.apache.cocoon.components.validation.Validator;
-import org.apache.cocoon.components.validation.Violation;
-
-// Cocoon Form
import org.apache.cocoon.components.xmlform.Form;
import org.apache.cocoon.components.xmlform.FormListener;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.Source;
+import org.xml.sax.InputSource;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
1.2 +1 -7 xml-cocoon2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
Index: ClearPersistentStoreAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClearPersistentStoreAction.java 20 Sep 2002 18:15:18 -0000 1.1
+++ ClearPersistentStoreAction.java 5 Dec 2002 09:23:35 -0000 1.2
@@ -50,18 +50,12 @@
*/
package org.apache.cocoon.acting;
-/*
- * Standard imports
- */
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.excalibur.store.Store;
-import java.util.HashMap;
import java.util.Map;
/**
1.8 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestParamAction.java 11 Sep 2002 08:26:44 -0000 1.7
+++ RequestParamAction.java 5 Dec 2002 09:23:35 -0000 1.8
@@ -55,7 +55,6 @@
*/
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
1.27 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Main.java 25 Nov 2002 20:15:44 -0000 1.26
+++ Main.java 5 Dec 2002 09:23:35 -0000 1.27
@@ -68,11 +68,9 @@
import org.apache.cocoon.util.MIMEUtils;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.notification.Notifying;
import org.apache.cocoon.components.notification.SimpleNotifyingBean;
import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
import org.apache.cocoon.components.notification.Notifier;
-import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.log.Priority;
1.13 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Constants.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.java 30 Jun 2002 23:31:34 -0000 1.12
+++ Constants.java 5 Dec 2002 09:23:36 -0000 1.13
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon;
-import java.util.Map;
-
/**
* The <code>Constants</code> use throughout the core of the Cocoon engine.
*
1.7 +3 -11 xml-cocoon2/src/java/org/apache/cocoon/acting/modular/TestAction.java
Index: TestAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/modular/TestAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestAction.java 28 Oct 2002 14:43:41 -0000 1.6
+++ TestAction.java 5 Dec 2002 09:23:36 -0000 1.7
@@ -51,28 +51,20 @@
package org.apache.cocoon.acting.modular;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentSelector;
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.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.component.ComponentSelector;
-
-import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.ComposerAction;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
-
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.components.modules.output.OutputModule;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
/** Demo action that uses componentized input / output layer. In order
* to stop combinatorial explosion of actions, matchers, and selectors
----------------------------------------------------------------------
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