giacomo 2003/01/07 15:56:16
Modified: src/blocks/batik/java/org/apache/cocoon/generation
FragmentExtractorGenerator.java
src/blocks/batik/java/org/apache/cocoon/transformation
FragmentExtractorTransformer.java
src/blocks/batik/java/org/apache/cocoon/xml/dom
SVGBuilder.java
src/blocks/chaperon/java/org/apache/cocoon/generation
TextParserGenerator.java
src/blocks/chaperon/java/org/apache/cocoon/transformation
TextFragmentParserTransformer.java
src/blocks/databases/java/org/apache/cocoon/acting/modular
DatabaseAction.java DatabaseAddAction.java
DatabaseDeleteAction.java DatabaseQueryAction.java
DatabaseSelectAction.java DatabaseUpdateAction.java
src/blocks/databases/java/org/apache/cocoon/components/modules/database
HsqlIdentityAutoIncrementModule.java
IfxSerialAutoIncrementModule.java
ManualAutoIncrementModule.java
src/blocks/databases/java/org/apache/cocoon/reading
DatabaseReader.java
src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb
ServerImpl.java
src/blocks/itext/java/org/apache/cocoon/serialization
iTextSerializer.java
src/blocks/jfor/java/org/apache/cocoon/serialization
RTFSerializer.java
src/blocks/jsp/java/org/apache/cocoon/reading JSPReader.java
src/blocks/lucene/java/org/apache/cocoon/transformation
LuceneIndexTransformer.java
src/blocks/php/mocks/net/php servlet.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi
POIFSElementProcessor.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
Cell.java EPCell.java EPStyle.java Sheet.java
Workbook.java
src/blocks/poi/java/org/apache/cocoon/serialization
ElementProcessorSerializer.java HSSFSerializer.java
POIFSSerializer.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
CopletThread.java
src/blocks/precept/java/org/apache/cocoon/precept
Constraint.java Context.java InstanceFactory.java
InstanceTransformer.java Preceptor.java
src/blocks/precept/java/org/apache/cocoon/precept/acting
AbstractPreceptorAction.java
src/blocks/precept/java/org/apache/cocoon/precept/preceptors
AbstractPreceptor.java PreceptorBuilder.java
src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax
AttributePreceptorNode.java
src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints
ChoiceConstraint.java RegexprConstraint.java
src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple
AttributeNode.java InstanceImpl.java Node.java
src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp
PythonGenerator.java
src/blocks/python/mocks/org/python/core Py.java
src/blocks/swf/java/org/apache/cocoon/serialization
SWFSerializer.java
src/java/org/apache/cocoon/acting SendmailAction.java
ServerPagesAction.java SessionPropagatorAction.java
src/java/org/apache/cocoon/components/elementprocessor/impl
AbstractElementProcessorFactory.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPSessionHelper.java
src/java/org/apache/cocoon/components/modules/input
AbstractMetaModule.java XMLMetaModule.java
src/java/org/apache/cocoon/components/treeprocessor
ContainerNode.java ContainerNodeBuilder.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SerializeNode.java
src/java/org/apache/cocoon/generation
ImageDirectoryGenerator.java
src/java/org/apache/cocoon/i18n AbstractBunldeFactory.java
XMLResourceBundle.java
src/java/org/apache/cocoon/serialization
ZipArchiveSerializer.java
src/java/org/apache/cocoon/transformation
AbstractExtractionTransformer.java
SimpleFormInstanceExtractionTransformer.java
src/java/org/apache/cocoon/xml/dom DocumentWrapper.java
src/scratchpad/src/org/apache/cocoon/acting
CookieValidatorAction.java
LinkTranslatorMapAction.java
PrincipalMultiAction.java SectionCutterAction.java
SourceMultiAction.java SourceUploadAction.java
src/scratchpad/src/org/apache/cocoon/ant CocoonCrawling.java
CocoonProcessorDelegate.java CocoonTask.java
src/scratchpad/src/org/apache/cocoon/callback
DefaultCallBackHandler.java
src/scratchpad/src/org/apache/cocoon/components/axis
SoapServerImpl.java
src/scratchpad/src/org/apache/cocoon/components/repository
PrincipalProvider.java
src/scratchpad/src/org/apache/cocoon/components/repository/impl
SlidePrincipalProvider.java SlideRepository.java
src/scratchpad/src/org/apache/cocoon/components/source
BlobSource.java InspectableSource.java
ModifiableTraversableSource.java
TraversableSource.java
src/scratchpad/src/org/apache/cocoon/components/source/impl
BlobSource.java GIFSourceInspector.java
JPEGSourceInspector.java SlideSource.java
SlideSourceFactory.java SourceInspectorManager.java
XMLDBSourceFactory.java XPathSourceInspector.java
src/scratchpad/src/org/apache/cocoon/generation
PrincipalListGenerator.java
RequestAttributeGenerator.java
SourceDescriptionGenerator.java
XPathDirectoryGenerator.java
src/scratchpad/src/org/apache/cocoon/mail
ContentTypePreference.java
src/scratchpad/src/org/apache/cocoon/reading
AxisRPCReader.java
src/scratchpad/src/org/apache/cocoon/selection
DateSelector.java
src/scratchpad/src/org/apache/cocoon/storejanitor
StoreJanitorImpl.java
src/scratchpad/src/org/apache/cocoon/taglib
TransformerTagSupport.java VarTagSupport.java
VarTransformerTagSupport.java
src/scratchpad/src/org/apache/cocoon/taglib/jxpath/core
ForEachTag.java OutTag.java
src/scratchpad/src/org/apache/cocoon/taglib/string
TrimTag.java
src/scratchpad/src/org/apache/cocoon/transformation
Chart2SvgTransformer.java
src/scratchpad/src/org/apache/cocoon/transformation/constrained
AbstractConstrainedTransformer.java
ContainerElementEndEvent.java
ElementEventAdapter.java ElementEventListener.java
ElementValueEvent.java XmlTreeConstraint.java
src/scratchpad/src/org/apache/cocoon/transformation/pagination
Pagesheet.java Paginator.java
Log:
Organize Imports
Revision Changes Path
1.2 +3 -5
xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
Index: FragmentExtractorGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- FragmentExtractorGenerator.java 16 Sep 2002 15:35:06 -0000 1.1
+++ FragmentExtractorGenerator.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -52,16 +52,14 @@
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.sax.XMLDeserializer;
-import org.apache.excalibur.store.Store;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
-import org.xml.sax.SAXException;
+import org.apache.excalibur.store.Store;
-import java.io.IOException;
+import org.xml.sax.SAXException;
/** The generation half of FragmentExtractor.
* FragmentExtractor is a transformer-generator pair which is designed to
allow
1.3 +9 -9
xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- FragmentExtractorTransformer.java 22 Oct 2002 04:15:28 -0000 1.2
+++ FragmentExtractorTransformer.java 7 Jan 2003 23:56:08 -0000 1.3
@@ -50,7 +50,11 @@
*/
package org.apache.cocoon.transformation;
-import org.apache.avalon.excalibur.pool.Recyclable;
+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.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -60,26 +64,22 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.excalibur.pool.Recyclable;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.HashUtil;
+
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
-
import org.apache.excalibur.store.Store;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
1.3 +3 -2
xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/xml/dom/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/xml/dom/SVGBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- SVGBuilder.java 21 Sep 2002 17:31:42 -0000 1.2
+++ SVGBuilder.java 7 Jan 2003 23:56:08 -0000 1.3
@@ -52,11 +52,12 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.XMLResourceDescriptor;
import org.apache.cocoon.xml.XMLConsumer;
+
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
1.2 +7 -24
xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/generation/TextParserGenerator.java
Index: TextParserGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/generation/TextParserGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TextParserGenerator.java 17 Sep 2002 12:07:44 -0000 1.1
+++ TextParserGenerator.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -55,27 +55,18 @@
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.IOException;
+import java.io.Serializable;
+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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.generation.ComposerGenerator;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -83,23 +74,15 @@
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
import org.apache.excalibur.store.Store;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-
import net.sourceforge.chaperon.grammar.Grammar;
import net.sourceforge.chaperon.grammar.SyntaxErrorException;
import net.sourceforge.chaperon.grammar.generator.SAXGrammarGenerator;
-import net.sourceforge.chaperon.parser.ParserException;
import net.sourceforge.chaperon.parser.Parser;
+import net.sourceforge.chaperon.parser.ParserException;
import net.sourceforge.chaperon.parser.ParserTable;
import net.sourceforge.chaperon.parser.generator.ParserTableGenerator;
import net.sourceforge.chaperon.parser.output.EventQueue;
1.2 +10 -20
xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/TextFragmentParserTransformer.java
Index: TextFragmentParserTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/TextFragmentParserTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TextFragmentParserTransformer.java 17 Sep 2002 12:07:44 -0000
1.1
+++ TextFragmentParserTransformer.java 7 Jan 2003 23:56:08 -0000
1.2
@@ -8,18 +8,16 @@
package org.apache.cocoon.transformation;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+import org.apache.avalon.excalibur.pool.Recyclable;
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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -27,8 +25,6 @@
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.AbstractTransformer;
-import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.excalibur.source.Source;
@@ -37,21 +33,15 @@
import org.apache.excalibur.store.Store;
import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-
import net.sourceforge.chaperon.grammar.Grammar;
import net.sourceforge.chaperon.grammar.SyntaxErrorException;
import net.sourceforge.chaperon.grammar.generator.SAXGrammarGenerator;
-import net.sourceforge.chaperon.parser.ParserException;
import net.sourceforge.chaperon.parser.Parser;
+import net.sourceforge.chaperon.parser.ParserException;
import net.sourceforge.chaperon.parser.ParserTable;
import net.sourceforge.chaperon.parser.generator.ParserTableGenerator;
import net.sourceforge.chaperon.parser.output.EventQueue;
@@ -242,7 +232,7 @@
*/
public void startElement(String uri, String loc, String raw,
Attributes a) throws SAXException {
- if (this.EXTRACT_URI.equals(uri) && this.EXTRACT_ELEMENT.equals(loc)
+ if (EXTRACT_URI.equals(uri) && EXTRACT_ELEMENT.equals(loc)
&& (this.grammar != null)) {
this.extractLevel++;
@@ -264,7 +254,7 @@
*/
public void endElement(String uri, String loc,
String raw) throws SAXException {
- if (this.EXTRACT_URI.equals(uri) && this.EXTRACT_ELEMENT.equals(loc)
+ if (EXTRACT_URI.equals(uri) && EXTRACT_ELEMENT.equals(loc)
&& (this.grammar != null)) {
this.extractLevel--;
1.3 +6 -37
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java
Index: DatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- DatabaseAction.java 6 Nov 2002 18:18:30 -0000 1.2
+++ DatabaseAction.java 7 Jan 2003 23:56:08 -0000 1.3
@@ -52,63 +52,32 @@
package org.apache.cocoon.acting.modular;
import java.io.IOException;
-import java.io.InputStream;
-import java.lang.Class;
-import java.net.URL;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.ListIterator;
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.io.IOException;
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.ComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-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.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.component.DefaultRoleManager;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.util.HashMap;
-import org.apache.cocoon.util.JDBCTypeConversions;
-import org.apache.cocoon.selection.Selector;
-
import org.apache.cocoon.acting.AbstractComplementaryConfigurableAction;
import org.apache.cocoon.components.modules.database.AutoIncrementModule;
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.components.modules.output.OutputModule;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashMap;
+import org.apache.cocoon.util.JDBCTypeConversions;
/**
* Abstract action for common function needed by database actions.
1.2 +3 -4
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAddAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseAddAction.java 18 Oct 2002 14:04:27 -0000 1.1
+++ DatabaseAddAction.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -51,12 +51,11 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.sql.Statement;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
1.2 +2 -3
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseDeleteAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseDeleteAction.java 18 Oct 2002 14:04:27 -0000 1.1
+++ DatabaseDeleteAction.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -51,11 +51,10 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
1.2 +2 -12
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseQueryAction.java
Index: DatabaseQueryAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseQueryAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseQueryAction.java 18 Oct 2002 14:04:27 -0000 1.1
+++ DatabaseQueryAction.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -51,26 +51,16 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Clob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.Struct;
-import java.sql.Types;
-
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import org.apache.cocoon.util.JDBCTypeConversions;
/**
* Executes an arbitrary query. The query is associated with a table
1.2 +2 -10
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseSelectAction.java
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseSelectAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseSelectAction.java 18 Oct 2002 14:04:27 -0000 1.1
+++ DatabaseSelectAction.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -51,19 +51,11 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Clob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Struct;
-import java.sql.Types;
-
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
1.2 +2 -3
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseUpdateAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseUpdateAction.java 18 Oct 2002 14:04:27 -0000 1.1
+++ DatabaseUpdateAction.java 7 Jan 2003 23:56:08 -0000 1.2
@@ -51,11 +51,10 @@
package org.apache.cocoon.acting.modular;
-import java.util.Map;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.cocoon.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
1.2 +5 -8
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/HsqlIdentityAutoIncrementModule.java
Index: HsqlIdentityAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/HsqlIdentityAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- HsqlIdentityAutoIncrementModule.java 18 Oct 2002 14:04:26 -0000
1.1
+++ HsqlIdentityAutoIncrementModule.java 7 Jan 2003 23:56:09 -0000
1.2
@@ -51,16 +51,13 @@
package org.apache.cocoon.components.modules.database;
-import java.lang.Integer;
-import java.util.SortedSet;
-import java.util.Map;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Types;
import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
1.2 +4 -6
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/IfxSerialAutoIncrementModule.java
Index: IfxSerialAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/IfxSerialAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- IfxSerialAutoIncrementModule.java 18 Oct 2002 14:04:26 -0000 1.1
+++ IfxSerialAutoIncrementModule.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -51,16 +51,14 @@
package org.apache.cocoon.components.modules.database;
-import java.lang.Integer;
-import java.util.SortedSet;
-import java.util.Map;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import com.informix.jdbc.IfxStatement;
/**
* Abstraction layer to encapsulate different DBMS behaviour for
autoincrement columns.
1.2 +5 -6
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/ManualAutoIncrementModule.java
Index: ManualAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/modules/database/ManualAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ManualAutoIncrementModule.java 18 Oct 2002 14:04:26 -0000 1.1
+++ ManualAutoIncrementModule.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -52,17 +52,16 @@
package org.apache.cocoon.components.modules.database;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import java.lang.Integer;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.SortedSet;
/**
* Abstraction layer to encapsulate different DBMS behaviour for
1.2 +20 -11
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DatabaseReader.java 18 Oct 2002 14:04:26 -0000 1.1
+++ DatabaseReader.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -50,13 +50,28 @@
*/
package org.apache.cocoon.reading;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.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.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -64,18 +79,12 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
+
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
-import org.xml.sax.SAXException;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.*;
-import java.util.Date;
-import java.util.Map;
+import org.xml.sax.SAXException;
/**
* This Reader pulls a resource from a database. It is configured with
1.3 +11 -11
xml-cocoon2/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- ServerImpl.java 17 Dec 2002 15:02:14 -0000 1.2
+++ ServerImpl.java 7 Jan 2003 23:56:09 -0000 1.3
@@ -50,24 +50,24 @@
*/
package org.apache.cocoon.components.hsqldb;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
import org.apache.avalon.framework.activity.Startable;
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.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
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;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.sql.SQLException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-import java.util.Enumeration;
+import org.apache.cocoon.Constants;
/**
* This class runs an instance of HSQLDB Server.
1.2 +7 -8
xml-cocoon2/src/blocks/itext/java/org/apache/cocoon/serialization/iTextSerializer.java
Index: iTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/itext/java/org/apache/cocoon/serialization/iTextSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- iTextSerializer.java 23 Oct 2002 16:56:21 -0000 1.1
+++ iTextSerializer.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -50,23 +50,22 @@
*/
package org.apache.cocoon.serialization;
+import java.io.OutputStream;
+
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.caching.CacheableProcessingComponent;
+
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.NOPValidity;
-import org.xml.sax.SAXException;
-
-import java.io.OutputStream;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
+import org.xml.sax.SAXException;
-import com.lowagie.text.*;
+import com.lowagie.text.Document;
import com.lowagie.text.pdf.PdfWriter;
-import com.lowagie.text.html.HtmlWriter;
-import com.lowagie.text.xml.*;
+import com.lowagie.text.xml.SAXiTextHandler;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
*/
1.3 +5 -16
xml-cocoon2/src/blocks/jfor/java/org/apache/cocoon/serialization/RTFSerializer.java
Index: RTFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/jfor/java/org/apache/cocoon/serialization/RTFSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- RTFSerializer.java 21 Nov 2002 18:18:48 -0000 1.2
+++ RTFSerializer.java 7 Jan 2003 23:56:09 -0000 1.3
@@ -50,28 +50,17 @@
*/
package org.apache.cocoon.serialization;
-import java.net.URL;
-import java.net.MalformedURLException;
+import java.io.BufferedWriter;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import org.apache.avalon.framework.CascadingRuntimeException;
-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.logger.LogEnabled;
import org.jfor.jfor.converter.Converter;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.io.BufferedWriter;
-
-import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
/**
* This class uses the <a href="http://www.jfor.org";>jfor</a> library
1.3 +1 -4
xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/reading/JSPReader.java
Index: JSPReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/jsp/java/org/apache/cocoon/reading/JSPReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- JSPReader.java 17 Dec 2002 11:08:49 -0000 1.2
+++ JSPReader.java 7 Jan 2003 23:56:09 -0000 1.3
@@ -60,10 +60,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.jsp.JSPEngine;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.excalibur.source.Source;
/**
* The <code>JSPReader</code> component is used to serve JSP page output data
1.2 +15 -16
xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java
Index: LuceneIndexTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- LuceneIndexTransformer.java 18 Dec 2002 23:44:51 -0000 1.1
+++ LuceneIndexTransformer.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -50,42 +50,41 @@
*/
package org.apache.cocoon.transformation;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Stack;
+
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.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.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.ProcessingException;
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.NOPCacheValidity;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.components.search.LuceneXMLIndexer;
import org.apache.cocoon.components.search.LuceneCocoonHelper;
+import org.apache.cocoon.components.search.LuceneXMLIndexer;
+import org.apache.cocoon.environment.SourceResolver;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.store.Directory;
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.analysis.Analyzer;
-
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.store.Directory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.File;
-import java.util.Stack;
-import java.util.Map;
/**
* A lucene index creation transformer.
1.2 +1 -3 xml-cocoon2/src/blocks/php/mocks/net/php/servlet.java
Index: servlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/php/mocks/net/php/servlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- servlet.java 2 Jan 2003 10:50:06 -0000 1.1
+++ servlet.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -49,8 +49,6 @@
*/
package net.php;
-import java.io.IOException;
-
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
1.2 +1 -2
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/POIFSElementProcessor.java
Index: POIFSElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/POIFSElementProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- POIFSElementProcessor.java 25 Nov 2002 15:17:37 -0000 1.1
+++ POIFSElementProcessor.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -51,8 +51,7 @@
*/
package org.apache.cocoon.components.elementprocessor.impl.poi;
-import org.apache.cocoon.components.elementprocessor.*;
-import org.apache.cocoon.components.elementprocessor.types.*;
+import org.apache.cocoon.components.elementprocessor.ElementProcessor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
1.2 +5 -5
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Cell.java
Index: Cell.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Cell.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Cell.java 25 Nov 2002 15:17:37 -0000 1.1
+++ Cell.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -54,15 +54,15 @@
-import org.apache.cocoon.CascadingIOException;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-
import java.io.IOException;
-import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Locale;
+
+import org.apache.cocoon.CascadingIOException;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
/**
1.2 +4 -5
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
Index: EPCell.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- EPCell.java 25 Nov 2002 15:17:38 -0000 1.1
+++ EPCell.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -51,16 +51,15 @@
package org.apache.cocoon.components.elementprocessor.impl.poi.hssf.elements;
-import org.apache.cocoon.components.elementprocessor.types.Attribute;
+import java.io.IOException;
+import java.util.Locale;
+
import org.apache.cocoon.components.elementprocessor.ElementProcessor;
import org.apache.cocoon.components.elementprocessor.LocaleAware;
+import org.apache.cocoon.components.elementprocessor.types.Attribute;
import org.apache.cocoon.components.elementprocessor.types.NumericConverter;
import org.apache.cocoon.components.elementprocessor.types.NumericResult;
import org.apache.cocoon.components.elementprocessor.types.Validator;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-
-import java.io.IOException;
-import java.util.Locale;
/**
* implementation of ElementProcessor to handle the "Cell" tag
1.2 +5 -8
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyle.java
Index: EPStyle.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- EPStyle.java 25 Nov 2002 15:17:38 -0000 1.1
+++ EPStyle.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -54,22 +54,19 @@
-import org.apache.cocoon.components.elementprocessor.types.Attribute;
-import org.apache.cocoon.components.elementprocessor.ElementProcessor;
+import java.io.IOException;
+import java.util.Hashtable;
+import org.apache.cocoon.components.elementprocessor.ElementProcessor;
+import org.apache.cocoon.components.elementprocessor.types.Attribute;
import org.apache.cocoon.components.elementprocessor.types.BooleanConverter;
import org.apache.cocoon.components.elementprocessor.types.BooleanResult;
import org.apache.cocoon.components.elementprocessor.types.NumericConverter;
import org.apache.cocoon.components.elementprocessor.types.NumericResult;
import org.apache.cocoon.components.elementprocessor.types.Validator;
-import org.apache.poi.hssf.util.Region;
-import org.apache.poi.hssf.util.HSSFColor;
-
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-
-import java.io.IOException;
-import java.util.Hashtable;
+import org.apache.poi.hssf.util.HSSFColor;
/**
* No-op implementation of ElementProcessor to handle the "Style" tag
1.2 +8 -12
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
Index: Sheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Sheet.java 25 Nov 2002 15:17:39 -0000 1.1
+++ Sheet.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -54,24 +54,20 @@
-import org.apache.poi.hssf.util.Region;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.util.HSSFColor;
-
import java.io.IOException;
-
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.hssf.util.Region;
/**
* internal representation of a Sheet
1.2 +5 -7
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Workbook.java
Index: Workbook.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Workbook.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Workbook.java 25 Nov 2002 15:17:39 -0000 1.1
+++ Workbook.java 7 Jan 2003 23:56:09 -0000 1.2
@@ -54,16 +54,14 @@
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFCell;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFFont;
-
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
/**
* internal representation of a Workbook
1.2 +9 -13
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/ElementProcessorSerializer.java
Index: ElementProcessorSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/ElementProcessorSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ElementProcessorSerializer.java 25 Nov 2002 15:17:43 -0000 1.1
+++ ElementProcessorSerializer.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -50,26 +50,22 @@
*/
package org.apache.cocoon.serialization;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.Composable;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Stack;
+
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import
org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
-import org.apache.cocoon.components.elementprocessor.*;
-import org.apache.cocoon.components.elementprocessor.types.*;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.components.elementprocessor.ElementProcessor;
+import org.apache.cocoon.components.elementprocessor.ElementProcessorFactory;
+import org.apache.cocoon.components.elementprocessor.types.Attribute;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.util.Stack;
/**
* An implementation of nearly all of the methods included in the
1.2 +0 -2
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/HSSFSerializer.java
Index: HSSFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/HSSFSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- HSSFSerializer.java 25 Nov 2002 15:17:43 -0000 1.1
+++ HSSFSerializer.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -51,12 +51,10 @@
package org.apache.cocoon.serialization;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.components.elementprocessor.ElementProcessor;
import org.apache.cocoon.components.elementprocessor.ElementProcessorFactory;
import
org.apache.cocoon.components.elementprocessor.impl.poi.hssf.HSSFElementProcessorFactory;
1.2 +1 -4
xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/POIFSSerializer.java
Index: POIFSSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/poi/java/org/apache/cocoon/serialization/POIFSSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- POIFSSerializer.java 25 Nov 2002 15:17:43 -0000 1.1
+++ POIFSSerializer.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -54,12 +54,9 @@
import java.io.OutputStream;
import org.apache.cocoon.components.elementprocessor.ElementProcessor;
-
-import
org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import
org.apache.cocoon.components.elementprocessor.impl.poi.POIFSElementProcessor;
-
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.xml.sax.SAXException;
/**
1.3 +7 -11
xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java
Index: CopletThread.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/CopletThread.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- CopletThread.java 8 Oct 2002 14:43:19 -0000 1.2
+++ CopletThread.java 7 Jan 2003 23:56:10 -0000 1.3
@@ -50,25 +50,16 @@
*/
package org.apache.cocoon.webapps.portal.components;
-import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -78,10 +69,15 @@
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.webapps.portal.PortalConstants;
import org.apache.cocoon.webapps.portal.context.SessionContextImpl;
-import org.apache.cocoon.webapps.session.components.SessionManager;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.dom.DOMUtil;
+
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceParameters;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
/**
1.2 +0 -5
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Constraint.java
Index: Constraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Constraint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Constraint.java 29 Oct 2002 15:48:32 -0000 1.1
+++ Constraint.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -104,12 +104,7 @@
-import org.apache.cocoon.precept.Context;
-
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.xml.sax.ContentHandler;
-
import org.xml.sax.SAXException;
1.2 +0 -1
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Context.java 29 Oct 2002 15:48:32 -0000 1.1
+++ Context.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -104,7 +104,6 @@
-import java.util.Locale;
1.2 +8 -6
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/InstanceFactory.java
Index: InstanceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/InstanceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- InstanceFactory.java 29 Oct 2002 15:48:32 -0000 1.1
+++ InstanceFactory.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -102,16 +102,18 @@
package org.apache.cocoon.precept;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.component.*;
+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.AbstractLogEnabled;
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.2 +7 -9
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/InstanceTransformer.java
Index: InstanceTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/InstanceTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- InstanceTransformer.java 29 Oct 2002 15:48:32 -0000 1.1
+++ InstanceTransformer.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -102,14 +102,20 @@
package org.apache.cocoon.precept;
+import java.io.IOException;
+import java.io.Serializable;
+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.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.excalibur.source.SourceValidity;
@@ -118,14 +124,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
/*
* @author Torsten Curdt <[EMAIL PROTECTED]>
1.2 +1 -3
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Preceptor.java
Index: Preceptor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/Preceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Preceptor.java 29 Oct 2002 15:48:32 -0000 1.1
+++ Preceptor.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -102,11 +102,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;
/*
1.2 +14 -13
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractPreceptorAction.java
Index: AbstractPreceptorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractPreceptorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- AbstractPreceptorAction.java 29 Oct 2002 15:48:33 -0000 1.1
+++ AbstractPreceptorAction.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -104,23 +104,24 @@
-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;
1.2 +0 -2
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/AbstractPreceptor.java
Index: AbstractPreceptor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/AbstractPreceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- AbstractPreceptor.java 29 Oct 2002 15:48:33 -0000 1.1
+++ AbstractPreceptor.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -107,8 +107,6 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.cocoon.precept.Preceptor;
/*
1.2 +2 -58
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/PreceptorBuilder.java
Index: PreceptorBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/PreceptorBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- PreceptorBuilder.java 29 Oct 2002 15:48:33 -0000 1.1
+++ PreceptorBuilder.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -1,121 +1,65 @@
/*
-
-
============================================================================
-
The Apache Software License, Version 1.1
-
============================================================================
-
-
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
-
Redistribution and use in source and binary forms, with or without modifica-
-
tion, are permitted provided that the following conditions are met:
-
-
1. Redistributions of source code must retain the above copyright notice,
-
this list of conditions and the following disclaimer.
-
-
2. Redistributions in binary form must reproduce the above copyright notice,
-
this list of conditions and the following disclaimer in the documentation
-
and/or other materials provided with the distribution.
-
-
3. The end-user documentation included with the redistribution, if any, must
-
include the following acknowledgment: "This product includes software
-
developed by the Apache Software Foundation (http://www.apache.org/)."
-
Alternately, this acknowledgment may appear in the software itself, if
-
and wherever such third-party acknowledgments normally appear.
-
-
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
-
used to endorse or promote products derived from this software without
-
prior written permission. For written permission, please contact
-
[EMAIL PROTECTED]
-
-
5. Products derived from this software may not be called "Apache", nor may
-
"Apache" appear in their name, without prior written permission of the
-
Apache Software Foundation.
-
-
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
This software consists of voluntary contributions made by many individuals
-
on behalf of the Apache Software Foundation and was originally created by
-
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
-
Software Foundation, please see <http://www.apache.org/>.
-
-
*/
-
-
-
package org.apache.cocoon.precept.preceptors;
import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.precept.Preceptor;
-import java.net.URL;
+import org.apache.cocoon.precept.Preceptor;
/*
-
* @version: Mar 20, 2002
-
* @author Torsten Curdt <[EMAIL PROTECTED]>
-
*/
-
public interface PreceptorBuilder extends Component {
+
public String ROLE = "org.apache.cocoon.precept.PreceptorBuilder";
public Preceptor buildPreceptor( String uri ) throws Exception;
1.2 +2 -7
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/AttributePreceptorNode.java
Index: AttributePreceptorNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/AttributePreceptorNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- AttributePreceptorNode.java 29 Oct 2002 15:48:33 -0000 1.1
+++ AttributePreceptorNode.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -104,15 +104,10 @@
-import org.apache.cocoon.precept.Preceptor;
+import java.util.Iterator;
import org.apache.cocoon.precept.Constraint;
-
-
-
-import java.util.List;
-
-import java.util.Iterator;
+import org.apache.cocoon.precept.Preceptor;
1.2 +8 -13
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/ChoiceConstraint.java
Index: ChoiceConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/ChoiceConstraint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ChoiceConstraint.java 29 Oct 2002 15:48:34 -0000 1.1
+++ ChoiceConstraint.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -104,27 +104,22 @@
-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.xml.sax.ContentHandler;
+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.*;
1.2 +60 -148
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/RegexprConstraint.java
Index: RegexprConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/RegexprConstraint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- RegexprConstraint.java 29 Oct 2002 15:48:34 -0000 1.1
+++ RegexprConstraint.java 7 Jan 2003 23:56:10 -0000 1.2
@@ -1,220 +1,132 @@
/*
-
-
============================================================================
-
The Apache Software License, Version 1.1
-
============================================================================
-
-
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
-
Redistribution and use in source and binary forms, with or without modifica-
-
tion, are permitted provided that the following conditions are met:
-
-
1. Redistributions of source code must retain the above copyright notice,
-
this list of conditions and the following disclaimer.
-
-
2. Redistributions in binary form must reproduce the above copyright notice,
-
this list of conditions and the following disclaimer in the documentation
-
and/or other materials provided with the distribution.
-
-
3. The end-user documentation included with the redistribution, if any, must
-
include the following acknowledgment: "This product includes software
-
developed by the Apache Software Foundation (http://www.apache.org/)."
-
Alternately, this acknowledgment may appear in the software itself, if
-
and wherever such third-party acknowledgments normally appear.
-
-
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
-
used to endorse or promote products derived from this software without
-
prior written permission. For written permission, please contact
-
[EMAIL PROTECTED]
-
-
5. Products derived from this software may not be called "Apache", nor may
-
"Apache" appear in their name, without prior written permission of the
-
Apache Software Foundation.
-
-
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
This software consists of voluntary contributions made by many individuals
-
on behalf of the Apache Software Foundation and was originally created by
-
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
-
Software Foundation, please see <http://www.apache.org/>.
-
-
*/
-
-
-
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.regexp.RE;
+import org.apache.cocoon.precept.Context;
+import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
import org.xml.sax.ContentHandler;
-
import org.xml.sax.SAXException;
-
-
-
/*
-
* @version: Mar 21, 2002
-
* @author Torsten Curdt <[EMAIL PROTECTED]>
-
*/
-
-public class RegexprConstraint extends AbstractConstraint implements
Configurable, SingleThreaded {
-
-
-
+public class RegexprConstraint extends AbstractConstraint implements
Configurable, SingleThreaded
+{
private String expressionString;
-
private RE expression;
-
-
- public void configure(Configuration configuration) throws
ConfigurationException {
-
+ public void configure(Configuration configuration) throws
ConfigurationException
+ {
id = configuration.getAttribute("name");
-
-
-
expressionString = configuration.getValue();
-
-
-
getLogger().debug("expression [" + String.valueOf(expressionString) +
"]");
-
-
-
- try {
-
+ try
+ {
expression = new RE(expressionString);
-
}
-
- catch (RESyntaxException e) {
-
- throw new ConfigurationException("",e);
-
+ catch (RESyntaxException e)
+ {
+ throw new ConfigurationException("", e);
}
-
}
-
-
- public boolean isSatisfiedBy(Object value, Context context ) {
-
+ public boolean isSatisfiedBy(Object value, Context context)
+ {
boolean isValid = expression.match(String.valueOf(value));
-
- System.out.println("checking regexpr [" + String.valueOf(value) + "]
matches [" + String.valueOf(expressionString) + "] is " + isValid);
-
- getLogger().debug("checking regexpr [" + String.valueOf(value) + "]
matches [" + String.valueOf(expressionString) + "] is " + isValid);
-
- return(isValid);
-
+ System.out.println(
+ "checking regexpr ["
+ + String.valueOf(value)
+ + "] matches ["
+ + String.valueOf(expressionString)
+ + "] is "
+ + isValid);
+ getLogger().debug(
+ "checking regexpr ["
+ + String.valueOf(value)
+ + "] matches ["
+ + String.valueOf(expressionString)
+ + "] is "
+ + isValid);
+ return (isValid);
}
-
-
- public String getId() {
-
- return(id);
-
+ public String getId()
+ {
+ return (id);
}
-
-
- public String getType() {
-
- return("regexpr");
-
+ public String getType()
+ {
+ return ("regexpr");
}
-
-
- public String toString() {
-
- return( String.valueOf(getType()) + "[" + String.valueOf(getId()) + "]
-> [" + String.valueOf(expressionString) + "]");
-
+ public String toString()
+ {
+ return (
+ String.valueOf(getType())
+ + "["
+ + String.valueOf(getId())
+ + "] -> ["
+ + String.valueOf(expressionString)
+ + "]");
}
-
-
- public void toSAX(ContentHandler handler) throws SAXException {
-
+ public void toSAX(ContentHandler handler) throws SAXException
+ {
}
-
}
-
1.2 +0 -1
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/AttributeNode.java
Index: AttributeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/AttributeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- AttributeNode.java 29 Oct 2002 15:48:34 -0000 1.1
+++ AttributeNode.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -100,7 +100,6 @@
package org.apache.cocoon.precept.stores.dom.simple;
-import java.util.Iterator;
import java.util.Collection;
/*
1.2 +10 -19
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/InstanceImpl.java
Index: InstanceImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/InstanceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- InstanceImpl.java 29 Oct 2002 15:48:35 -0000 1.1
+++ InstanceImpl.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -106,29 +106,20 @@
-import org.apache.cocoon.precept.*;
-
-import org.apache.cocoon.precept.Constraint;
-
-import org.apache.cocoon.precept.stores.dom.simple.Node;
+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 java.util.*;
-
-
-
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;
1.2 +0 -5
xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/precept/java/org/apache/cocoon/precept/stores/dom/simple/Node.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Node.java 29 Oct 2002 15:48:35 -0000 1.1
+++ Node.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -104,11 +104,6 @@
-import org.apache.cocoon.precept.Context;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
import java.util.Collection;
1.2 +12 -17
xml-cocoon2/src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/PythonGenerator.java
Index: PythonGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/PythonGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- PythonGenerator.java 2 Jan 2003 10:50:06 -0000 1.1
+++ PythonGenerator.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -55,32 +55,27 @@
package org.apache.cocoon.components.language.markup.xsp;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
+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.configuration.ConfigurationException;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.XMLizable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
-import org.python.util.PythonInterpreter;
import org.python.core.Py;
import org.python.core.PyCode;
-import org.python.core.PySystemState;
-import org.w3c.dom.Node;
-import org.xml.sax.helpers.AttributesImpl;
+import org.python.util.PythonInterpreter;
import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.util.Collection;
-import java.util.Properties;
-import java.util.Map;
+import org.xml.sax.helpers.AttributesImpl;
/**
* Class representing interpreted XSP-generated
1.2 +1 -2
xml-cocoon2/src/blocks/python/mocks/org/python/core/Py.java
Index: Py.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/python/mocks/org/python/core/Py.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- Py.java 2 Jan 2003 10:50:06 -0000 1.1
+++ Py.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -49,7 +49,6 @@
*/
package org.python.core;
-import java.io.FileInputStream;
import java.io.InputStream;
/**
1.2 +4 -5
xml-cocoon2/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java
Index: SWFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- SWFSerializer.java 25 Sep 2002 09:02:50 -0000 1.1
+++ SWFSerializer.java 7 Jan 2003 23:56:11 -0000 1.2
@@ -51,15 +51,14 @@
package org.apache.cocoon.serialization;
-import org.apache.cocoon.xml.XMLConsumer;
+import java.io.OutputStream;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
-import java.io.OutputStream;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
import de.tivano.flash.swf.publisher.SWFWriter;
1.10 +13 -8
xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -b -u -r1.9 -r1.10
--- SendmailAction.java 2 Jan 2003 10:50:07 -0000 1.9
+++ SendmailAction.java 7 Jan 2003 23:56:11 -0000 1.10
@@ -50,22 +50,27 @@
*/
package org.apache.cocoon.acting;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
+
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.*;
-
-// This class is compiled only if javax.mail is present. So don't remove
these imports !
-import javax.mail.*;
-import javax.mail.internet.*;
/**
* The SendmailAction class sends email. The action needs four parameters:
1.12 +7 -7
xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -b -u -r1.11 -r1.12
--- ServerPagesAction.java 18 Dec 2002 21:51:07 -0000 1.11
+++ ServerPagesAction.java 7 Jan 2003 23:56:11 -0000 1.12
@@ -50,14 +50,17 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.avalon.excalibur.logger.LogKitManager;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+
+import org.apache.avalon.excalibur.component.ComponentHandler;
+
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -66,9 +69,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.ServerPagesGenerator;
import org.apache.cocoon.xml.AbstractXMLConsumer;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Allows actions to be written in XSP. This allows to use XSP to produce
1.11 +6 -5
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -b -u -r1.10 -r1.11
--- SessionPropagatorAction.java 5 Dec 2002 09:23:34 -0000 1.10
+++ SessionPropagatorAction.java 7 Jan 2003 23:56:11 -0000 1.11
@@ -50,19 +50,20 @@
*/
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.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This is the action used to propagate parameters into session. It
1.3 +8 -6
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java
Index: AbstractElementProcessorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- AbstractElementProcessorFactory.java 31 Jul 2002 13:13:22 -0000
1.2
+++ AbstractElementProcessorFactory.java 7 Jan 2003 23:56:11 -0000
1.3
@@ -50,15 +50,17 @@
*/
package org.apache.cocoon.components.elementprocessor.impl;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-import org.apache.cocoon.components.elementprocessor.*;
-import org.apache.cocoon.components.elementprocessor.types.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
-import java.util.*;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
+import
org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
+import org.apache.cocoon.components.elementprocessor.ElementProcessor;
+import org.apache.cocoon.components.elementprocessor.ElementProcessorFactory;
/**
* Create instances of specific ElementProcessor implementations to
1.13 +1 -9
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java
Index: XSPSessionHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -b -u -r1.12 -r1.13
--- XSPSessionHelper.java 19 Dec 2002 15:14:56 -0000 1.12
+++ XSPSessionHelper.java 7 Jan 2003 23:56:11 -0000 1.13
@@ -50,19 +50,11 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
/**
* The <code>Session</code> object helper
1.8 +4 -5
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.7
retrieving revision 1.8
diff -u -d -b -u -r1.7 -r1.8
--- AbstractMetaModule.java 17 Dec 2002 14:53:16 -0000 1.7
+++ AbstractMetaModule.java 7 Jan 2003 23:56:11 -0000 1.8
@@ -51,17 +51,16 @@
package org.apache.cocoon.components.modules.input;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
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 java.util.Iterator;
-import java.util.Map;
/**
* AbstractMetaModule gives you the infrastructure for easily
1.10 +4 -5
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.9
retrieving revision 1.10
diff -u -d -b -u -r1.9 -r1.10
--- XMLMetaModule.java 19 Dec 2002 10:34:47 -0000 1.9
+++ XMLMetaModule.java 7 Jan 2003 23:56:11 -0000 1.10
@@ -50,22 +50,21 @@
*/
package org.apache.cocoon.components.modules.input;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.Vector;
-import org.apache.avalon.framework.component.Component;
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.xml.dom.DOMUtil;
-import org.apache.cocoon.xml.dom.DocumentWrapper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.xml.dom.DOMUtil;
+import org.apache.cocoon.xml.dom.DocumentWrapper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
1.3 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNode.java
Index: ContainerNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- ContainerNode.java 29 Apr 2002 14:46:16 -0000 1.2
+++ ContainerNode.java 7 Jan 2003 23:56:11 -0000 1.3
@@ -52,8 +52,6 @@
import org.apache.cocoon.environment.Environment;
-import java.util.*;
-
/**
* A generic container node that just invokes its children.
*
1.3 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNodeBuilder.java
Index: ContainerNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ContainerNodeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- ContainerNodeBuilder.java 11 Sep 2002 10:08:36 -0000 1.2
+++ ContainerNodeBuilder.java 7 Jan 2003 23:56:11 -0000 1.3
@@ -54,8 +54,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import java.util.*;
-
/**
* Builds a generic container node.
*
1.9 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -b -u -r1.8 -r1.9
--- SerializeNode.java 12 Oct 2002 05:11:39 -0000 1.8
+++ SerializeNode.java 7 Jan 2003 23:56:12 -0000 1.9
@@ -50,20 +50,19 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.PipelineEventComponentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.*;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
1.9 +7 -6
xml-cocoon2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -b -u -r1.8 -r1.9
--- ImageDirectoryGenerator.java 2 Jan 2003 20:47:29 -0000 1.8
+++ ImageDirectoryGenerator.java 7 Jan 2003 23:56:12 -0000 1.9
@@ -50,14 +50,15 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.log.Hierarchy;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.cocoon.util.FileFormatException;
import org.apache.cocoon.util.ImageProperties;
import org.apache.cocoon.util.ImageUtils;
-import org.apache.cocoon.util.FileFormatException;
-import org.xml.sax.SAXException;
-import java.io.*;
+import org.xml.sax.SAXException;
/**
* An extension of DirectoryGenerators that adds extra attributes for image
1.3 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/i18n/AbstractBunldeFactory.java
Index: AbstractBunldeFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/AbstractBunldeFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- AbstractBunldeFactory.java 5 Dec 2002 10:32:58 -0000 1.2
+++ AbstractBunldeFactory.java 7 Jan 2003 23:56:12 -0000 1.3
@@ -54,7 +54,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.i18n.BundleFactory.ConfigurationKeys;
/**
* Bundle factory implementation base class.
1.13 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -b -u -r1.12 -r1.13
--- XMLResourceBundle.java 17 Dec 2002 12:03:07 -0000 1.12
+++ XMLResourceBundle.java 7 Jan 2003 23:56:12 -0000 1.13
@@ -63,13 +63,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -77,6 +70,13 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* Implementation of <code>Bundle</code> interface for XML resources.
1.5 +1 -6
xml-cocoon2/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
Index: ZipArchiveSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- ZipArchiveSerializer.java 6 Jan 2003 15:21:24 -0000 1.4
+++ ZipArchiveSerializer.java 7 Jan 2003 23:56:12 -0000 1.5
@@ -51,18 +51,13 @@
package org.apache.cocoon.serialization;
-import org.apache.avalon.excalibur.pool.Recyclable;
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.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.NamespaceSupport;
1.2 +6 -8
xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
Index: AbstractExtractionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- AbstractExtractionTransformer.java 16 Dec 2002 11:02:38 -0000
1.1
+++ AbstractExtractionTransformer.java 7 Jan 2003 23:56:12 -0000
1.2
@@ -50,22 +50,20 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMBuilder;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
1.2 +7 -9
xml-cocoon2/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
Index: SimpleFormInstanceExtractionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- SimpleFormInstanceExtractionTransformer.java 16 Dec 2002 11:02:38
-0000 1.1
+++ SimpleFormInstanceExtractionTransformer.java 7 Jan 2003 23:56:12
-0000 1.2
@@ -50,30 +50,28 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.Map;
+
+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.ComponentException;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.modules.output.OutputModule;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.dom.DOMUtil;
-import java.util.Map;
-import java.io.IOException;
-
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* This transformer sieves an incoming stream of xml and extracts a
1.2 +16 -6
xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java
Index: DocumentWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DocumentWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DocumentWrapper.java 16 Dec 2002 10:01:11 -0000 1.1
+++ DocumentWrapper.java 7 Jan 2003 23:56:12 -0000 1.2
@@ -52,11 +52,21 @@
import org.apache.avalon.excalibur.xml.XMLizable;
-import org.apache.cocoon.ProcessingException;
-
-import org.w3c.dom.*;
-
-import org.xml.sax.ContentHandler;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
import org.xml.sax.SAXException;
1.10 +6 -6
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.9
retrieving revision 1.10
diff -u -d -b -u -r1.9 -r1.10
--- CookieValidatorAction.java 25 Aug 2002 08:57:28 -0000 1.9
+++ CookieValidatorAction.java 7 Jan 2003 23:56:12 -0000 1.10
@@ -50,20 +50,20 @@
*/
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.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 java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
/**
* This is the action used to validate Cookie parameters (values). The
1.2 +3 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/LinkTranslatorMapAction.java
Index: LinkTranslatorMapAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/LinkTranslatorMapAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- LinkTranslatorMapAction.java 6 Jan 2003 21:56:00 -0000 1.1
+++ LinkTranslatorMapAction.java 7 Jan 2003 23:56:12 -0000 1.2
@@ -54,11 +54,10 @@
*/
package org.apache.cocoon.acting;
import java.util.HashMap;
-
import java.util.Map;
+
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -68,7 +67,6 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.NetUtils;
-import org.apache.excalibur.source.Source;
/**
* This action sets a new LINK_OBJECT entry in the objectModel entry.
1.5 +3 -9
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/PrincipalMultiAction.java
Index: PrincipalMultiAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/PrincipalMultiAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- PrincipalMultiAction.java 28 Oct 2002 14:50:19 -0000 1.4
+++ PrincipalMultiAction.java 7 Jan 2003 23:56:12 -0000 1.5
@@ -51,18 +51,14 @@
package org.apache.cocoon.acting;
+import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
-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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.AbstractAction;
import org.apache.cocoon.components.repository.Principal;
import org.apache.cocoon.components.repository.PrincipalGroup;
import org.apache.cocoon.components.repository.PrincipalProvider;
@@ -70,8 +66,6 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Map;
/**
* Multiple actions for to add, to removing and to modify principals or
principal groups.
1.7 +10 -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
retrieving revision 1.7
diff -u -d -b -u -r1.6 -r1.7
--- SectionCutterAction.java 22 Feb 2002 06:58:02 -0000 1.6
+++ SectionCutterAction.java 7 Jan 2003 23:56:12 -0000 1.7
@@ -50,23 +50,23 @@
*/
package org.apache.cocoon.acting;
+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;
+
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
1.14 +6 -14
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceMultiAction.java
Index: SourceMultiAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceMultiAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -b -u -r1.13 -r1.14
--- SourceMultiAction.java 30 Oct 2002 17:01:29 -0000 1.13
+++ SourceMultiAction.java 7 Jan 2003 23:56:12 -0000 1.14
@@ -51,16 +51,15 @@
package org.apache.cocoon.acting;
-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.parameters.ParameterException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.AbstractAction;
import org.apache.cocoon.components.request.multipart.FilePart;
import org.apache.cocoon.components.source.InspectableSource;
import org.apache.cocoon.components.source.ModifiableTraversableSource;
@@ -78,13 +77,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
/**
* Multiple actions for upload files, change properties and permissions.
1.4 +8 -10
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceUploadAction.java
Index: SourceUploadAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceUploadAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- SourceUploadAction.java 4 Jul 2002 17:32:41 -0000 1.3
+++ SourceUploadAction.java 7 Jan 2003 23:56:12 -0000 1.4
@@ -51,15 +51,20 @@
package org.apache.cocoon.acting;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.AbstractAction;
import org.apache.cocoon.components.request.multipart.FilePartFile;
import org.apache.cocoon.components.source.RestrictableSource;
import org.apache.cocoon.components.source.WriteableSource;
@@ -71,13 +76,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
/**
* This action stores a new file via upload into a repository
1.2 +6 -9
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonCrawling.java
Index: CocoonCrawling.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonCrawling.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- CocoonCrawling.java 3 Nov 2002 20:26:50 -0000 1.1
+++ CocoonCrawling.java 7 Jan 2003 23:56:13 -0000 1.2
@@ -50,18 +50,15 @@
*/
package org.apache.cocoon.ant;
-import java.io.*;
-import java.util.*;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.*;
-import org.apache.cocoon.*;
-import org.apache.cocoon.environment.*;
-import org.apache.cocoon.environment.commandline.*;
import org.apache.cocoon.util.NetUtils;
/**
1.2 +21 -10
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonProcessorDelegate.java
Index: CocoonProcessorDelegate.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonProcessorDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- CocoonProcessorDelegate.java 3 Nov 2002 20:26:50 -0000 1.1
+++ CocoonProcessorDelegate.java 7 Jan 2003 23:56:13 -0000 1.2
@@ -50,19 +50,30 @@
*/
package org.apache.cocoon.ant;
-import java.io.*;
-import java.util.*;
-import org.apache.avalon.framework.activity.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+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.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.*;
+import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.*;
-import org.apache.cocoon.environment.*;
-import org.apache.cocoon.environment.commandline.*;
-import org.apache.cocoon.util.NetUtils;
+import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.environment.commandline.CommandlineContext;
+import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
/**
* A facade for Cocoon processing
1.2 +29 -20
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonTask.java
Index: CocoonTask.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/ant/CocoonTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- CocoonTask.java 3 Nov 2002 20:26:50 -0000 1.1
+++ CocoonTask.java 7 Jan 2003 23:56:13 -0000 1.2
@@ -50,32 +50,41 @@
*/
package org.apache.cocoon.ant;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
-import org.apache.avalon.excalibur.logger.*;
-import org.apache.avalon.framework.configuration.*;
-import org.apache.avalon.framework.context.*;
+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.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+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.context.DefaultContext;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.LogKitLogger;
-//import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.*;
+import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
-import org.apache.cocoon.*;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
-import org.apache.cocoon.components.notification.Notifier;
-import org.apache.cocoon.components.notification.Notifying;
-import org.apache.cocoon.components.notification.SimpleNotifyingBean;
-import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.commandline.CommandlineContext;
-import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
-import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
import org.apache.cocoon.util.IOUtils;
-import org.apache.cocoon.util.MIMEUtils;
-import org.apache.cocoon.util.NetUtils;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
/**
* Ant task for running Cocoon.
1.2 +8 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/callback/DefaultCallBackHandler.java
Index: DefaultCallBackHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/callback/DefaultCallBackHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DefaultCallBackHandler.java 19 Mar 2002 13:05:32 -0000 1.1
+++ DefaultCallBackHandler.java 7 Jan 2003 23:56:13 -0000 1.2
@@ -50,20 +50,20 @@
*/
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.cocoon.xml.XMLFragment;
-import org.apache.cocoon.transformation.XIncludeTransformer;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
-import java.util.Map;
-import java.util.HashMap;
+import org.apache.cocoon.xml.XMLFragment;
/**
* The DefaultCallBackHandler is a proof of concept. It should be made to
1.4 +9 -19
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java
Index: SoapServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- SoapServerImpl.java 7 Oct 2002 22:31:24 -0000 1.3
+++ SoapServerImpl.java 7 Jan 2003 23:56:13 -0000 1.4
@@ -53,22 +53,16 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
-
-import javax.xml.soap.SOAPException;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
@@ -78,18 +72,13 @@
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.context.Contextualizable;
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.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceResolver;
-
-import org.apache.cocoon.components.axis.providers.AvalonProvider;
-import org.apache.cocoon.util.IOUtils;
import org.apache.axis.AxisEngine;
import org.apache.axis.Constants;
@@ -100,20 +89,21 @@
import org.apache.axis.deployment.wsdd.WSDDDeployment;
import org.apache.axis.deployment.wsdd.WSDDDocument;
import org.apache.axis.deployment.wsdd.WSDDService;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.security.servlet.ServletSecurityProvider;
import org.apache.axis.server.AxisServer;
-import org.apache.axis.transport.http.AxisHttpSession;
import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.transport.http.HTTPTransport;
import org.apache.axis.transport.http.ServletEndpointContextImpl;
import org.apache.axis.utils.XMLUtils;
+import org.apache.cocoon.components.axis.providers.AvalonProvider;
+import org.apache.cocoon.util.IOUtils;
+
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
+
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* SOAP Server Implementation
1.3 +1 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/PrincipalProvider.java
Index: PrincipalProvider.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/PrincipalProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- PrincipalProvider.java 8 Jul 2002 08:15:12 -0000 1.2
+++ PrincipalProvider.java 7 Jan 2003 23:56:13 -0000 1.3
@@ -59,8 +59,6 @@
import org.apache.cocoon.ProcessingException;
-import java.util.Enumeration;
-
/**
* Manager for principals and grop of users. The implementation
* is similar to the classes java.security.* .
1.7 +7 -11
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java
Index: SlidePrincipalProvider.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -b -u -r1.6 -r1.7
--- SlidePrincipalProvider.java 30 Oct 2002 17:01:29 -0000 1.6
+++ SlidePrincipalProvider.java 7 Jan 2003 23:56:13 -0000 1.7
@@ -55,15 +55,19 @@
package org.apache.cocoon.components.repository.impl;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Vector;
+
import org.apache.avalon.framework.activity.Initializable;
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.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.configuration.Configurable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
@@ -71,10 +75,8 @@
import org.apache.cocoon.components.repository.PrincipalGroup;
import org.apache.cocoon.components.repository.PrincipalProvider;
import org.apache.cocoon.components.repository.Repository;
-import org.apache.cocoon.components.repository.impl.SlideRepository;
import org.apache.slide.authenticate.CredentialsToken;
-import org.apache.slide.authenticate.SecurityToken;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.common.ServiceAccessException;
@@ -94,13 +96,7 @@
import org.apache.slide.structure.LinkNode;
import org.apache.slide.structure.ObjectAlreadyExistsException;
import org.apache.slide.structure.ObjectNode;
-import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
-import org.apache.slide.structure.SubjectNode;
-
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Vector;
/**
* Manger for principals and groups of principals
1.5 +4 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlideRepository.java
Index: SlideRepository.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlideRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- SlideRepository.java 14 Aug 2002 09:13:43 -0000 1.4
+++ SlideRepository.java 7 Jan 2003 23:56:13 -0000 1.5
@@ -55,34 +55,26 @@
package org.apache.cocoon.components.repository.impl;
-import org.apache.avalon.excalibur.xml.Parser;
-//import org.apache.avalon.framework.activity.Initializable;
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.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
-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.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
-//import org.apache.cocoon.ProcessingException;
+import org.apache.avalon.excalibur.xml.Parser;
+
import org.apache.cocoon.components.repository.Repository;
import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceResolver;
-//import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.EmbeddedDomain;
-//import org.apache.slide.common.SlideTokenImpl;
import org.xml.sax.InputSource;
1.7 +14 -10
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.6
retrieving revision 1.7
diff -u -d -b -u -r1.6 -r1.7
--- BlobSource.java 1 Dec 2002 21:20:14 -0000 1.6
+++ BlobSource.java 7 Jan 2003 23:56:13 -0000 1.7
@@ -54,6 +54,19 @@
*/
package org.apache.cocoon.components.source;
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
@@ -61,15 +74,6 @@
import org.apache.cocoon.CascadingIOException;
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.net.MalformedURLException;
-
-import java.sql.*;
/**
* A <code>Source</code> that takes its content in a single JDBC column. Any
1.3 +1 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/InspectableSource.java
Index: InspectableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/InspectableSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- InspectableSource.java 26 Jun 2002 15:08:16 -0000 1.2
+++ InspectableSource.java 7 Jan 2003 23:56:13 -0000 1.3
@@ -60,8 +60,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import java.util.Enumeration;
-
/**
* A source, which owns meta informations in form of properties
*
1.2 +1 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/ModifiableTraversableSource.java
Index: ModifiableTraversableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/ModifiableTraversableSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ModifiableTraversableSource.java 19 Aug 2002 08:00:00 -0000 1.1
+++ ModifiableTraversableSource.java 7 Jan 2003 23:56:13 -0000 1.2
@@ -55,10 +55,7 @@
package org.apache.cocoon.components.source;
-import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-
-import java.util.Enumeration;
/**
* A source, which can be a directory or collection of sources, which can
1.4 +1 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/TraversableSource.java
Index: TraversableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/TraversableSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- TraversableSource.java 16 Aug 2002 12:42:56 -0000 1.3
+++ TraversableSource.java 7 Jan 2003 23:56:13 -0000 1.4
@@ -58,8 +58,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import java.util.Enumeration;
-
/**
* A source, which can be a directory or collection of sources.
*
1.3 +17 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSource.java
Index: BlobSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- BlobSource.java 13 Sep 2002 07:30:50 -0000 1.2
+++ BlobSource.java 7 Jan 2003 23:56:14 -0000 1.3
@@ -54,28 +54,33 @@
*/
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.Iterator;
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.logger.AbstractLogEnabled;
+
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+
import org.apache.cocoon.CascadingIOException;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.FilterInputStream;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-
-import java.sql.*;
/**
* A <code>Source</code> that takes its content in a single JDBC column. Any
1.3 +5 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/GIFSourceInspector.java
Index: GIFSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/GIFSourceInspector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -b -u -r1.2 -r1.3
--- GIFSourceInspector.java 2 Jul 2002 16:54:25 -0000 1.2
+++ GIFSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.3
@@ -55,24 +55,17 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
+import java.io.BufferedInputStream;
+import java.io.IOException;
-import org.apache.avalon.framework.activity.Startable;
-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.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-
import org.apache.cocoon.components.source.SourceInspector;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-import java.io.BufferedInputStream;
-import java.io.IOException;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
/**
* This source inspector adds extra attributes for image files.
1.2 +5 -11
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java
Index: JPEGSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- JPEGSourceInspector.java 29 Jun 2002 21:04:11 -0000 1.1
+++ JPEGSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.2
@@ -55,24 +55,18 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
+import java.io.BufferedInputStream;
+import java.io.IOException;
-import org.apache.avalon.framework.activity.Startable;
-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.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-
import org.apache.cocoon.components.source.SourceInspector;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-import java.io.BufferedInputStream;
-import java.io.IOException;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
/**
* This source inspector adds extra attributes for image files.
1.23 +18 -30
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -b -u -r1.22 -r1.23
--- SlideSource.java 27 Sep 2002 16:27:38 -0000 1.22
+++ SlideSource.java 7 Jan 2003 23:56:14 -0000 1.23
@@ -55,33 +55,40 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Vector;
+
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.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.CascadingIOException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.source.InspectableSource;
import org.apache.cocoon.components.source.LockableSource;
import org.apache.cocoon.components.source.ModifiableTraversableSource;
import org.apache.cocoon.components.source.RestrictableSource;
-//import org.apache.cocoon.components.source.TraversableSource;
-import org.apache.cocoon.components.source.WriteableSource;
import org.apache.cocoon.components.source.VersionableSource;
+import org.apache.cocoon.components.source.WriteableSource;
import org.apache.cocoon.components.source.helpers.GroupSourcePermission;
+import org.apache.cocoon.components.source.helpers.PrincipalSourcePermission;
import org.apache.cocoon.components.source.helpers.SourceCredential;
import org.apache.cocoon.components.source.helpers.SourceLock;
import org.apache.cocoon.components.source.helpers.SourcePermission;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-import org.apache.cocoon.components.source.helpers.PrincipalSourcePermission;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -89,8 +96,6 @@
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.slide.authenticate.CredentialsToken;
-import org.apache.slide.authenticate.SecurityToken;
-import org.apache.slide.common.EmbeddedDomain;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.common.SlideException;
@@ -101,15 +106,11 @@
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
-//import org.apache.slide.content.RevisionContentNotFoundException;
-import org.apache.slide.content.RevisionDescriptorNotFoundException;
-//import org.apache.slide.content.RevisionNotFoundException;
import org.apache.slide.content.NodeRevisionNumber;
+import org.apache.slide.content.RevisionDescriptorNotFoundException;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.NodeLock;
-//import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.macro.Macro;
-//import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.security.NodePermission;
import org.apache.slide.security.Security;
import org.apache.slide.structure.GroupNode;
@@ -117,19 +118,6 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.SubjectNode;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
/**
* A sources from jakarta slide repositories.
1.4 +5 -17
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSourceFactory.java
Index: SlideSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- SlideSourceFactory.java 4 Jul 2002 17:32:41 -0000 1.3
+++ SlideSourceFactory.java 7 Jan 2003 23:56:14 -0000 1.4
@@ -55,38 +55,26 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Map;
+
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.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.components.repository.Repository;
import org.apache.cocoon.components.repository.impl.SlideRepository;
-import org.apache.cocoon.components.source.RestrictableSource;
-import org.apache.cocoon.components.source.VersionableSource;
import org.apache.cocoon.components.source.helpers.SourceCredential;
-
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceParameters;
-
-import org.apache.slide.common.Domain;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Map;
/**
* A factory for sources from a Jakarta SLide repository.
1.5 +7 -10
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SourceInspectorManager.java
Index: SourceInspectorManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SourceInspectorManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- SourceInspectorManager.java 9 Jul 2002 21:41:34 -0000 1.4
+++ SourceInspectorManager.java 7 Jan 2003 23:56:14 -0000 1.5
@@ -55,19 +55,18 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.util.ArrayList;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+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.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -75,13 +74,11 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-
import org.apache.cocoon.components.source.SourceInspector;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-import java.util.ArrayList;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
/**
* This source inspector manage several source inspectors
1.2 +6 -8
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSourceFactory.java
Index: XMLDBSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSourceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- XMLDBSourceFactory.java 30 Jun 2002 23:29:22 -0000 1.1
+++ XMLDBSourceFactory.java 7 Jan 2003 23:56:14 -0000 1.2
@@ -51,6 +51,11 @@
package org.apache.cocoon.components.source.impl;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+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;
@@ -63,13 +68,6 @@
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Database;
import org.xmldb.api.base.XMLDBException;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
* This class implements the xmldb:// pseudo-protocol and allows to get XML
1.4 +4 -11
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- XPathSourceInspector.java 8 Aug 2002 07:28:32 -0000 1.3
+++ XPathSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.4
@@ -57,26 +57,19 @@
import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
-
-import org.apache.avalon.framework.activity.Startable;
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.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-
import org.apache.cocoon.components.source.SourceInspector;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.4 +5 -17
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/PrincipalListGenerator.java
Index: PrincipalListGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/PrincipalListGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- PrincipalListGenerator.java 30 Oct 2002 17:01:29 -0000 1.3
+++ PrincipalListGenerator.java 7 Jan 2003 23:56:14 -0000 1.4
@@ -51,36 +51,24 @@
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.IOException;
+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.ComponentSelector;
-//import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.excalibur.pool.Recyclable;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.repository.Principal;
import org.apache.cocoon.components.repository.PrincipalGroup;
import org.apache.cocoon.components.repository.PrincipalProvider;
import org.apache.cocoon.environment.SourceResolver;
-//import org.apache.cocoon.xml.EmbeddedXMLPipe;
-//import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Date;
-import java.util.Map;
/**
* The generator generates a list of all principals and group of
1.2 +53 -43
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/RequestAttributeGenerator.java
Index: RequestAttributeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/RequestAttributeGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- RequestAttributeGenerator.java 21 Apr 2002 20:08:25 -0000 1.1
+++ RequestAttributeGenerator.java 7 Jan 2003 23:56:14 -0000 1.2
@@ -1,55 +1,65 @@
/*
- *
============================================================================
- * The Apache Software License, Version 1.1
- *
============================================================================
- * Copyright (C) 1999-2002 The Apache Software Foundation. All rights
reserved.
- * Redistribution and use in source and binary forms, with or without
modifica-
- * tion, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The end-user documentation included with the redistribution, if any,
must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- * 4. The names "Apache Cocoon" and "Apache Software Foundation" must not
be
- * used to endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * [EMAIL PROTECTED]
- * 5. Products derived from this software may not be called "Apache", nor
may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * This software consists of voluntary contributions made by many
individuals
- * on behalf of the Apache Software Foundation and was originally
created by
- * Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the
Apache
- * Software Foundation, please see <http://www.apache.org/>.
- */
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
+ used to endorse or promote products derived from this software without
+ prior written permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+
+*/
package org.apache.cocoon.generation;
-import java.io.IOException;
import java.io.StringReader;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.Constants;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.http.HttpEnvironment;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.15 +10 -15
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -b -u -r1.14 -r1.15
--- SourceDescriptionGenerator.java 22 Aug 2002 13:47:14 -0000 1.14
+++ SourceDescriptionGenerator.java 7 Jan 2003 23:56:14 -0000 1.15
@@ -51,27 +51,30 @@
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.excalibur.pool.Recyclable;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.TraversableSource;
import org.apache.cocoon.components.source.InspectableSource;
import org.apache.cocoon.components.source.LockableSource;
import org.apache.cocoon.components.source.RestrictableSource;
import org.apache.cocoon.components.source.SourceInspector;
-import org.apache.cocoon.components.source.WriteableSource;
+import org.apache.cocoon.components.source.TraversableSource;
import org.apache.cocoon.components.source.VersionableSource;
import org.apache.cocoon.components.source.helpers.GroupSourcePermission;
-import org.apache.cocoon.components.source.helpers.SourceCredential;
+import org.apache.cocoon.components.source.helpers.PrincipalSourcePermission;
import org.apache.cocoon.components.source.helpers.SourceLock;
import org.apache.cocoon.components.source.helpers.SourcePermission;
import org.apache.cocoon.components.source.helpers.SourceProperty;
-import org.apache.cocoon.components.source.helpers.PrincipalSourcePermission;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.cocoon.xml.IncludeXMLConsumer;
@@ -83,14 +86,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Map;
/**
* Generates a description from a source of a repository.
1.6 +3 -17
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.5
retrieving revision 1.6
diff -u -d -b -u -r1.5 -r1.6
--- XPathDirectoryGenerator.java 2 Aug 2002 09:21:00 -0000 1.5
+++ XPathDirectoryGenerator.java 7 Jan 2003 23:56:14 -0000 1.6
@@ -50,36 +50,22 @@
*/
package org.apache.cocoon.generation;
-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.Parser;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
-
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.source.SourceUtil;
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.2 +1 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/mail/ContentTypePreference.java
Index: ContentTypePreference.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/mail/ContentTypePreference.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ContentTypePreference.java 6 Jan 2003 21:51:20 -0000 1.1
+++ ContentTypePreference.java 7 Jan 2003 23:56:14 -0000 1.2
@@ -50,8 +50,7 @@
*/
package org.apache.cocoon.mail;
-import javax.mail.*;
-import javax.mail.internet.*;
+import javax.mail.internet.MimePart;
/**
* Description of the Interface
1.4 +6 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/reading/AxisRPCReader.java
Index: AxisRPCReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/reading/AxisRPCReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- AxisRPCReader.java 25 Sep 2002 17:10:22 -0000 1.3
+++ AxisRPCReader.java 7 Jan 2003 23:56:14 -0000 1.4
@@ -54,36 +54,30 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import javax.xml.soap.SOAPException;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Startable;
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.avalon.excalibur.xml.Parser;
-
-import org.apache.cocoon.components.axis.SoapServer;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.ProcessingException;
-
import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.transport.http.AxisHttpSession;
import org.apache.axis.transport.http.HTTPConstants;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.axis.SoapServer;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.http.HttpEnvironment;
import org.xml.sax.SAXException;
1.2 +10 -12
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/selection/DateSelector.java
Index: DateSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/selection/DateSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- DateSelector.java 8 Jul 2002 00:15:59 -0000 1.1
+++ DateSelector.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -50,6 +50,15 @@
*/
package org.apache.cocoon.selection;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+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;
@@ -57,17 +66,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
/**
* A <code>Selector</code> depending on current date, and time.
1.5 +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.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- StoreJanitorImpl.java 31 Jul 2002 13:13:33 -0000 1.4
+++ StoreJanitorImpl.java 7 Jan 2003 23:56:15 -0000 1.5
@@ -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) {
}
}
1.2 +1 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/TransformerTagSupport.java
Index: TransformerTagSupport.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/TransformerTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TransformerTagSupport.java 12 Jun 2002 16:48:29 -0000 1.1
+++ TransformerTagSupport.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.taglib;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.XMLConsumer;
+
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/VarTagSupport.java
Index: VarTagSupport.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/VarTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- VarTagSupport.java 12 Jun 2002 16:48:29 -0000 1.1
+++ VarTagSupport.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -53,12 +53,11 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.cocoon.environment.Context;
+
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.jxpath.JXPathCocoonContexts;
import org.apache.cocoon.jxpath.JXPathCocoonContexts;
+
import org.apache.commons.jxpath.JXPathContext;
/**
1.2 +1 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/VarTransformerTagSupport.java
Index: VarTransformerTagSupport.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/VarTransformerTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- VarTransformerTagSupport.java 12 Jun 2002 16:48:29 -0000 1.1
+++ VarTransformerTagSupport.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.taglib;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.XMLConsumer;
+
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
1.2 +1 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/jxpath/core/ForEachTag.java
Index: ForEachTag.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/jxpath/core/ForEachTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ForEachTag.java 12 Jun 2002 16:49:03 -0000 1.1
+++ ForEachTag.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -51,13 +51,10 @@
package org.apache.cocoon.taglib.jxpath.core;
-import java.util.*;
-
-import org.apache.cocoon.jxpath.JXPathCocoonContexts;
import org.apache.cocoon.taglib.IterationTag;
import org.apache.cocoon.taglib.core.ForEachSupport;
import org.apache.cocoon.taglib.core.LoopTag;
-import org.apache.commons.jxpath.JXPathContext;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
1.2 +1 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/jxpath/core/OutTag.java
Index: OutTag.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/jxpath/core/OutTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- OutTag.java 12 Jun 2002 16:49:02 -0000 1.1
+++ OutTag.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -50,9 +50,8 @@
*/
package org.apache.cocoon.taglib.jxpath.core;
-import org.apache.cocoon.jxpath.JXPathCocoonContexts;
import org.apache.cocoon.taglib.VarXMLProducerTagSupport;
-import org.apache.commons.jxpath.JXPathContext;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
1.2 +0 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/string/TrimTag.java
Index: TrimTag.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/string/TrimTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TrimTag.java 12 Jun 2002 16:49:12 -0000 1.1
+++ TrimTag.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.taglib.string;
-import org.apache.cocoon.taglib.i18n.LocaleTag;
/**
* @author: <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a>
1.5 +14 -16
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Chart2SvgTransformer.java
Index: Chart2SvgTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/Chart2SvgTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- Chart2SvgTransformer.java 15 Jul 2002 14:52:40 -0000 1.4
+++ Chart2SvgTransformer.java 7 Jan 2003 23:56:15 -0000 1.5
@@ -50,26 +50,24 @@
*/
package org.apache.cocoon.transformation;
-import java.io.IOException;
+import java.awt.Color;
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.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.xml.sax.ContentHandler;
+import org.krysalis.wings.AbstractChart;
+import org.krysalis.wings.BarChart;
+import org.krysalis.wings.ChartModel2D;
+import org.krysalis.wings.ColorList;
+import org.krysalis.wings.LineChart;
+import org.krysalis.wings.PieChart;
+import org.krysalis.wings.SVGGraphics;
import org.xml.sax.SAXException;
-
-import org.krysalis.wings.*;
/**
* This Transformer transforms XML that describes a chart into an SVG
1.5 +7 -13
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.4
retrieving revision 1.5
diff -u -d -b -u -r1.4 -r1.5
--- AbstractConstrainedTransformer.java 15 Jul 2002 14:52:40 -0000
1.4
+++ AbstractConstrainedTransformer.java 7 Jan 2003 23:56:15 -0000
1.5
@@ -40,30 +40,24 @@
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.EventListener;
import java.util.List;
-import java.util.HashMap;
import java.util.ListIterator;
-import java.util.TooManyListenersException;
-import java.util.EventListener;
+import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.XMLProducer;
-import org.apache.cocoon.transformation.*;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.transformation.AbstractTransformer;
+import org.apache.cocoon.xml.XMLConsumer;
-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.Locator;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.AttributesImpl;
/**
* This class is an abstract class from which you can extend your
Transformer
1.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
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ContainerElementEndEvent.java 8 Apr 2002 08:09:16 -0000 1.1
+++ ContainerElementEndEvent.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -53,8 +53,6 @@
import java.util.EventObject;
-import org.xml.sax.Attributes;
-import org.apache.cocoon.xml.XMLProducer;
/**
1.4 +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.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- ElementEventAdapter.java 15 Jul 2002 14:52:40 -0000 1.3
+++ ElementEventAdapter.java 7 Jan 2003 23:56:15 -0000 1.4
@@ -39,8 +39,6 @@
*/
package org.apache.cocoon.transformation.constrained;
-import java.util.EventListener;
-import org.xml.sax.SAXException;
/**
[EMAIL PROTECTED] <a href="mailto:[EMAIL PROTECTED]">Nicola Ken
Barozzi</a>
1.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
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ElementEventListener.java 8 Apr 2002 08:09:16 -0000 1.1
+++ ElementEventListener.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -52,7 +52,6 @@
package org.apache.cocoon.transformation.constrained;
import java.util.EventListener;
-import org.xml.sax.SAXException;
/**
*
1.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
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ElementValueEvent.java 8 Apr 2002 08:09:16 -0000 1.1
+++ ElementValueEvent.java 7 Jan 2003 23:56:15 -0000 1.2
@@ -52,7 +52,6 @@
package org.apache.cocoon.transformation.constrained;
-import java.util.EventObject;
import org.xml.sax.Attributes;
1.4 +1 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java
Index: XmlTreeConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- XmlTreeConstraint.java 15 Jul 2002 14:52:40 -0000 1.3
+++ XmlTreeConstraint.java 7 Jan 2003 23:56:15 -0000 1.4
@@ -39,9 +39,8 @@
*/
package org.apache.cocoon.transformation.constrained;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
import java.util.ListIterator;
/**
1.7 +6 -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.6
retrieving revision 1.7
diff -u -d -b -u -r1.6 -r1.7
--- Pagesheet.java 27 Jun 2002 17:44:42 -0000 1.6
+++ Pagesheet.java 7 Jan 2003 23:56:15 -0000 1.7
@@ -51,20 +51,17 @@
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.
1.14 +3 -11
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.13
retrieving revision 1.14
diff -u -d -b -u -r1.13 -r1.14
--- Paginator.java 2 Aug 2002 09:21:00 -0000 1.13
+++ Paginator.java 7 Jan 2003 23:56:15 -0000 1.14
@@ -53,28 +53,21 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.excalibur.xml.Parser;
-
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.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.avalon.excalibur.xml.Parser;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
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.excalibur.source.Source;
@@ -87,7 +80,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.AttributesImpl;
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
