cziegeler 2002/12/05 02:01:06
Modified: src/java/org/apache/cocoon/transformation/helpers
EventRecorder.java NOPRecorder.java
MirrorRecorder.java ParametersRecorder.java
src/java/org/apache/cocoon/components/modules/input
DigestMetaModule.java NullInputModule.java
HeaderAttributeModule.java RequestModule.java
AbstractJXPathModule.java DefaultsMetaModule.java
JXPathMetaModule.java RequestParameterModule.java
XMLMetaModule.java DateInputModule.java
SystemPropertyModule.java
SessionAttributeModule.java AbstractMetaModule.java
SimpleMappingMetaModule.java
RandomNumberModule.java RequestAttributeModule.java
InputModule.java StringConstantModule.java
XMLFileModule.java SessionModule.java
DateMetaInputModule.java RequestURIModule.java
RequestContextPathModule.java MapMetaModule.java
src/java/org/apache/cocoon/components/language/programming/java
Pizza.java
Log:
Removing unused imports
Revision Changes Path
1.2 +1 -9
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/EventRecorder.java
Index: EventRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/EventRecorder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventRecorder.java 13 Nov 2002 22:09:43 -0000 1.1
+++ EventRecorder.java 5 Dec 2002 10:01:04 -0000 1.2
@@ -50,16 +50,8 @@
*/
package org.apache.cocoon.transformation.helpers;
-import java.util.ArrayList;
-import java.lang.String;
-
-import org.apache.cocoon.xml.XMLConsumer;
-
-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;
/**
* Can send recorded events and be cloned.
1.2 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java
Index: NOPRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NOPRecorder.java 2 Apr 2002 14:13:34 -0000 1.1
+++ NOPRecorder.java 5 Dec 2002 10:01:04 -0000 1.2
@@ -51,7 +51,6 @@
package org.apache.cocoon.transformation.helpers;
import org.apache.cocoon.xml.XMLConsumer;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
1.3 +8 -17
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/MirrorRecorder.java
Index: MirrorRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/MirrorRecorder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MirrorRecorder.java 14 Nov 2002 14:31:41 -0000 1.2
+++ MirrorRecorder.java 5 Dec 2002 10:01:04 -0000 1.3
@@ -50,26 +50,17 @@
*/
package org.apache.cocoon.transformation.helpers;
-import java.util.ArrayList;
-import java.util.Map;
-import java.lang.String;
-
-import org.apache.cocoon.xml.XMLConsumer;
-
+import org.apache.xerces.dom.AttributeMap;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.NamedNodeMap;
-
-import org.apache.xerces.dom.AttributeMap;
+import org.xml.sax.helpers.AttributesImpl;
-import org.apache.cocoon.transformation.helpers.EventRecorder;
+import java.util.ArrayList;
+import java.util.Map;
/**
* Consume elements start/end and characters events and reproduce them.
1.3 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
Index: ParametersRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParametersRecorder.java 19 Apr 2002 11:02:57 -0000 1.2
+++ ParametersRecorder.java 5 Dec 2002 10:01:04 -0000 1.3
@@ -50,14 +50,12 @@
*/
package org.apache.cocoon.transformation.helpers;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.parameters.Parameters;
-
+import org.apache.excalibur.source.SourceParameters;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+
+import java.util.Iterator;
/**
1.8 +3 -6
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
Index: DigestMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DigestMetaModule.java 17 Nov 2002 18:00:03 -0000 1.7
+++ DigestMetaModule.java 5 Dec 2002 10:01:04 -0000 1.8
@@ -52,16 +52,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
import java.net.URLEncoder;
-
-import java.util.Map;
-import java.util.Iterator;
-
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
+import java.util.Iterator;
+import java.util.Map;
/** Meta module that obtains values from other module and returns
* message digest of value. Very useful for storing and checking
1.4 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/NullInputModule.java
Index: NullInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/NullInputModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NullInputModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ NullInputModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,15 +51,12 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Iterator;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.util.Iterator;
+import java.util.Map;
/**
* NullInputModule returns a null object. Use this if you wnat to
1.4 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java
Index: HeaderAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HeaderAttributeModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ HeaderAttributeModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,17 +51,17 @@
package org.apache.cocoon.components.modules.input;
+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.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* HeaderAttributeModule accesses request header attributes. If the
1.2 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestModule.java
Index: RequestModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestModule.java 20 Sep 2002 22:49:50 -0000 1.1
+++ RequestModule.java 5 Dec 2002 10:01:04 -0000 1.2
@@ -51,12 +51,11 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
+
+import java.util.Map;
/**
* RequestModule provides access to Request object properties.
1.5 +5 -15
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
Index: AbstractJXPathModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractJXPathModule.java 3 Dec 2002 16:44:08 -0000 1.4
+++ AbstractJXPathModule.java 5 Dec 2002 10:01:04 -0000 1.5
@@ -51,24 +51,14 @@
package org.apache.cocoon.components.modules.input;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.jxpath.*;
+
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Iterator;
-
-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 org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.Context;
-
-import org.apache.commons.jxpath.*;
-import org.apache.commons.jxpath.servlet.*;
/**
* JXPathModule allows to access properties of any object in generic
1.7 +2 -6
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java
Index: DefaultsMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultsMetaModule.java 17 Nov 2002 18:00:03 -0000 1.6
+++ DefaultsMetaModule.java 5 Dec 2002 10:01:04 -0000 1.7
@@ -55,15 +55,11 @@
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.components.modules.input.InputModule;
-
-import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
1.2 +6 -15
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
Index: JXPathMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JXPathMetaModule.java 17 Nov 2002 18:00:03 -0000 1.1
+++ JXPathMetaModule.java 5 Dec 2002 10:01:04 -0000 1.2
@@ -51,24 +51,15 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Iterator;
-
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 org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.Context;
-
import org.apache.commons.jxpath.*;
-import org.apache.commons.jxpath.servlet.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
/**
* JXPathModule allows to access properties of any object in generic
1.4 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java
Index: RequestParameterModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestParameterModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ RequestParameterModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,17 +51,17 @@
package org.apache.cocoon.components.modules.input;
+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.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* RequestParameterModule accesses request parameters. If the
1.6 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java
Index: XMLMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLMetaModule.java 17 Nov 2002 18:00:03 -0000 1.5
+++ XMLMetaModule.java 5 Dec 2002 10:01:04 -0000 1.6
@@ -52,10 +52,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
import java.util.Vector;
/**
1.6 +4 -9
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java
Index: DateInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DateInputModule.java 28 Oct 2002 14:43:40 -0000 1.5
+++ DateInputModule.java 5 Dec 2002 10:01:04 -0000 1.6
@@ -51,17 +51,12 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Iterator;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Vector;
-import java.util.Date;
-import java.util.Map;
-import java.text.SimpleDateFormat;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* DateInputModule returns current date, optionally formated as
1.2 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SystemPropertyModule.java
Index: SystemPropertyModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SystemPropertyModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SystemPropertyModule.java 13 Nov 2002 22:46:16 -0000 1.1
+++ SystemPropertyModule.java 5 Dec 2002 10:01:04 -0000 1.2
@@ -1,11 +1,9 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Map;
-import java.util.Enumeration;
-
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.util.Map;
/**
* SystemPropertyModule is an JXPath based InputModule implementation that
1.4 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
Index: SessionAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionAttributeModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ SessionAttributeModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,18 +51,17 @@
package org.apache.cocoon.components.modules.input;
+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.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Session;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* SessionAttributeModule accesses session attributes. If the
1.4 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractMetaModule.java 17 Nov 2002 18:00:03 -0000 1.3
+++ AbstractMetaModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -53,17 +53,15 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* AbstractMetaModule gives you the infrastructure for easily
1.3 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java
Index: SimpleMappingMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleMappingMetaModule.java 3 Dec 2002 16:44:08 -0000 1.2
+++ SimpleMappingMetaModule.java 5 Dec 2002 10:01:04 -0000 1.3
@@ -52,13 +52,12 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/** Meta module that obtains values from an other module and by
* replacing the requested attribute name with another name. This is
1.5 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java
Index: RandomNumberModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RandomNumberModule.java 28 Oct 2002 14:43:40 -0000 1.4
+++ RandomNumberModule.java 5 Dec 2002 10:01:04 -0000 1.5
@@ -51,16 +51,15 @@
package org.apache.cocoon.components.modules.input;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
-import java.util.StringTokenizer;
+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.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* RandomNumberModule returns a random number as string.
1.4 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java
Index: RequestAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestAttributeModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ RequestAttributeModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,17 +51,17 @@
package org.apache.cocoon.components.modules.input;
+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.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* RequestAttributeModule accesses request attributes. If the
1.7 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/InputModule.java
Index: InputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/InputModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InputModule.java 28 Oct 2002 14:43:40 -0000 1.6
+++ InputModule.java 5 Dec 2002 10:01:04 -0000 1.7
@@ -51,13 +51,12 @@
package org.apache.cocoon.components.modules.input;
-import java.util.SortedSet;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.util.Iterator;
+import java.util.Map;
/**
* InputModule specifies an interface for components that provide
1.4 +7 -8
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/StringConstantModule.java
Index: StringConstantModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/StringConstantModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringConstantModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ StringConstantModule.java 5 Dec 2002 10:01:04 -0000 1.4
@@ -51,16 +51,15 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
/**
* StringConstantModule returns a constant string.
1.2 +8 -10
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
Index: XMLFileModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLFileModule.java 3 Dec 2002 16:44:08 -0000 1.1
+++ XMLFileModule.java 5 Dec 2002 10:01:05 -0000 1.2
@@ -51,24 +51,22 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
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.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
-
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
-
-import org.apache.cocoon.components.source.SourceUtil;
import org.w3c.dom.Document;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
/**
* This module reads an XML file from any source available to the
1.2 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionModule.java
Index: SessionModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionModule.java 20 Sep 2002 22:49:50 -0000 1.1
+++ SessionModule.java 5 Dec 2002 10:01:05 -0000 1.2
@@ -51,12 +51,11 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Map;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
+
+import java.util.Map;
/**
* SessionModule provides access to Session object properties.
1.4 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
Index: DateMetaInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateMetaInputModule.java 17 Nov 2002 18:00:03 -0000 1.3
+++ DateMetaInputModule.java 5 Dec 2002 10:01:05 -0000 1.4
@@ -53,13 +53,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.Map;
-import java.util.Iterator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Iterator;
+import java.util.Map;
/**
* Parses a date string according to a given format and returns a date
1.4 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestURIModule.java
Index: RequestURIModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestURIModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestURIModule.java 28 Oct 2002 14:43:40 -0000 1.3
+++ RequestURIModule.java 5 Dec 2002 10:01:05 -0000 1.4
@@ -51,17 +51,16 @@
package org.apache.cocoon.components.modules.input;
-import java.util.Iterator;
-import java.util.Vector;
-import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.environment.ObjectModelHelper;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
/**
* RequestURIModule accesses the request URI. If the
1.3 +7 -9
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestContextPathModule.java
Index: RequestContextPathModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestContextPathModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestContextPathModule.java 28 Oct 2002 14:43:40 -0000 1.2
+++ RequestContextPathModule.java 5 Dec 2002 10:01:05 -0000 1.3
@@ -51,18 +51,16 @@
package org.apache.cocoon.components.modules.input;
+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.environment.ObjectModelHelper;
+
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
-import java.util.StringTokenizer;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* RequestContextPathModule allows to use the request context path in
1.6 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/MapMetaModule.java
Index: MapMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/MapMetaModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MapMetaModule.java 17 Nov 2002 18:00:03 -0000 1.5
+++ MapMetaModule.java 5 Dec 2002 10:01:05 -0000 1.6
@@ -52,10 +52,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* Meta module that obtains an Object from another module, assumes
1.3 +2 -9
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java
Index: Pizza.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Pizza.java 22 Feb 2002 07:00:09 -0000 1.2
+++ Pizza.java 5 Dec 2002 10:01:06 -0000 1.3
@@ -50,25 +50,18 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.cocoon.components.language.programming.CompilerError;
-import org.apache.cocoon.util.ClassUtils;
-
import net.sf.pizzacompiler.compiler.ClassReader;
import net.sf.pizzacompiler.compiler.FileCompilerOutput;
import net.sf.pizzacompiler.compiler.FileSourceReader;
import net.sf.pizzacompiler.compiler.Main;
+import org.apache.cocoon.util.ClassUtils;
import org.apache.log.Hierarchy;
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
/**
* This class wraps the Pizza Java Compiler.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
