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 11:40:08 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/sitemap Sitemap.java XSLTFactoryLoader.java ContentAggregator.java DefaultSitemapComponentSelector.java
cziegeler 2002/12/05 02:40:08
Modified: src/java/org/apache/cocoon/transformation
SourceWritingTransformer.java I18nTransformer.java
WriteDOMSessionTransformer.java
SimpleFormTransformer.java JPathTransformer.java
AbstractSAXTransformer.java
RoleFilterTransformer.java AugmentTransformer.java
src/java/org/apache/cocoon/selection BrowserSelector.java
RequestParameterSelector.java
NamedPatternsSelector.java
SessionAttributeSelector.java HostSelector.java
RequestAttributeSelector.java SwitchSelector.java
AbstractSwitchSelector.java
RequestMethodSelector.java
SessionStateSelector.java
src/java/org/apache/cocoon/servlet ParanoidClassLoader.java
BootstrapServlet.java
src/java/org/apache/cocoon/samples/xmlform UserBean.java
WizardAction.java
src/java/org/apache/cocoon/sitemap Sitemap.java
XSLTFactoryLoader.java ContentAggregator.java
DefaultSitemapComponentSelector.java
Log:
Removing unused imports - core is clean now
Revision Changes Path
1.11 +9 -15 xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
Index: SourceWritingTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SourceWritingTransformer.java 27 Sep 2002 09:05:06 -0000 1.10
+++ SourceWritingTransformer.java 5 Dec 2002 10:40:07 -0000 1.11
@@ -51,39 +51,33 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-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.serialization.Serializer;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.cocoon.components.source.WriteableSource;
import org.apache.cocoon.components.source.WriteableSAXSource;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.components.source.WriteableSource;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.serialization.Serializer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.cocoon.xml.dom.DOMUtil;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.w3c.dom.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-import java.io.File;
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-import java.util.Properties;
/**
/**
1.25 +13 -29 xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- I18nTransformer.java 13 Nov 2002 22:09:43 -0000 1.24
+++ I18nTransformer.java 5 Dec 2002 10:40:07 -0000 1.25
@@ -50,29 +50,6 @@
*/
package org.apache.cocoon.transformation;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.MessageFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -82,17 +59,24 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceValidity;
-
-import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.i18n.Bundle;
import org.apache.cocoon.i18n.BundleFactory;
import org.apache.cocoon.i18n.I18nUtils;
import org.apache.cocoon.transformation.helpers.MirrorRecorder;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceValidity;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.text.*;
+import java.util.*;
/**
* Internationalization transformer is used to transform i18n markup into text
1.10 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WriteDOMSessionTransformer.java 22 Feb 2002 07:03:56 -0000 1.9
+++ WriteDOMSessionTransformer.java 5 Dec 2002 10:40:07 -0000 1.10
@@ -51,7 +51,6 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
1.4 +6 -11 xml-cocoon2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Index: SimpleFormTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleFormTransformer.java 3 Dec 2002 16:44:34 -0000 1.3
+++ SimpleFormTransformer.java 5 Dec 2002 10:40:07 -0000 1.4
@@ -50,18 +50,15 @@
*/
package org.apache.cocoon.transformation;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
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.thread.ThreadSafe;
-
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.components.language.markup.xsp.XSPFormValidatorHelper;
@@ -69,16 +66,14 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.AbstractXMLPipe;
-
-import org.xml.sax.SAXException;
+import org.apache.cocoon.util.HashMap;
import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.cocoon.util.HashMap;
+import java.io.IOException;
import java.util.Map;
import java.util.Stack;
-import java.io.IOException;
/** Eliminates the need for XSP to use FormValidatorAction. Caveat:
* Select options need a value attribute to work correctly.
1.5 +3 -5 xml-cocoon2/src/java/org/apache/cocoon/transformation/JPathTransformer.java
Index: JPathTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/JPathTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JPathTransformer.java 29 Nov 2002 14:45:11 -0000 1.4
+++ JPathTransformer.java 5 Dec 2002 10:40:07 -0000 1.5
@@ -52,17 +52,15 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.excalibur.source.Source;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.WebContinuation;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.regexp.RE;
-
import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
import java.util.HashMap;
1.8 +10 -14 xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractSAXTransformer.java 6 Nov 2002 17:53:30 -0000 1.7
+++ AbstractSAXTransformer.java 5 Dec 2002 10:40:07 -0000 1.8
@@ -50,42 +50,38 @@
*/
package org.apache.cocoon.transformation;
-import java.io.*;
-import java.util.*;
-
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
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.excalibur.pool.Recyclable;
-
+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.apache.cocoon.transformation.helpers.*;
+import org.apache.cocoon.transformation.helpers.ParametersRecorder;
+import org.apache.cocoon.transformation.helpers.TextRecorder;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.cocoon.xml.dom.DOMBuilder;
-
+import org.apache.excalibur.source.SourceParameters;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.util.*;
/**
* This class is the basis for all transformers. It provides various useful
1.8 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RoleFilterTransformer.java 28 May 2002 13:08:13 -0000 1.7
+++ RoleFilterTransformer.java 5 Dec 2002 10:40:07 -0000 1.8
@@ -51,7 +51,6 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
1.2 +0 -3 xml-cocoon2/src/java/org/apache/cocoon/transformation/AugmentTransformer.java
Index: AugmentTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AugmentTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AugmentTransformer.java 19 May 2002 19:19:39 -0000 1.1
+++ AugmentTransformer.java 5 Dec 2002 10:40:07 -0000 1.2
@@ -4,10 +4,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.components.language.markup.xsp.XSPRequestHelper;
-import org.apache.cocoon.environment.Request;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
1.6 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/selection/BrowserSelector.java
Index: BrowserSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/BrowserSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BrowserSelector.java 22 Feb 2002 07:03:54 -0000 1.5
+++ BrowserSelector.java 5 Dec 2002 10:40:07 -0000 1.6
@@ -53,9 +53,7 @@
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.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import java.util.Map;
1.6 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/selection/RequestParameterSelector.java
Index: RequestParameterSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestParameterSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestParameterSelector.java 17 Apr 2002 21:50:46 -0000 1.5
+++ RequestParameterSelector.java 5 Dec 2002 10:40:07 -0000 1.6
@@ -55,9 +55,7 @@
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.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import java.util.Map;
1.7 +6 -6 xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java
Index: NamedPatternsSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NamedPatternsSelector.java 31 Jul 2002 13:13:30 -0000 1.6
+++ NamedPatternsSelector.java 5 Dec 2002 10:40:07 -0000 1.7
@@ -54,13 +54,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-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.Request;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* Abstract class for selectors that select a value when it matches
1.9 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java
Index: SessionAttributeSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SessionAttributeSelector.java 31 Jul 2002 13:13:30 -0000 1.8
+++ SessionAttributeSelector.java 5 Dec 2002 10:40:07 -0000 1.9
@@ -56,9 +56,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
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.Request;
import java.util.Map;
1.8 +1 -4 xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java
Index: HostSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HostSelector.java 31 Jul 2002 13:13:30 -0000 1.7
+++ HostSelector.java 5 Dec 2002 10:40:07 -0000 1.8
@@ -50,13 +50,10 @@
*/
package org.apache.cocoon.selection;
-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.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import java.util.Map;
1.8 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java
Index: RequestAttributeSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestAttributeSelector.java 31 Jul 2002 13:13:30 -0000 1.7
+++ RequestAttributeSelector.java 5 Dec 2002 10:40:07 -0000 1.8
@@ -56,9 +56,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
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.Request;
import java.util.Map;
1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/selection/SwitchSelector.java
Index: SwitchSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SwitchSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SwitchSelector.java 12 Aug 2002 07:50:53 -0000 1.2
+++ SwitchSelector.java 5 Dec 2002 10:40:07 -0000 1.3
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.Map;
/**
1.3 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
Index: AbstractSwitchSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSwitchSelector.java 31 Jul 2002 13:13:30 -0000 1.2
+++ AbstractSwitchSelector.java 5 Dec 2002 10:40:07 -0000 1.3
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.Parameters;
+
import java.util.Map;
/**
1.4 +0 -5 xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java
Index: RequestMethodSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestMethodSelector.java 31 Jul 2002 13:13:30 -0000 1.3
+++ RequestMethodSelector.java 5 Dec 2002 10:40:07 -0000 1.4
@@ -49,15 +49,10 @@
*/
package org.apache.cocoon.selection;
-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.logger.AbstractLogEnabled;
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.Request;
import java.util.Map;
1.6 +1 -10 xml-cocoon2/src/java/org/apache/cocoon/selection/SessionStateSelector.java
Index: SessionStateSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SessionStateSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionStateSelector.java 31 Jul 2002 13:13:30 -0000 1.5
+++ SessionStateSelector.java 5 Dec 2002 10:40:07 -0000 1.6
@@ -51,17 +51,8 @@
package org.apache.cocoon.selection;
-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.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
import org.apache.cocoon.Constants;
-
-import java.util.Map;
/**
* This class generates source code to implement a selector that
1.7 +2 -4 xml-cocoon2/src/java/org/apache/cocoon/servlet/ParanoidClassLoader.java
Index: ParanoidClassLoader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/ParanoidClassLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ParanoidClassLoader.java 13 Sep 2002 07:30:50 -0000 1.6
+++ ParanoidClassLoader.java 5 Dec 2002 10:40:08 -0000 1.7
@@ -52,14 +52,12 @@
import org.apache.cocoon.CascadingIOException;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLStreamHandlerFactory;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
/**
* The <code>ParanoidClassLoader</code> reverses the search order for
1.5 +8 -13 xml-cocoon2/src/java/org/apache/cocoon/servlet/BootstrapServlet.java
Index: BootstrapServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/BootstrapServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BootstrapServlet.java 15 Jul 2002 14:48:29 -0000 1.4
+++ BootstrapServlet.java 5 Dec 2002 10:40:08 -0000 1.5
@@ -51,22 +51,17 @@
package org.apache.cocoon.servlet;
import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServlet;
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.io.IOException;
import java.io.File;
-
-import java.util.*;
-import javax.servlet.ServletContext;
+import java.io.IOException;
import java.io.InputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
/**
* A bootstrap servlet to allow Cocoon to run in servlet engines that aren't fully
1.7 +8 -9 xml-cocoon2/src/java/org/apache/cocoon/samples/xmlform/UserBean.java
Index: UserBean.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/samples/xmlform/UserBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UserBean.java 21 Nov 2002 18:18:49 -0000 1.6
+++ UserBean.java 5 Dec 2002 10:40:08 -0000 1.7
@@ -1,16 +1,15 @@
package org.apache.cocoon.samples.xmlform;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-
import org.apache.avalon.framework.CascadingRuntimeException;
import org.w3c.dom.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
/**
*
1.10 +5 -11 xml-cocoon2/src/java/org/apache/cocoon/samples/xmlform/WizardAction.java
Index: WizardAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/samples/xmlform/WizardAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WizardAction.java 27 Oct 2002 07:21:29 -0000 1.9
+++ WizardAction.java 5 Dec 2002 10:40:08 -0000 1.10
@@ -62,17 +62,11 @@
*/
package org.apache.cocoon.samples.xmlform;
-
-// Java classes
-import java.util.Map;
-
-// Framework classes
-import org.apache.excalibur.source.Source;
-
-// Cocoon Form
import org.apache.cocoon.acting.AbstractXMLFormAction;
import org.apache.cocoon.components.xmlform.Form;
import org.apache.cocoon.components.xmlform.FormListener;
+
+import java.util.Map;
/**
1.8 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/sitemap/Sitemap.java
Index: Sitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Sitemap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Sitemap.java 28 May 2002 07:11:44 -0000 1.7
+++ Sitemap.java 5 Dec 2002 10:40:08 -0000 1.8
@@ -55,7 +55,6 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.environment.Environment;
/**
* Base interface for generated <code>Sitemap</code> classes
1.8 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTFactoryLoader.java 30 Jun 2002 23:26:57 -0000 1.7
+++ XSLTFactoryLoader.java 5 Dec 2002 10:40:08 -0000 1.8
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.cocoon.util.ClassUtils;
import org.w3c.dom.NodeList;
import java.util.HashMap;
1.9 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContentAggregator.java 23 Jul 2002 02:04:30 -0000 1.8
+++ ContentAggregator.java 5 Dec 2002 10:40:08 -0000 1.9
@@ -69,7 +69,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Map;
/**
1.6 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/sitemap/DefaultSitemapComponentSelector.java
Index: DefaultSitemapComponentSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/DefaultSitemapComponentSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSitemapComponentSelector.java 29 Sep 2002 20:24:23 -0000 1.5
+++ DefaultSitemapComponentSelector.java 5 Dec 2002 10:40:08 -0000 1.6
@@ -59,7 +59,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
import java.util.StringTokenizer;
/**
----------------------------------------------------------------------
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