You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2004/03/01 04:50:59 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml DocumentHandlerAdapter.java
antonio 2004/02/29 19:50:59
Modified: src/blocks/xmlform/java/org/apache/cocoon/components/xmlform
Form.java
src/blocks/ojb/java/org/apache/cocoon/ojb/samples
EmployeeDAO.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common
UnmodifiableSet.java LanguageImpl.java
PreferenceUtil.java ContentTypeSetImpl.java
ParameterSetImpl.java ObjectIDImpl.java
src/java/org/apache/cocoon/components/language/programming/java
Javac.java Jikes.java JstyleFormatter.java
src/java/org/apache/cocoon/components/treeprocessor
CategoryNode.java CategoryNodeBuilder.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/om
PortletEntityListImpl.java
PortletWindowListImpl.java PortletWindowImpl.java
src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/flow/javascript
JXForm.java
src/blocks/scratchpad/java/org/apache/cocoon/components/pipeline/impl
ExpiresCachingProcessingPipeline.java
src/blocks/databases/java/org/apache/cocoon/transformation
SQLTransformer.java
src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
src/blocks/mail/java/org/apache/cocoon/mail
IndexerCtPref.java MimeMessageUtil.java
src/blocks/scratchpad/java/org/apache/cocoon/ant
UriType.java DelayedFileSavingEnvironment.java
src/blocks/woody/java/org/apache/cocoon/woody/binding
InsertNodeJXPathBindingBuilder.java
src/blocks/portal/java/org/apache/cocoon/portal/impl
PortalServiceInfo.java
src/deprecated/java/org/apache/cocoon/components/source
FileSource.java
src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript
ScriptableResult.java ScriptableConnection.java
src/java/org/apache/cocoon/components/xpointer/parser
XPointerFrameworkParser.java
src/java/org/apache/cocoon/components/modules/input
DateInputModule.java
src/java/org/apache/cocoon/xml/dom DOMUtil.java
src/blocks/databases/java/org/apache/cocoon/acting
DatabaseAddAction.java OraAddAction.java
AbstractDatabaseAction.java
src/blocks/slide/java/org/apache/cocoon/components/slide/impl
SlideConfigurationAdapter.java
src/deprecated/java/org/apache/cocoon/components/parser
JaxpParser.java
src/blocks/woody/java/org/apache/cocoon/woody/datatype/typeimpl
IntegerTypeBuilder.java
src/blocks/linkrewriter/java/org/apache/cocoon/transformation/helpers
InterpolatingConfigurationHandler.java
src/java/org/apache/cocoon/components/flow/javascript
ScriptablePropertyHandler.java
src/blocks/scratchpad/java/org/apache/cocoon/generation
FlowVelocityGenerator.java
src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform
UserBean.java
src/java/org/apache/cocoon/environment/commandline
CommandLineRequest.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory
ControllerFactoryImpl.java
src/blocks/velocity/java/org/apache/cocoon/generation
VelocityGenerator.java
src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/xmlform
Form.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
PipelineNodeBuilder.java AggregateNode.java
AggregateNodeBuilder.java
src/java/org/apache/cocoon/util IOUtils.java
src/deprecated/java/org/apache/cocoon/components/treeprocessor
MapStackResolver.java
src/blocks/databases/java/org/apache/cocoon/util
JDBCTypeConversions.java
src/blocks/jsp/mocks/weblogic/servlet/internal
ServletResponseImpl.java ServletContextImpl.java
src/deprecated/java/org/apache/cocoon/components/source/impl
CocoonToAvalonSource.java
src/blocks/deli/java/org/apache/cocoon/components/deli
DeliImpl.java
src/java/org/apache/cocoon/environment/wrapper
RequestWrapper.java RequestParameters.java
src/deprecated/java/org/apache/cocoon/components/xslt
XSLTProcessorImpl.java
src/java/org/apache/cocoon/xml DocumentHandlerAdapter.java
Log:
Organizing imports
Revision Changes Path
1.7 +14 -2 cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/Form.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Form.java 2 Sep 2003 09:13:51 -0000 1.6
+++ Form.java 1 Mar 2004 03:50:57 -0000 1.7
@@ -50,7 +50,19 @@
*/
package org.apache.cocoon.components.xmlform;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.validation.Validator;
1.2 +2 -2 cocoon-2.1/src/blocks/ojb/java/org/apache/cocoon/ojb/samples/EmployeeDAO.java
Index: EmployeeDAO.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/ojb/java/org/apache/cocoon/ojb/samples/EmployeeDAO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmployeeDAO.java 4 Feb 2004 17:33:59 -0000 1.1
+++ EmployeeDAO.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -54,7 +54,7 @@
import javax.jdo.Transaction;
import org.apache.cocoon.ojb.jdo.components.JdoPMF;
-import org.apache.cocoon.ojb.samples.bean.*;
+import org.apache.cocoon.ojb.samples.bean.Employee;
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerFactory;
1.2 +5 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java
Index: UnmodifiableSet.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnmodifiableSet.java 22 Jan 2004 14:01:20 -0000 1.1
+++ UnmodifiableSet.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,8 +45,10 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
/**
*
1.2 +12 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
Index: LanguageImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ LanguageImpl.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,10 +45,19 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import org.apache.pluto.om.common.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import org.apache.pluto.om.common.Language;
import org.apache.pluto.util.Enumerator;
import org.apache.pluto.util.StringUtils;
-import java.util.*;
/**
*
1.2 +4 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java
Index: PreferenceUtil.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreferenceUtil.java 22 Jan 2004 14:01:20 -0000 1.1
+++ PreferenceUtil.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,7 +45,9 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
import org.apache.pluto.om.common.Preference;
1.2 +7 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java
Index: ContentTypeSetImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentTypeSetImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ ContentTypeSetImpl.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,9 +45,13 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import org.apache.pluto.om.portlet.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.pluto.om.portlet.ContentType;
+import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.util.StringUtils;
-import java.util.*;
/**
*
1.2 +6 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java
Index: ParameterSetImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParameterSetImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ ParameterSetImpl.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,9 +45,13 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import org.apache.pluto.om.common.*;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.pluto.om.common.Parameter;
+import org.apache.pluto.om.common.ParameterSet;
+import org.apache.pluto.om.common.ParameterSetCtrl;
import org.apache.pluto.util.StringUtils;
-import java.util.*;
public class ParameterSetImpl extends HashSet
implements ParameterSet, ParameterSetCtrl, java.io.Serializable {
1.3 +4 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java
Index: ObjectIDImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectIDImpl.java 23 Jan 2004 12:34:31 -0000 1.2
+++ ObjectIDImpl.java 1 Mar 2004 03:50:57 -0000 1.3
@@ -45,7 +45,9 @@
*/
package org.apache.cocoon.portal.pluto.om.common;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
/**
* Wraps around the internal Object IDs. By holding both
1.2 +11 -7 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Javac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Javac.java 9 Mar 2003 00:09:00 -0000 1.1
+++ Javac.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -50,16 +50,20 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.cocoon.components.language.programming.CompilerError;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.log.Hierarchy;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.cocoon.components.language.programming.CompilerError;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.log.Hierarchy;
/**
* This class wraps the Sun's Javac Compiler.
1.4 +9 -4 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jikes.java 15 Nov 2003 04:21:29 -0000 1.3
+++ Jikes.java 1 Mar 2004 03:50:57 -0000 1.4
@@ -50,12 +50,17 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.cocoon.components.language.programming.CompilerError;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+
+import org.apache.cocoon.components.language.programming.CompilerError;
/**
* This class wraps IBM's <i>Jikes</i> Java compiler
1.3 +8 -3 cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JstyleFormatter.java 15 Nov 2003 04:21:29 -0000 1.2
+++ JstyleFormatter.java 1 Mar 2004 03:50:57 -0000 1.3
@@ -50,12 +50,17 @@
*/
package org.apache.cocoon.components.language.programming.java;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+
import jstyle.JSBeautifier;
import jstyle.JSFormatter;
+
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.language.programming.CodeFormatter;
-
-import java.io.*;
/**
* This class implements <code>CodeFormatter</code> based on
1.2 +5 -4 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/CategoryNode.java
Index: CategoryNode.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/CategoryNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CategoryNode.java 9 Mar 2003 00:09:15 -0000 1.1
+++ CategoryNode.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -50,10 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.ProcessingException;
+import java.util.HashMap;
+import java.util.Map;
-import java.util.*;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Environment;
/**
* A generic container node that just invokes its children.
1.2 +6 -4 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java
Index: CategoryNodeBuilder.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CategoryNodeBuilder.java 9 Mar 2003 00:09:15 -0000 1.1
+++ CategoryNodeBuilder.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -50,13 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor;
+import java.util.HashMap;
+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.thread.ThreadSafe;
-
-import java.util.*;
/**
* Builds a generic container node.
1.2 +9 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java
Index: PortletEntityListImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletEntityListImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ PortletEntityListImpl.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -45,13 +45,18 @@
*/
package org.apache.cocoon.portal.pluto.om;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.cocoon.portal.coplet.CopletInstanceData;
import org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl;
import org.apache.pluto.om.common.ObjectID;
-import org.apache.pluto.om.entity.*;
+import org.apache.pluto.om.entity.PortletApplicationEntity;
+import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.pluto.om.entity.PortletEntityList;
+import org.apache.pluto.om.entity.PortletEntityListCtrl;
import org.apache.pluto.om.portlet.PortletDefinition;
-
-import java.util.*;
/**
*
1.3 +6 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java
Index: PortletWindowListImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletWindowListImpl.java 23 Jan 2004 12:34:31 -0000 1.2
+++ PortletWindowListImpl.java 1 Mar 2004 03:50:57 -0000 1.3
@@ -45,9 +45,12 @@
*/
package org.apache.cocoon.portal.pluto.om;
-import java.util.*;
-import org.apache.pluto.om.window.*;
+import java.util.HashMap;
+
import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.om.window.PortletWindowList;
+import org.apache.pluto.om.window.PortletWindowListCtrl;
/**
*
1.3 +4 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
Index: PortletWindowImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletWindowImpl.java 23 Jan 2004 12:34:31 -0000 1.2
+++ PortletWindowImpl.java 1 Mar 2004 03:50:57 -0000 1.3
@@ -45,9 +45,10 @@
*/
package org.apache.cocoon.portal.pluto.om;
-import org.apache.pluto.om.window.*;
-import org.apache.pluto.om.entity.*;
import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.om.window.PortletWindowCtrl;
/**
*
1.8 +18 -9 cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/flow/javascript/JXForm.java
Index: JXForm.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/flow/javascript/JXForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JXForm.java 20 Feb 2004 18:48:23 -0000 1.7
+++ JXForm.java 1 Mar 2004 03:50:57 -0000 1.8
@@ -49,20 +49,29 @@
*/
package org.apache.cocoon.components.jxforms.flow.javascript;
-import org.apache.cocoon.components.jxforms.validation.*;
-import org.apache.cocoon.components.jxforms.xmlform.*;
-import org.mozilla.javascript.*;
-import org.mozilla.javascript.continuations.Continuation;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
import org.apache.cocoon.components.flow.javascript.fom.FOM_Cocoon;
import org.apache.cocoon.components.flow.javascript.fom.FOM_WebContinuation;
+import org.apache.cocoon.components.jxforms.validation.Schema;
+import org.apache.cocoon.components.jxforms.validation.SchemaFactory;
+import org.apache.cocoon.components.jxforms.validation.Violation;
+import org.apache.cocoon.components.jxforms.xmlform.Form;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.Source;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.excalibur.source.SourceResolver;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
+import org.mozilla.javascript.continuations.Continuation;
import org.xml.sax.InputSource;
-import java.util.Set;
-import java.util.List;
-import java.util.LinkedList;
public class JXForm extends ScriptableObject {
1.2 +2 -2 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
Index: ExpiresCachingProcessingPipeline.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpiresCachingProcessingPipeline.java 4 Sep 2003 12:42:42 -0000 1.1
+++ ExpiresCachingProcessingPipeline.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -58,9 +58,9 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.ConnectionResetException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.*;
import org.apache.cocoon.caching.CachedResponse;
import org.apache.cocoon.caching.CachingOutputStream;
+import org.apache.cocoon.caching.SimpleCacheKey;
import org.apache.cocoon.components.sax.XMLDeserializer;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.components.sax.XMLTeePipe;
1.14 +23 -9 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SQLTransformer.java 7 Nov 2003 09:14:34 -0000 1.13
+++ SQLTransformer.java 1 Mar 2004 03:50:57 -0000 1.14
@@ -50,6 +50,28 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.Vector;
+
+import javax.xml.transform.OutputKeys;
+
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -73,14 +95,6 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.Field;
-import java.sql.*;
-import java.util.*;
-import javax.xml.transform.OutputKeys;
/**
*
1.17 +20 -13 cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XIncludeTransformer.java 20 Feb 2004 18:46:49 -0000 1.16
+++ XIncludeTransformer.java 1 Mar 2004 03:50:57 -0000 1.17
@@ -50,32 +50,39 @@
*/
package org.apache.cocoon.transformation;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.util.Map;
+
+import org.apache.avalon.framework.CascadingException;
+import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.CascadingException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.util.NetUtils;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.components.xpointer.XPointer;
-import org.apache.cocoon.components.xpointer.parser.XPointerFrameworkParser;
-import org.apache.cocoon.components.xpointer.parser.ParseException;
import org.apache.cocoon.components.xpointer.XPointerContext;
+import org.apache.cocoon.components.xpointer.parser.ParseException;
+import org.apache.cocoon.components.xpointer.parser.XPointerFrameworkParser;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.NetUtils;
+import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLBaseSupport;
-import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.util.Map;
/**
* Implementation of an XInclude transformer. It supports xml:base attributes,
1.3 +3 -3 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java
Index: IndexerCtPref.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/IndexerCtPref.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IndexerCtPref.java 11 Mar 2003 19:04:58 -0000 1.2
+++ IndexerCtPref.java 1 Mar 2004 03:50:57 -0000 1.3
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.mail;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimePart;
/**
* Description of the Class
1.4 +12 -5 cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java
Index: MimeMessageUtil.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MimeMessageUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimeMessageUtil.java 23 Dec 2003 15:28:32 -0000 1.3
+++ MimeMessageUtil.java 1 Mar 2004 03:50:57 -0000 1.4
@@ -50,10 +50,17 @@
*/
package org.apache.cocoon.mail;
-import javax.mail.*;
-import javax.mail.internet.*;
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.MimePart;
/**
* Description of the Class
1.4 +7 -3 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/UriType.java
Index: UriType.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/UriType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UriType.java 16 Nov 2003 00:52:08 -0000 1.3
+++ UriType.java 1 Mar 2004 03:50:57 -0000 1.4
@@ -50,8 +50,12 @@
*/
package org.apache.cocoon.ant;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.cocoon.util.NetUtils;
1.2 +11 -7 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileSavingEnvironment.java
Index: DelayedFileSavingEnvironment.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileSavingEnvironment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DelayedFileSavingEnvironment.java 4 Sep 2003 12:42:41 -0000 1.1
+++ DelayedFileSavingEnvironment.java 1 Mar 2004 03:50:57 -0000 1.2
@@ -50,16 +50,20 @@
*/
package org.apache.cocoon.ant;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.commandline.*;
-
-import org.apache.cocoon.util.*;
+import org.apache.cocoon.environment.commandline.AbstractCommandLineEnvironment;
+import org.apache.cocoon.environment.commandline.CommandLineRequest;
+import org.apache.cocoon.environment.commandline.CommandLineResponse;
+import org.apache.cocoon.util.IOUtils;
+import org.apache.cocoon.util.MIMEUtils;
+import org.apache.cocoon.util.NetUtils;
/**
* A command line file saving environment writing files in a delayed mode.
1.9 +9 -5 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java
Index: InsertNodeJXPathBindingBuilder.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InsertNodeJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.8
+++ InsertNodeJXPathBindingBuilder.java 1 Mar 2004 03:50:57 -0000 1.9
@@ -50,13 +50,17 @@
*/
package org.apache.cocoon.woody.binding;
-import org.w3c.dom.*;
-import org.apache.cocoon.woody.util.DomHelper;
-import org.apache.cocoon.components.source.SourceUtil;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.source.SourceResolver;
+import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.woody.util.DomHelper;
import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xpath.XPathProcessor;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* InsertNodeJXPathBindingBuilder provides a helper class for the Factory
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceInfo.java
Index: PortalServiceInfo.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortalServiceInfo.java 20 Aug 2003 07:34:36 -0000 1.1
+++ PortalServiceInfo.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.portal.impl;
-import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
1.4 +11 -5 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/FileSource.java
Index: FileSource.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/FileSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileSource.java 24 Sep 2003 22:34:53 -0000 1.3
+++ FileSource.java 1 Mar 2004 03:50:58 -0000 1.4
@@ -54,13 +54,19 @@
*/
package org.apache.cocoon.components.source;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.util.ConcurrentModificationException;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.util.ConcurrentModificationException;
/**
* A <code>org.apache.cocoon.environment.WriteableSource</code> for 'file:/' system IDs.
1.3 +11 -3 cocoon-2.1/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java
Index: ScriptableResult.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptableResult.java 23 Feb 2004 01:19:45 -0000 1.2
+++ ScriptableResult.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -45,8 +45,16 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.mozilla.javascript.*;
-import java.sql.*;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.NotAFunctionException;
+import org.mozilla.javascript.PropertyException;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
1.5 +13 -3 cocoon-2.1/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableConnection.java
Index: ScriptableConnection.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptableConnection.java 24 Feb 2004 10:35:11 -0000 1.4
+++ ScriptableConnection.java 1 Mar 2004 03:50:58 -0000 1.5
@@ -44,8 +44,18 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.mozilla.javascript.*;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
/**
* Wraps a JDBC connection and provides an API similar to JSTL
1.7 +7 -1 cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
Index: XPointerFrameworkParser.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPointerFrameworkParser.java 15 Feb 2004 10:06:53 -0000 1.6
+++ XPointerFrameworkParser.java 1 Mar 2004 03:50:58 -0000 1.7
@@ -50,8 +50,14 @@
*/
package org.apache.cocoon.components.xpointer.parser;
-import org.apache.cocoon.components.xpointer.*;
import java.util.HashMap;
+
+import org.apache.cocoon.components.xpointer.ElementPathPart;
+import org.apache.cocoon.components.xpointer.ShorthandPart;
+import org.apache.cocoon.components.xpointer.UnsupportedPart;
+import org.apache.cocoon.components.xpointer.XPointer;
+import org.apache.cocoon.components.xpointer.XPointerPart;
+import org.apache.cocoon.components.xpointer.XmlnsPart;
public class XPointerFrameworkParser
implements XPointerFrameworkParserConstants {
1.2 +9 -4 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java
Index: DateInputModule.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateInputModule.java 9 Mar 2003 00:09:02 -0000 1.1
+++ DateInputModule.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -51,12 +51,17 @@
package org.apache.cocoon.components.modules.input;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
/**
* DateInputModule returns current date, optionally formated as
1.8 +27 -17 cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMUtil.java 18 Dec 2003 14:29:03 -0000 1.7
+++ DOMUtil.java 1 Mar 2004 03:50:58 -0000 1.8
@@ -50,22 +50,11 @@
*/
package org.apache.cocoon.xml.dom;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.xpath.XPathAPI;
-import org.apache.excalibur.xml.xpath.NodeListImpl;
-import org.apache.excalibur.xml.xpath.XPathProcessor;
-import org.apache.excalibur.xml.xpath.XPathUtil;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.XMLUtils;
-
-import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.excalibur.xml.sax.XMLizable;
-import org.w3c.dom.*;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-import java.io.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
@@ -76,6 +65,27 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.TransformerException;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.XMLUtils;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.xml.sax.SAXParser;
+import org.apache.excalibur.xml.sax.XMLizable;
+import org.apache.excalibur.xml.xpath.NodeListImpl;
+import org.apache.excalibur.xml.xpath.XPathProcessor;
+import org.apache.excalibur.xml.xpath.XPathUtil;
+import org.apache.xpath.XPathAPI;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* This class is a utility class for miscellaneous DOM functions, like
1.2 +13 -7 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseAddAction.java 9 Mar 2003 00:03:02 -0000 1.1
+++ DatabaseAddAction.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,6 +50,18 @@
*/
package org.apache.cocoon.acting;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -61,12 +73,6 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
/**
* Adds record in a database. The action can update one or more tables,
1.2 +19 -12 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/OraAddAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OraAddAction.java 9 Mar 2003 00:03:03 -0000 1.1
+++ OraAddAction.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,29 +50,36 @@
*/
package org.apache.cocoon.acting;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
import oracle.jdbc.OracleResultSet;
import oracle.sql.BLOB;
import oracle.sql.CLOB;
+
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
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.util.ImageProperties;
-import org.apache.cocoon.util.ImageUtils;
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 java.io.*;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.cocoon.util.ImageProperties;
+import org.apache.cocoon.util.ImageUtils;
/**
* Add a record in a database. This Action assumes that there is
1.3 +22 -10 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDatabaseAction.java 25 Oct 2003 18:06:20 -0000 1.2
+++ AbstractDatabaseAction.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -50,6 +50,27 @@
*/
package org.apache.cocoon.acting;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.sql.Array;
+import java.sql.Clob;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -61,15 +82,6 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.ImageProperties;
import org.apache.cocoon.util.ImageUtils;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.sql.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* Set up environment for configurable form handling data. It is
1.2 +4 -3 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlideConfigurationAdapter.java
Index: SlideConfigurationAdapter.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlideConfigurationAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SlideConfigurationAdapter.java 2 Dec 2003 19:18:45 -0000 1.1
+++ SlideConfigurationAdapter.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -51,10 +51,11 @@
package org.apache.cocoon.components.slide.impl;
+import java.util.Enumeration;
+import java.util.Vector;
+
import org.apache.slide.util.conf.Configuration;
import org.apache.slide.util.conf.ConfigurationException;
-
-import java.util.*;
/**
* The class represent an adapter for the configuration class from jakarta slide
1.3 +14 -6 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/parser/JaxpParser.java
Index: JaxpParser.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/parser/JaxpParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JaxpParser.java 27 Apr 2003 15:16:16 -0000 1.2
+++ JaxpParser.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -50,23 +50,31 @@
*/
package org.apache.cocoon.components.parser;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
import org.apache.avalon.excalibur.pool.Poolable;
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.component.Composable;
+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.components.resolver.Resolver;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
-import org.xml.sax.*;
-
-import javax.xml.parsers.*;
-import java.io.IOException;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
/**
* An XMLParser that is only dependant on JAXP 1.1 compliant parsers.
1.2 +3 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/typeimpl/IntegerTypeBuilder.java
Index: IntegerTypeBuilder.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/typeimpl/IntegerTypeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegerTypeBuilder.java 1 Oct 2003 18:20:23 -0000 1.1
+++ IntegerTypeBuilder.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,7 +50,8 @@
*/
package org.apache.cocoon.woody.datatype.typeimpl;
-import org.apache.cocoon.woody.datatype.*;
+import org.apache.cocoon.woody.datatype.Datatype;
+import org.apache.cocoon.woody.datatype.DatatypeManager;
import org.w3c.dom.Element;
/**
1.4 +6 -4 cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/helpers/InterpolatingConfigurationHandler.java
Index: InterpolatingConfigurationHandler.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/linkrewriter/java/org/apache/cocoon/transformation/helpers/InterpolatingConfigurationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InterpolatingConfigurationHandler.java 3 May 2003 10:24:55 -0000 1.3
+++ InterpolatingConfigurationHandler.java 1 Mar 2004 03:50:58 -0000 1.4
@@ -50,11 +50,13 @@
*/
package org.apache.cocoon.transformation.helpers;
-import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-import org.xml.sax.*;
-import org.xml.sax.helpers.AttributesImpl;
import java.util.Map;
import java.util.StringTokenizer;
+
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* A SAX ContentHandler that builds Avalon <code>Configuration</code> objects,
1.6 +8 -2 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java
Index: ScriptablePropertyHandler.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScriptablePropertyHandler.java 10 Oct 2003 10:48:25 -0000 1.5
+++ ScriptablePropertyHandler.java 1 Mar 2004 03:50:58 -0000 1.6
@@ -46,7 +46,13 @@
package org.apache.cocoon.components.flow.javascript;
import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
/**
*
1.5 +15 -3 cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java
Index: FlowVelocityGenerator.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FlowVelocityGenerator.java 23 Dec 2003 15:28:32 -0000 1.4
+++ FlowVelocityGenerator.java 1 Mar 2004 03:50:58 -0000 1.5
@@ -56,7 +56,13 @@
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
@@ -93,7 +99,13 @@
import org.apache.velocity.util.introspection.VelMethod;
import org.apache.velocity.util.introspection.VelPropertyGet;
import org.apache.velocity.util.introspection.VelPropertySet;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
1.3 +12 -7 cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java
Index: UserBean.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/samples/xmlform/UserBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserBean.java 5 Sep 2003 07:40:21 -0000 1.2
+++ UserBean.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -50,16 +50,21 @@
*/
package org.apache.cocoon.samples.xmlform;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.w3c.dom.*;
-
-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;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
*
1.8 +8 -3 cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommandLineRequest.java 23 Dec 2003 15:28:32 -0000 1.7
+++ CommandLineRequest.java 1 Mar 2004 03:50:58 -0000 1.8
@@ -50,13 +50,18 @@
*/
package org.apache.cocoon.environment.commandline;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-
-import java.util.*;
/**
* Creates a specific servlet request simulation from command line usage.
1.2 +4 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java
Index: ControllerFactoryImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ControllerFactoryImpl.java 22 Jan 2004 14:01:22 -0000 1.1
+++ ControllerFactoryImpl.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -46,7 +46,9 @@
package org.apache.cocoon.portal.pluto.factory;
import org.apache.cocoon.portal.pluto.om.common.UnmodifiableSet;
-import org.apache.pluto.om.*;
+import org.apache.pluto.om.Controller;
+import org.apache.pluto.om.ControllerFactory;
+import org.apache.pluto.om.Model;
/**
* The implementation of the controller factory
1.12 +15 -3 cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VelocityGenerator.java 23 Dec 2003 15:28:32 -0000 1.11
+++ VelocityGenerator.java 1 Mar 2004 03:50:58 -0000 1.12
@@ -56,7 +56,13 @@
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -93,7 +99,13 @@
import org.apache.velocity.util.introspection.VelMethod;
import org.apache.velocity.util.introspection.VelPropertyGet;
import org.apache.velocity.util.introspection.VelPropertySet;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
1.5 +14 -2 cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/xmlform/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/xmlform/Form.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Form.java 2 Sep 2003 09:13:51 -0000 1.4
+++ Form.java 1 Mar 2004 03:50:58 -0000 1.5
@@ -50,7 +50,19 @@
*/
package org.apache.cocoon.components.jxforms.xmlform;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.jxforms.validation.Validator;
1.3 +4 -3 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java
Index: PipelineNodeBuilder.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PipelineNodeBuilder.java 1 Apr 2003 21:25:09 -0000 1.2
+++ PipelineNodeBuilder.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -49,14 +49,15 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder;
-
-import java.util.*;
/**
* Builds a <map:pipeline>
1.3 +6 -9 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AggregateNode.java 24 Sep 2003 21:41:11 -0000 1.2
+++ AggregateNode.java 1 Mar 2004 03:50:58 -0000 1.3
@@ -50,20 +50,17 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.sitemap.ContentAggregator;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.*;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.ContentAggregator;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.2 +9 -3 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java
Index: AggregateNodeBuilder.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateNodeBuilder.java 9 Mar 2003 00:09:21 -0000 1.1
+++ AggregateNodeBuilder.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,14 +50,20 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
/**
*
1.2 +16 -4 cocoon-2.1/src/java/org/apache/cocoon/util/IOUtils.java
Index: IOUtils.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/util/IOUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IOUtils.java 9 Mar 2003 00:09:43 -0000 1.1
+++ IOUtils.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,12 +50,24 @@
*/
package org.apache.cocoon.util;
-import org.apache.log.Hierarchy;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.text.Collator;
import java.util.Arrays;
import java.util.Locale;
+
+import org.apache.log.Hierarchy;
/**
* A collection of <code>File</code>, <code>URL</code> and filename
1.2 +8 -4 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java
Index: MapStackResolver.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapStackResolver.java 9 Mar 2003 00:07:08 -0000 1.1
+++ MapStackResolver.java 1 Mar 2004 03:50:58 -0000 1.2
@@ -50,11 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.*;
/**
* Utility class for handling {...} pattern substitutions from a List of Maps.
1.6 +16 -11 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/util/JDBCTypeConversions.java
Index: JDBCTypeConversions.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/util/JDBCTypeConversions.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCTypeConversions.java 24 Sep 2003 21:54:49 -0000 1.5
+++ JDBCTypeConversions.java 1 Mar 2004 03:50:59 -0000 1.6
@@ -50,23 +50,28 @@
*/
package org.apache.cocoon.util;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.sql.Struct;
import java.sql.Time;
-import java.sql.Date;
-import java.sql.Array;
+import java.sql.Timestamp;
import java.sql.Types;
-import java.sql.Clob;
-import java.sql.Blob;
-import java.sql.Struct;
-import java.math.BigDecimal;
-import java.util.Map;
import java.util.Calendar;
-import java.util.HashMap;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.excalibur.source.Source;
1.3 +5 -4 cocoon-2.1/src/blocks/jsp/mocks/weblogic/servlet/internal/ServletResponseImpl.java
Index: ServletResponseImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/jsp/mocks/weblogic/servlet/internal/ServletResponseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletResponseImpl.java 11 Jul 2003 17:03:27 -0000 1.2
+++ ServletResponseImpl.java 1 Mar 2004 03:50:59 -0000 1.3
@@ -50,9 +50,10 @@
*/
package weblogic.servlet.internal;
-import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
/**
* **********************************************************************
1.3 +9 -5 cocoon-2.1/src/blocks/jsp/mocks/weblogic/servlet/internal/ServletContextImpl.java
Index: ServletContextImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/jsp/mocks/weblogic/servlet/internal/ServletContextImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletContextImpl.java 11 Jul 2003 17:03:27 -0000 1.2
+++ ServletContextImpl.java 1 Mar 2004 03:50:59 -0000 1.3
@@ -50,10 +50,14 @@
*/
package weblogic.servlet.internal;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
/**
* **********************************************************************
1.3 +7 -3 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/CocoonToAvalonSource.java
Index: CocoonToAvalonSource.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/source/impl/CocoonToAvalonSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CocoonToAvalonSource.java 16 Mar 2003 17:49:11 -0000 1.2
+++ CocoonToAvalonSource.java 1 Mar 2004 03:50:59 -0000 1.3
@@ -53,12 +53,16 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.excalibur.source.*;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceNotFoundException;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.excalibur.xml.sax.XMLizable;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
1.9 +23 -18 cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/blocks/deli/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeliImpl.java 6 Feb 2004 22:46:53 -0000 1.8
+++ DeliImpl.java 1 Mar 2004 03:50:59 -0000 1.9
@@ -50,9 +50,25 @@
*/
package org.apache.cocoon.components.deli;
-import com.hp.hpl.deli.Profile;
-import com.hp.hpl.deli.ProfileAttribute;
-import com.hp.hpl.deli.Workspace;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
@@ -73,20 +89,9 @@
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.Principal;
-import java.util.*;
+import com.hp.hpl.deli.Profile;
+import com.hp.hpl.deli.ProfileAttribute;
+import com.hp.hpl.deli.Workspace;
/**
* Allows the use of <a href="http://www-uk.hpl.hp.com/people/marbut/">DELI</a>
1.5 +9 -4 cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
Index: RequestWrapper.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestWrapper.java 6 Jul 2003 20:37:48 -0000 1.4
+++ RequestWrapper.java 1 Mar 2004 03:50:59 -0000 1.5
@@ -50,13 +50,18 @@
*/
package org.apache.cocoon.environment.wrapper;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-
-import java.security.Principal;
-import java.util.*;
/**
1.4 +7 -2 cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java
Index: RequestParameters.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestParameters.java 24 Sep 2003 21:41:12 -0000 1.3
+++ RequestParameters.java 1 Mar 2004 03:50:59 -0000 1.4
@@ -51,7 +51,12 @@
package org.apache.cocoon.environment.wrapper;
import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
/**
* This class is used by the <code>RequestWrapper</code>. It parses
1.3 +16 -11 cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTProcessorImpl.java 27 Apr 2003 15:16:15 -0000 1.2
+++ XSLTProcessorImpl.java 1 Mar 2004 03:50:59 -0000 1.3
@@ -50,6 +50,21 @@
*/
package org.apache.cocoon.components.xslt;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamSource;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -68,16 +83,6 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
-
-import javax.xml.transform.*;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamSource;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
/**
* This class defines the implementation of the {@link XSLTProcessor}
1.2 +8 -4 cocoon-2.1/src/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java
Index: DocumentHandlerAdapter.java
===================================================================
RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/xml/DocumentHandlerAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentHandlerAdapter.java 9 Mar 2003 00:09:45 -0000 1.1
+++ DocumentHandlerAdapter.java 1 Mar 2004 03:50:59 -0000 1.2
@@ -50,12 +50,16 @@
*/
package org.apache.cocoon.xml;
-import org.xml.sax.*;
-import org.xml.sax.helpers.AttributesImpl;
-
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
+
+import org.xml.sax.AttributeList;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* This class is an utility class "adapting" a SAX version 1.0