cziegeler 2003/02/27 06:50:03
Modified: src/scratchpad/src/org/apache/cocoon/callback Tag:
cocoon_2_0_3_branch DefaultCallBackHandler.java
src/scratchpad/src/org/apache/cocoon/components/source Tag:
cocoon_2_0_3_branch BlobSource.java
src/scratchpad/src/org/apache/cocoon/precept Tag:
cocoon_2_0_3_branch InstanceFactory.java
InstanceTransformer.java Context.java
Preceptor.java Constraint.java
src/scratchpad/src/org/apache/cocoon/validation/schematron
Tag: cocoon_2_0_3_branch Phase.java
ValidationResult.java SchematronValidator.java
Pattern.java SchematronFactory.java
ActivePattern.java
src/scratchpad/src/org/apache/cocoon/generation Tag:
cocoon_2_0_3_branch XPathDirectoryGenerator.java
LinkStatusGenerator.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints
Tag: cocoon_2_0_3_branch RegexprConstraint.java
ChoiceConstraint.java
src/scratchpad/src/org/apache/cocoon/validation Tag:
cocoon_2_0_3_branch ZTestBean.java
SchemaFactory.java ZValidationTest.java
src/scratchpad/src/org/apache/cocoon/transformation/asynchronous
Tag: cocoon_2_0_3_branch PooledThread.java
XMLByteStreamFileInterpreter.java ThreadPool.java
XMLByteStreamFileCompiler.java
VariableHardResourceLimitingPool.java
src/scratchpad/src/org/apache/cocoon/transformation/constrained
Tag: cocoon_2_0_3_branch
ContainerElementEndEvent.java
ElementValueEvent.java ElementEventListener.java
ElementEventAdapter.java
AbstractConstrainedTransformer.java
src/scratchpad/src/org/apache/cocoon/precept/stores/bean
Tag: cocoon_2_0_3_branch InstanceImpl.java
src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple
Tag: cocoon_2_0_3_branch Node.java
AttributeNode.java InstanceImpl.java
src/scratchpad/src/org/apache/cocoon/acting Tag:
cocoon_2_0_3_branch MultiAction.java
CookieValidatorAction.java SectionCutterAction.java
src/scratchpad/src/org/apache/cocoon/samples/xmlform Tag:
cocoon_2_0_3_branch TestBean.java
src/scratchpad/src/org/apache/cocoon/storejanitor Tag:
cocoon_2_0_3_branch StoreJanitorImpl.java
src/scratchpad/src/org/apache/cocoon/transformation Tag:
cocoon_2_0_3_branch XMLDBTransformer.java
AsynchronousCIncludeTransformer.java
Chart2SvgTransformer.java
src/scratchpad/src/org/apache/cocoon/transformation/pagination
Tag: cocoon_2_0_3_branch Paginator.java
Pagesheet.java
src/scratchpad/src/org/apache/cocoon/precept/acting Tag:
cocoon_2_0_3_branch AbstractPreceptorAction.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax
Tag: cocoon_2_0_3_branch
AttributePreceptorNode.java
src/java/org/apache/cocoon/components/resolver Tag:
cocoon_2_0_3_branch ResolverImpl.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors Tag:
cocoon_2_0_3_branch AbstractPreceptor.java
Log:
Removing unused imports
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
No revision
No revision
1.1.2.2 +7 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/callback/Attic/DefaultCallBackHandler.java
Index: DefaultCallBackHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/callback/Attic/DefaultCallBackHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultCallBackHandler.java 7 Feb 2003 07:25:24 -0000 1.1.2.1
+++ DefaultCallBackHandler.java 27 Feb 2003 14:49:57 -0000 1.1.2.2
@@ -50,20 +50,19 @@
*/
package org.apache.cocoon.callback;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Composable;
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.SAXConfigurationHandler;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.xml.XMLFragment;
-import org.apache.cocoon.transformation.XIncludeTransformer;
-
-import java.util.Map;
-import java.util.HashMap;
/**
* The DefaultCallBackHandler is a proof of concept. It should be made to
No revision
No revision
1.2.2.2 +8 -13
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/BlobSource.java
Index: BlobSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/BlobSource.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- BlobSource.java 1 Dec 2002 21:19:58 -0000 1.2.2.1
+++ BlobSource.java 27 Feb 2003 14:49:57 -0000 1.2.2.2
@@ -54,22 +54,17 @@
*/
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.log.Logger;
-
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.component.ComponentSelector;
-
-import org.apache.cocoon.ProcessingException;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
import java.io.ByteArrayInputStream;
import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
-
import java.sql.*;
+
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.cocoon.ProcessingException;
/**
* A <code>Source</code> that takes its content in a single JDBC column. Any
No revision
No revision
1.3.2.2 +9 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/InstanceFactory.java
Index: InstanceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/InstanceFactory.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- InstanceFactory.java 7 Feb 2003 07:25:21 -0000 1.3.2.1
+++ InstanceFactory.java 27 Feb 2003 14:49:57 -0000 1.3.2.2
@@ -51,18 +51,19 @@
package org.apache.cocoon.precept;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.component.*;
+import java.net.URL;
+import java.util.HashMap;
+
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.HashMap;
-import java.net.URL;
-import java.net.MalformedURLException;
-
import org.apache.cocoon.precept.preceptors.PreceptorBuilder;
/*
1.4.2.2 +6 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/InstanceTransformer.java
Index: InstanceTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/InstanceTransformer.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- InstanceTransformer.java 7 Feb 2003 07:25:21 -0000 1.4.2.1
+++ InstanceTransformer.java 27 Feb 2003 14:49:57 -0000 1.4.2.2
@@ -51,26 +51,24 @@
package org.apache.cocoon.precept;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.precept.acting.AbstractPreceptorAction;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.NOPCacheValidity;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.precept.acting.AbstractPreceptorAction;
import org.apache.cocoon.transformation.AbstractTransformer;
-import org.apache.log.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
/*
* @author: Torsten Curdt <[EMAIL PROTECTED]>
1.2.2.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Context.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Context.java 7 Feb 2003 07:25:21 -0000 1.2.2.1
+++ Context.java 27 Feb 2003 14:49:57 -0000 1.2.2.2
@@ -51,7 +51,6 @@
package org.apache.cocoon.precept;
-import java.util.Locale;
/*
* @version: Mar 14, 2002
1.3.2.2 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Preceptor.java
Index: Preceptor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Preceptor.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- Preceptor.java 7 Feb 2003 07:25:21 -0000 1.3.2.1
+++ Preceptor.java 27 Feb 2003 14:49:57 -0000 1.3.2.2
@@ -51,10 +51,9 @@
package org.apache.cocoon.precept;
-import org.apache.avalon.framework.component.Component;
-
import java.util.Collection;
-import java.net.URL;
+
+import org.apache.avalon.framework.component.Component;
/*
* @version: Mar 14, 2002
1.2.2.2 +0 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Constraint.java
Index: Constraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/Attic/Constraint.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Constraint.java 7 Feb 2003 07:25:21 -0000 1.2.2.1
+++ Constraint.java 27 Feb 2003 14:49:57 -0000 1.2.2.2
@@ -51,8 +51,6 @@
package org.apache.cocoon.precept;
-import org.apache.cocoon.precept.Context;
-import org.apache.avalon.framework.configuration.Configuration;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
No revision
No revision
1.1.2.2 +4 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/Phase.java
Index: Phase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/Phase.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Phase.java 24 May 2002 09:06:54 -0000 1.1.2.1
+++ Phase.java 27 Feb 2003 14:49:58 -0000 1.1.2.2
@@ -62,10 +62,9 @@
package org.apache.cocoon.validation.schematron;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
/**
1.2.2.3 +5 -6
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java
Index: ValidationResult.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ValidationResult.java 5 Jun 2002 17:19:30 -0000 1.2.2.2
+++ ValidationResult.java 27 Feb 2003 14:49:58 -0000 1.2.2.3
@@ -62,11 +62,10 @@
package org.apache.cocoon.validation.schematron;
-import java.util.Iterator;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
1.1.2.4 +8 -32
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java
Index: SchematronValidator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SchematronValidator.java 20 Nov 2002 12:35:18 -0000 1.1.2.3
+++ SchematronValidator.java 27 Feb 2003 14:49:58 -0000 1.1.2.4
@@ -63,43 +63,19 @@
package org.apache.cocoon.validation.schematron;
-import java.io.OutputStreamWriter;
-import java.io.InputStream;
-
-// java classes
-import java.util.Properties;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.SortedSet;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.File;
-import java.net.URL;
-
-
-// XML classes
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-// logger
+import org.apache.cocoon.validation.Validator;
+import org.apache.commons.jxpath.JXPathContext;
+import org.apache.commons.jxpath.Pointer;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.log.Priority;
-
-// JXPath classes
-import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.Pointer;
-
-// Cocoon classes
-import org.apache.cocoon.validation.Validator;
/**
* An object representing a single Schematron schema, used to validate
1.1.2.2 +4 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/Pattern.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Pattern.java 24 May 2002 09:06:54 -0000 1.1.2.1
+++ Pattern.java 27 Feb 2003 14:49:58 -0000 1.1.2.2
@@ -62,10 +62,9 @@
package org.apache.cocoon.validation.schematron;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
/**
1.1.2.4 +11 -27
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java
Index: SchematronFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SchematronFactory.java 21 Nov 2002 15:06:52 -0000 1.1.2.3
+++ SchematronFactory.java 27 Feb 2003 14:49:58 -0000 1.1.2.4
@@ -62,35 +62,19 @@
package org.apache.cocoon.validation.schematron;
-import java.io.OutputStreamWriter;
-import java.io.InputStream;
-
-// java classes
-import java.util.Properties;
-import java.util.List;
-import java.io.IOException;
-import java.net.URL;
-
-// XML classes
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
+import javax.xml.parsers.DocumentBuilderFactory;
-// logger
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.cocoon.validation.Schema;
+import org.apache.cocoon.validation.SchemaFactory;
+import org.apache.commons.jxpath.JXPathContext;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.apache.log.Priority;
-
-// JXPath classes
-import org.apache.commons.jxpath.JXPathContext;
-
-// Cocoon classes
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.cocoon.validation.SchemaFactory;
-import org.apache.cocoon.validation.Schema;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
/**
1.1.2.2 +3 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ActivePattern.java
Index: ActivePattern.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ActivePattern.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ActivePattern.java 24 May 2002 09:06:54 -0000 1.1.2.1
+++ ActivePattern.java 27 Feb 2003 14:49:58 -0000 1.1.2.2
@@ -62,10 +62,6 @@
package org.apache.cocoon.validation.schematron;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
/**
No revision
No revision
1.4.2.2 +6 -15
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Index: XPathDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- XPathDirectoryGenerator.java 7 Feb 2003 07:25:29 -0000 1.4.2.1
+++ XPathDirectoryGenerator.java 27 Feb 2003 14:49:59 -0000 1.4.2.2
@@ -50,30 +50,21 @@
*/
package org.apache.cocoon.generation;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.Stack;
/**
* Generates an XML directory listing performing XPath queries
1.1.2.2 +15 -17
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/Attic/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/Attic/LinkStatusGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LinkStatusGenerator.java 14 Jun 2002 16:29:23 -0000 1.1.2.1
+++ LinkStatusGenerator.java 27 Feb 2003 14:49:59 -0000 1.1.2.2
@@ -1,34 +1,32 @@
package org.apache.cocoon.generation;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.util.Tokenizer;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-import org.apache.log.Logger;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URLConnection;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
/**
* Generates a list of links that are reachable from the src and their status.
No revision
No revision
1.3.2.2 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/Attic/RegexprConstraint.java
Index: RegexprConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/Attic/RegexprConstraint.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RegexprConstraint.java 7 Feb 2003 07:25:22 -0000 1.3.2.1
+++ RegexprConstraint.java 27 Feb 2003 14:49:59 -0000 1.3.2.2
@@ -51,12 +51,11 @@
package org.apache.cocoon.precept.preceptors.easyrelax.constraints;
-import org.apache.cocoon.precept.Context;
-import org.apache.cocoon.precept.ConfigurationHelper;
-import org.apache.avalon.framework.configuration.Configuration;
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.SingleThreaded;
+import org.apache.cocoon.precept.Context;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.xml.sax.ContentHandler;
1.3.2.2 +8 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/Attic/ChoiceConstraint.java
Index: ChoiceConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/Attic/ChoiceConstraint.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ChoiceConstraint.java 7 Feb 2003 07:25:22 -0000 1.3.2.1
+++ ChoiceConstraint.java 27 Feb 2003 14:49:59 -0000 1.3.2.2
@@ -51,17 +51,20 @@
package org.apache.cocoon.precept.preceptors.easyrelax.constraints;
-import org.apache.cocoon.precept.Context;
-import org.apache.cocoon.precept.ConfigurationHelper;
-import org.apache.avalon.framework.configuration.Configuration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+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.SingleThreaded;
+import org.apache.cocoon.precept.Context;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.*;
/*
* @version: Mar 21, 2002
No revision
No revision
1.1.2.1 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/ZTestBean.java
Index: ZTestBean.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/ZTestBean.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ZTestBean.java 7 Apr 2002 08:58:27 -0000 1.1
+++ ZTestBean.java 27 Feb 2003 14:49:59 -0000 1.1.2.1
@@ -1,6 +1,5 @@
package org.apache.cocoon.validation;
-import java.util.List;
import java.util.ArrayList;
/**
1.1.2.2 +3 -6
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/SchemaFactory.java
Index: SchemaFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/SchemaFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SchemaFactory.java 24 May 2002 09:06:54 -0000 1.1.2.1
+++ SchemaFactory.java 27 Feb 2003 14:49:59 -0000 1.1.2.2
@@ -62,9 +62,6 @@
package org.apache.cocoon.validation;
-import java.io.IOException;
-
-import org.xml.sax.SAXParseException;
import org.xml.sax.InputSource;
/**
1.1.2.2 +6 -24
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/ZValidationTest.java
Index: ZValidationTest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/Attic/ZValidationTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ZValidationTest.java 24 May 2002 09:06:54 -0000 1.1.2.1
+++ ZValidationTest.java 27 Feb 2003 14:49:59 -0000 1.1.2.2
@@ -64,31 +64,13 @@
package org.apache.cocoon.validation;
// Java classes
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
import java.util.Iterator;
import java.util.SortedSet;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.File;
-
-// XML classes
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.TransformerException;
import org.xml.sax.InputSource;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-// java classes
-import java.util.Properties;
-
-import org.apache.cocoon.validation.SchemaFactory;
-import org.apache.cocoon.validation.Schema;
-import org.apache.cocoon.validation.Validator;
-import org.apache.cocoon.validation.Violation;
-
-
-
-import org.apache.cocoon.validation.ZTestBean;
/**
*
No revision
No revision
1.1.2.3 +0 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/PooledThread.java
Index: PooledThread.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/PooledThread.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PooledThread.java 7 Feb 2003 07:25:26 -0000 1.1.2.2
+++ PooledThread.java 27 Feb 2003 14:49:59 -0000 1.1.2.3
@@ -50,15 +50,8 @@
*/
package org.apache.cocoon.transformation.asynchronous;
-import org.apache.cocoon.components.CocoonComponentManager;
-import org.apache.cocoon.components.EnvironmentStack;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.Processor;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
-import java.util.Map;
-
-import org.apache.cocoon.transformation.asynchronous.ThreadPool;
/**
* An implementation of a poolable thread for Cocoon.
1.1.2.3 +6 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/XMLByteStreamFileInterpreter.java
Index: XMLByteStreamFileInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/XMLByteStreamFileInterpreter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLByteStreamFileInterpreter.java 7 Feb 2003 07:25:26 -0000 1.1.2.2
+++ XMLByteStreamFileInterpreter.java 27 Feb 2003 14:49:59 -0000 1.1.2.3
@@ -50,18 +50,16 @@
*/
package org.apache.cocoon.transformation.asynchronous;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.xml.AbstractXMLProducer;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.ArrayList;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* This a simple xml compiler which takes a byte array as input.
1.1.2.3 +0 -6
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/ThreadPool.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ThreadPool.java 7 Feb 2003 07:25:26 -0000 1.1.2.2
+++ ThreadPool.java 27 Feb 2003 14:49:59 -0000 1.1.2.3
@@ -51,15 +51,9 @@
package org.apache.cocoon.transformation.asynchronous;
import org.apache.avalon.excalibur.pool.ObjectFactory;
-import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.activity.Disposable;
-
import org.apache.avalon.framework.logger.AbstractLoggable;
-
-import
org.apache.cocoon.transformation.asynchronous.VariableHardResourceLimitingPool;
-import org.apache.cocoon.transformation.asynchronous.PooledThread;
/**
* This is a blocking, hardResourceLimiting thread pool.
1.1.2.3 +5 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/XMLByteStreamFileCompiler.java
Index: XMLByteStreamFileCompiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/XMLByteStreamFileCompiler.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLByteStreamFileCompiler.java 7 Feb 2003 07:25:26 -0000 1.1.2.2
+++ XMLByteStreamFileCompiler.java 27 Feb 2003 14:50:00 -0000 1.1.2.3
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.transformation.asynchronous;
-import org.apache.cocoon.components.sax.XMLSerializer;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.HashMap;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
+import org.apache.cocoon.components.sax.XMLSerializer;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-import java.util.HashMap;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
/**
* Stolen--no, "inspired by" the XMLByteStreamInterpreter, but
1.1.2.3 +0 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/VariableHardResourceLimitingPool.java
Index: VariableHardResourceLimitingPool.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/asynchronous/Attic/VariableHardResourceLimitingPool.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- VariableHardResourceLimitingPool.java 7 Feb 2003 07:25:26 -0000 1.1.2.2
+++ VariableHardResourceLimitingPool.java 27 Feb 2003 14:50:00 -0000 1.1.2.3
@@ -54,8 +54,6 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
/**
* This is a VariableHardResourceLimitingPool. What's variable
* about it? The maximum number of threads. We wanted a
No revision
No revision
1.1.2.2 +0 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ContainerElementEndEvent.java
Index: ContainerElementEndEvent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ContainerElementEndEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ContainerElementEndEvent.java 7 Feb 2003 07:25:22 -0000 1.1.2.1
+++ ContainerElementEndEvent.java 27 Feb 2003 14:50:00 -0000 1.1.2.2
@@ -53,8 +53,6 @@
import java.util.EventObject;
-import org.xml.sax.Attributes;
-import org.apache.cocoon.xml.XMLProducer;
/**
1.1.2.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementValueEvent.java
Index: ElementValueEvent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementValueEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ElementValueEvent.java 7 Feb 2003 07:25:22 -0000 1.1.2.1
+++ ElementValueEvent.java 27 Feb 2003 14:50:00 -0000 1.1.2.2
@@ -52,7 +52,6 @@
package org.apache.cocoon.transformation.constrained;
-import java.util.EventObject;
import org.xml.sax.Attributes;
1.1.2.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementEventListener.java
Index: ElementEventListener.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementEventListener.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ElementEventListener.java 7 Feb 2003 07:25:22 -0000 1.1.2.1
+++ ElementEventListener.java 27 Feb 2003 14:50:00 -0000 1.1.2.2
@@ -52,7 +52,6 @@
package org.apache.cocoon.transformation.constrained;
import java.util.EventListener;
-import org.xml.sax.SAXException;
/**
*
1.1.2.2 +0 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementEventAdapter.java
Index: ElementEventAdapter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/ElementEventAdapter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ElementEventAdapter.java 7 Feb 2003 07:25:22 -0000 1.1.2.1
+++ ElementEventAdapter.java 27 Feb 2003 14:50:00 -0000 1.1.2.2
@@ -51,8 +51,6 @@
package org.apache.cocoon.transformation.constrained;
-import java.util.EventListener;
-import org.xml.sax.SAXException;
/**
*
1.1.2.2 +6 -14
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java
Index: AbstractConstrainedTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractConstrainedTransformer.java 7 Feb 2003 07:25:22 -0000 1.1.2.1
+++ AbstractConstrainedTransformer.java 27 Feb 2003 14:50:00 -0000 1.1.2.2
@@ -52,29 +52,21 @@
package org.apache.cocoon.transformation.constrained;
import java.io.IOException;
-
-import java.util.Map;
-import java.util.Properties;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.ListIterator;
-import java.util.TooManyListenersException;
import java.util.EventListener;
+import java.util.ListIterator;
+import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.XMLProducer;
-import org.apache.cocoon.transformation.*;
-
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.SAXException;
+import org.xml.sax.EntityResolver;
import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.AttributesImpl;
/**
No revision
No revision
1.3.2.2 +7 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/bean/Attic/InstanceImpl.java
Index: InstanceImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/bean/Attic/InstanceImpl.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- InstanceImpl.java 7 Feb 2003 07:25:22 -0000 1.3.2.1
+++ InstanceImpl.java 27 Feb 2003 14:50:01 -0000 1.3.2.2
@@ -51,11 +51,18 @@
package org.apache.cocoon.precept.stores.bean;
+import java.util.Collection;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
+import org.apache.cocoon.precept.Context;
+import org.apache.cocoon.precept.InvalidXPathSyntaxException;
+import org.apache.cocoon.precept.Preceptor;
+import org.apache.cocoon.precept.PreceptorViolationException;
+import org.apache.cocoon.precept.stores.AbstractInstance;
import org.apache.cocoon.xml.DocumentHandlerAdapter;
import org.apache.commons.jxpath.JXPathContext;
import org.exolab.castor.mapping.Mapping;
@@ -65,11 +72,6 @@
import org.exolab.castor.xml.ValidationException;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.apache.cocoon.precept.*;
-import org.apache.cocoon.precept.stores.AbstractInstance;
-
-import java.util.List;
-import java.util.Collection;
/*
* @version: Mar 15, 2002
No revision
No revision
1.3.2.2 +0 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/Node.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- Node.java 7 Feb 2003 07:25:24 -0000 1.3.2.1
+++ Node.java 27 Feb 2003 14:50:01 -0000 1.3.2.2
@@ -51,10 +51,6 @@
package org.apache.cocoon.precept.stores.dom.simple;
-import org.apache.cocoon.precept.Context;
-
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Collection;
/*
1.3.2.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/AttributeNode.java
Index: AttributeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/AttributeNode.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- AttributeNode.java 7 Feb 2003 07:25:24 -0000 1.3.2.1
+++ AttributeNode.java 27 Feb 2003 14:50:01 -0000 1.3.2.2
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.precept.stores.dom.simple;
-import java.util.Iterator;
import java.util.Collection;
/*
1.4.2.2 +10 -9
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/InstanceImpl.java
Index: InstanceImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/dom/simple/Attic/InstanceImpl.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- InstanceImpl.java 7 Feb 2003 07:25:24 -0000 1.4.2.1
+++ InstanceImpl.java 27 Feb 2003 14:50:01 -0000 1.4.2.2
@@ -52,18 +52,19 @@
package org.apache.cocoon.precept.stores.dom.simple;
-import org.apache.cocoon.precept.*;
-import org.apache.cocoon.precept.Constraint;
-import org.apache.cocoon.precept.stores.dom.simple.Node;
-import org.apache.cocoon.precept.stores.AbstractInstance;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+import org.apache.cocoon.precept.Context;
+import org.apache.cocoon.precept.InvalidXPathSyntaxException;
+import org.apache.cocoon.precept.NoSuchNodeException;
+import org.apache.cocoon.precept.Preceptor;
+import org.apache.cocoon.precept.PreceptorViolationException;
+import org.apache.cocoon.precept.stores.AbstractInstance;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
/*
* @version: Mar 14, 2002
No revision
No revision
1.2.2.2 +3 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/Attic/MultiAction.java
Index: MultiAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/Attic/MultiAction.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- MultiAction.java 7 Feb 2003 07:24:35 -0000 1.2.2.1
+++ MultiAction.java 27 Feb 2003 14:50:01 -0000 1.2.2.2
@@ -50,13 +50,12 @@
*/
package org.apache.cocoon.acting;
-import org.apache.cocoon.Constants;
-import org.apache.avalon.framework.thread.ThreadSafe;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* This is just a simple example how to use the new
1.6.2.3 +5 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java
Index: CookieValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- CookieValidatorAction.java 7 Feb 2003 07:24:35 -0000 1.6.2.2
+++ CookieValidatorAction.java 27 Feb 2003 14:50:01 -0000 1.6.2.3
@@ -50,22 +50,19 @@
*/
package org.apache.cocoon.acting;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.Tokenizer;
-import org.apache.log.Logger;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This is the action used to validate Cookie parameters (values). The
1.6.2.2 +3 -10
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SectionCutterAction.java
Index: SectionCutterAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SectionCutterAction.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- SectionCutterAction.java 7 Feb 2003 07:24:35 -0000 1.6.2.1
+++ SectionCutterAction.java 27 Feb 2003 14:50:01 -0000 1.6.2.2
@@ -50,23 +50,16 @@
*/
package org.apache.cocoon.acting;
+import java.util.*;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ConfigurableComposerAction;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Vector;
/**
* An action designed to set any number of variables, based on the current site
No revision
No revision
1.2.2.1 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/samples/xmlform/Attic/TestBean.java
Index: TestBean.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/samples/xmlform/Attic/TestBean.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TestBean.java 7 Apr 2002 08:58:27 -0000 1.2
+++ TestBean.java 27 Feb 2003 14:50:02 -0000 1.2.2.1
@@ -1,6 +1,5 @@
package org.apache.cocoon.samples.xmlform;
-import java.util.List;
import java.util.ArrayList;
public class TestBean {
No revision
No revision
1.2.2.2 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/storejanitor/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/storejanitor/StoreJanitorImpl.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- StoreJanitorImpl.java 7 Feb 2003 07:25:31 -0000 1.2.2.1
+++ StoreJanitorImpl.java 27 Feb 2003 14:50:02 -0000 1.2.2.2
@@ -205,7 +205,7 @@
sleepPeriod = minTimeToFill() / 2 < getMaxSleep() ? minTimeToFill() / 2
: getMaxSleep();
debug("Store checker going to sleep for " + sleepPeriod + "ms, (max
sleep=" + getMaxSleep() + "ms), with memory in use=" + inUseAfter);
try {
- Thread.currentThread().sleep(sleepPeriod);
+ Thread.sleep(sleepPeriod);
} catch (InterruptedException ignore) {
}
}
No revision
No revision
1.6.2.3 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/XMLDBTransformer.java
Index: XMLDBTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/XMLDBTransformer.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- XMLDBTransformer.java 7 Feb 2003 07:25:23 -0000 1.6.2.2
+++ XMLDBTransformer.java 27 Feb 2003 14:50:02 -0000 1.6.2.3
@@ -191,7 +191,7 @@
/** True when inside <query> element. */
private boolean processing;
- public void XMLDBTransformer() {
+ public XMLDBTransformer() {
format.put(OutputKeys.ENCODING, "utf-8");
format.put(OutputKeys.INDENT, "no");
format.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
1.1.2.4 +9 -13
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/AsynchronousCIncludeTransformer.java
Index: AsynchronousCIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/AsynchronousCIncludeTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AsynchronousCIncludeTransformer.java 7 Feb 2003 07:25:23 -0000 1.1.2.3
+++ AsynchronousCIncludeTransformer.java 27 Feb 2003 14:50:02 -0000 1.1.2.4
@@ -50,6 +50,13 @@
*/
package org.apache.cocoon.transformation;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -59,29 +66,18 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
-import org.apache.cocoon.transformation.CIncludeTransformer;
-import org.apache.cocoon.transformation.asynchronous.XMLByteStreamFile;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.transformation.asynchronous.AsyncHelper;
+import org.apache.cocoon.transformation.asynchronous.XMLByteStreamFile;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.io.File;
/**
* The AsynchronousCIncludeTransformer processes CInclude tags
1.1.2.2 +8 -16
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/Chart2SvgTransformer.java
Index: Chart2SvgTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Attic/Chart2SvgTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Chart2SvgTransformer.java 7 Feb 2003 07:25:23 -0000 1.1.2.1
+++ Chart2SvgTransformer.java 27 Feb 2003 14:50:02 -0000 1.1.2.2
@@ -51,26 +51,18 @@
package org.apache.cocoon.transformation;
-import java.io.IOException;
+import java.awt.Color;
+import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.environment.SourceResolver;
-
-import org.apache.cocoon.transformation.constrained.*;
-
-import java.util.TooManyListenersException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import java.util.Map;
-
-import java.awt.Color;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
+import org.apache.cocoon.transformation.constrained.AbstractConstrainedTransformer;
+import org.apache.cocoon.transformation.constrained.ContainerElementEndEvent;
+import org.apache.cocoon.transformation.constrained.ElementEventAdapter;
+import org.apache.cocoon.transformation.constrained.ElementValueEvent;
+import org.apache.cocoon.transformation.constrained.XmlTreeConstraint;
import org.krysalis.wings.*;
+import org.xml.sax.SAXException;
/**
No revision
No revision
1.7.2.4 +2 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java
Index: Paginator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- Paginator.java 7 Feb 2003 07:25:25 -0000 1.7.2.3
+++ Paginator.java 27 Feb 2003 14:50:02 -0000 1.7.2.4
@@ -52,23 +52,17 @@
package org.apache.cocoon.transformation.pagination;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CompositeCacheValidity;
-import org.apache.cocoon.caching.ParametersCacheValidity;
import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.store.Store;
@@ -76,14 +70,10 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.ContentHandlerWrapper;
-import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.transformation.AbstractTransformer;
-
+import org.apache.cocoon.util.HashUtil;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.AttributesImpl;
1.5.2.3 +5 -9
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Pagesheet.java
Index: Pagesheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Pagesheet.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- Pagesheet.java 7 Feb 2003 07:25:25 -0000 1.5.2.2
+++ Pagesheet.java 27 Feb 2003 14:50:02 -0000 1.5.2.3
@@ -51,20 +51,16 @@
package org.apache.cocoon.transformation.pagination;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Set;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
+import org.apache.cocoon.Modifiable;
+import org.apache.cocoon.util.ResizableContainer;
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.cocoon.Modifiable;
-import org.apache.cocoon.util.ResizableContainer;
/**
* Interprets the pagesheet rules to perform pagination.
No revision
No revision
1.3.2.2 +15 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/acting/Attic/AbstractPreceptorAction.java
Index: AbstractPreceptorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/acting/Attic/AbstractPreceptorAction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- AbstractPreceptorAction.java 7 Feb 2003 07:25:28 -0000 1.3.2.1
+++ AbstractPreceptorAction.java 27 Feb 2003 14:50:02 -0000 1.3.2.2
@@ -51,15 +51,23 @@
package org.apache.cocoon.precept.acting;
-import org.apache.cocoon.environment.*;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.*;
-
-import org.apache.cocoon.precept.*;
-import org.apache.cocoon.precept.acting.AbstractMethodAction;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.precept.Instance;
+import org.apache.cocoon.precept.InstanceFactory;
+import org.apache.cocoon.precept.InvalidXPathSyntaxException;
+import org.apache.cocoon.precept.NoSuchNodeException;
+import org.apache.cocoon.precept.Preceptor;
+import org.apache.cocoon.precept.PreceptorViolationException;
/*
* @version: Feb 25, 2002
No revision
No revision
1.2.2.2 +3 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/Attic/AttributePreceptorNode.java
Index: AttributePreceptorNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/Attic/AttributePreceptorNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- AttributePreceptorNode.java 7 Feb 2003 07:25:22 -0000 1.2.2.1
+++ AttributePreceptorNode.java 27 Feb 2003 14:50:03 -0000 1.2.2.2
@@ -51,11 +51,10 @@
package org.apache.cocoon.precept.preceptors.easyrelax;
-import org.apache.cocoon.precept.Preceptor;
-import org.apache.cocoon.precept.Constraint;
-
-import java.util.List;
import java.util.Iterator;
+
+import org.apache.cocoon.precept.Constraint;
+import org.apache.cocoon.precept.Preceptor;
/*
* @version: Feb 22, 2002
No revision
No revision
1.9.2.7 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -r1.9.2.6 -r1.9.2.7
--- ResolverImpl.java 27 Feb 2003 14:18:20 -0000 1.9.2.6
+++ ResolverImpl.java 27 Feb 2003 14:50:03 -0000 1.9.2.7
@@ -50,18 +50,19 @@
*/
package org.apache.cocoon.components.resolver;
+import java.io.IOException;
+
import org.apache.avalon.excalibur.xml.EntityResolver;
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.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
@@ -69,8 +70,6 @@
import org.apache.xml.resolver.tools.CatalogResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
/**
No revision
No revision
1.3.2.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/Attic/AbstractPreceptor.java
Index: AbstractPreceptor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/Attic/AbstractPreceptor.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- AbstractPreceptor.java 7 Feb 2003 07:25:21 -0000 1.3.2.1
+++ AbstractPreceptor.java 27 Feb 2003 14:50:03 -0000 1.3.2.2
@@ -55,7 +55,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.cocoon.precept.Preceptor;
/*
