cziegeler 2003/01/30 23:00:56
Modified: src/java/org/apache/cocoon/sitemap Tag: cocoon_2_0_3_branch
ErrorNotifier.java XSLTFactoryLoader.java
Manager.java SitemapManager.java
DefaultSitemapComponentSelector.java
src/java/org/apache/cocoon/transformation Tag:
cocoon_2_0_3_branch TraxTransformer.java
XTTransformer.java RoleFilterTransformer.java
WriteDOMSessionTransformer.java
src/java/org/apache/cocoon/components/elementprocessor Tag:
cocoon_2_0_3_branch
CannotCreateElementProcessorException.java
ElementProcessor.java ElementProcessorFactory.java
src/java/org/apache/cocoon/components/source Tag:
cocoon_2_0_3_branch AbstractSAXSource.java
AbstractStreamWriteableSource.java
src/java/org/apache/cocoon/components/pipeline Tag:
cocoon_2_0_3_branch CachingStreamPipeline.java
src/java/org/apache/cocoon/components/modules/database Tag:
cocoon_2_0_3_branch ManualAutoIncrementModule.java
HsqlIdentityAutoIncrementModule.java
src/java/org/apache/cocoon/components/language/markup/xsp
Tag: cocoon_2_0_3_branch XSPSessionHelper.java
XSPCookieHelper.java XSPUtil.java EsqlQuery.java
XSPResponseHelper.java JSGenerator.java
src/java/org/apache/cocoon/components/search Tag:
cocoon_2_0_3_branch IndexHelperField.java
SimpleLuceneXMLIndexerImpl.java
LuceneXMLIndexer.java
SimpleLuceneCocoonSearcherImpl.java
LuceneIndexContentHandler.java
LuceneCocoonPager.java
SimpleLuceneCocoonIndexerImpl.java
src/java/org/apache/cocoon/components/notification Tag:
cocoon_2_0_3_branch
NotifyingCascadingRuntimeException.java
SimpleNotifyingBean.java
src/java/org/apache/cocoon/components/elementprocessor/impl
Tag: cocoon_2_0_3_branch
AbstractElementProcessorFactory.java
src/java/org/apache/cocoon/components/sax Tag:
cocoon_2_0_3_branch XMLByteStreamCompiler.java
XMLByteStreamInterpreter.java
src/java/org/apache/cocoon/components Tag:
cocoon_2_0_3_branch CocoonComponentManager.java
LifecycleHelper.java
src/java/org/apache/cocoon/components/language/programming/java
Tag: cocoon_2_0_3_branch Pizza.java
src/java/org/apache/cocoon/servlet Tag: cocoon_2_0_3_branch
ParanoidClassLoader.java BootstrapServlet.java
src/java/org/apache/cocoon/components/crawler Tag:
cocoon_2_0_3_branch SimpleCocoonCrawlerImpl.java
src/java/org/apache/cocoon/components/language/markup Tag:
cocoon_2_0_3_branch Logicsheet.java
NamedLogicsheet.java
src/java/org/apache/cocoon/components/deli Tag:
cocoon_2_0_3_branch DeliImpl.java
src/java/org/apache/cocoon/components/elementprocessor/impl/poi
Tag: cocoon_2_0_3_branch POIFSElementProcessor.java
src/java/org/apache/cocoon/components/language/generator
Tag: cocoon_2_0_3_branch GeneratorSelector.java
src/java/org/apache/cocoon/components/hsqldb Tag:
cocoon_2_0_3_branch ServerImpl.java
src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
Tag: cocoon_2_0_3_branch EPStyle.java Workbook.java
Sheet.java
src/java/org/apache/cocoon/components/modules/input Tag:
cocoon_2_0_3_branch DigestMetaModule.java
RequestContextPathModule.java
src/java/org/apache/cocoon/components/modules/output Tag:
cocoon_2_0_3_branch
RequestAttributeOutputModule.java
src/java/org/apache/cocoon/components/language/programming/javascript
Tag: cocoon_2_0_3_branch
CompiledJavascriptLanguage.java
src/java/org/apache/cocoon Tag: cocoon_2_0_3_branch
Cocoon.java
Log:
Optimizing imports
Revision Changes Path
No revision
No revision
1.4.2.2 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java
Index: ErrorNotifier.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- ErrorNotifier.java 15 Jul 2002 14:52:59 -0000 1.4.2.1
+++ ErrorNotifier.java 31 Jan 2003 07:00:48 -0000 1.4.2.2
@@ -50,18 +50,14 @@
*/
package org.apache.cocoon.sitemap;
-import java.util.Map;
import java.io.IOException;
+import java.util.Map;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.notification.Notifying;
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
-import org.apache.cocoon.generation.ComposerGenerator;
+import org.apache.cocoon.components.notification.Notifying;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Constants;
-
import org.xml.sax.SAXException;
/**
1.6.2.2 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- XSLTFactoryLoader.java 30 Jun 2002 23:26:56 -0000 1.6.2.1
+++ XSLTFactoryLoader.java 31 Jan 2003 07:00:48 -0000 1.6.2.2
@@ -50,10 +50,9 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.cocoon.util.ClassUtils;
-import org.w3c.dom.NodeList;
-
import java.util.HashMap;
+
+import org.w3c.dom.NodeList;
/**
* This class is used as a XSLT extension class.
1.9.2.2 +4 -9
xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Manager.java
Index: Manager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/Manager.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- Manager.java 21 Sep 2002 03:01:13 -0000 1.9.2.1
+++ Manager.java 31 Jan 2003 07:00:48 -0000 1.9.2.2
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.sitemap;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.excalibur.logger.LogKitManageable;
+import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
@@ -62,18 +65,10 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
-
-import java.util.HashMap;
-import java.util.Iterator;
/**
* This class manages all sub <code>Sitemap</code>s of a <code>Sitemap</code>
1.10.2.3 +4 -14
xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/SitemapManager.java
Index: SitemapManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Attic/SitemapManager.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- SitemapManager.java 30 Jan 2003 16:20:21 -0000 1.10.2.2
+++ SitemapManager.java 31 Jan 2003 07:00:48 -0000 1.10.2.3
@@ -50,31 +50,21 @@
*/
package org.apache.cocoon.sitemap;
+import java.io.InputStream;
+
import org.apache.avalon.excalibur.component.DefaultRoleManager;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.xml.Parser;
-
-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.configuration.SAXConfigurationHandler;
-
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
-import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.util.ClassUtils;
-
import org.xml.sax.InputSource;
-import java.io.InputStream;
-import java.util.HashMap;
-
/**
* A <code>Processor</code> based on the sitemap language files.
*
@@ -173,7 +163,7 @@
* Get the sitemap component configurations
*/
public Configuration getComponentConfigurations() {
- return null;
+ return this.sitemapHandler.getComponentConfigurations();
}
}
1.2.2.1 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/sitemap/DefaultSitemapComponentSelector.java
Index: DefaultSitemapComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/DefaultSitemapComponentSelector.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- DefaultSitemapComponentSelector.java 22 Feb 2002 07:03:55 -0000 1.2
+++ DefaultSitemapComponentSelector.java 31 Jan 2003 07:00:48 -0000 1.2.2.1
@@ -50,17 +50,16 @@
*/
package org.apache.cocoon.sitemap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
/**
* Default component manager for Cocoon's sitemap components.
No revision
No revision
1.21.2.6 +12 -13
xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- TraxTransformer.java 11 Nov 2002 14:21:04 -0000 1.21.2.5
+++ TraxTransformer.java 31 Jan 2003 07:00:49 -0000 1.21.2.6
@@ -50,11 +50,19 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.TransformerHandler;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -64,26 +72,17 @@
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.components.browser.Browser;
-import org.apache.cocoon.components.xslt.XSLTProcessor;
import org.apache.cocoon.components.deli.Deli;
-import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.components.xslt.XSLTProcessor;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.SAXException;
-
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.TransformerHandler;
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Enumeration;
/**
* This Transformer is used to transform this incomming SAX stream using
1.9.2.1 +18 -12
xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- XTTransformer.java 22 Feb 2002 07:03:56 -0000 1.9
+++ XTTransformer.java 31 Jan 2003 07:00:49 -0000 1.9.2.1
@@ -50,16 +50,31 @@
*/
package org.apache.cocoon.transformation;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import com.jclark.xsl.om.Name;
import com.jclark.xsl.om.Node;
import com.jclark.xsl.om.XSLException;
-import com.jclark.xsl.sax.*;
+import com.jclark.xsl.sax.ExtensionHandlerImpl;
+import com.jclark.xsl.sax.MultiNamespaceResult;
+import com.jclark.xsl.sax.OutputMethodHandler;
+import com.jclark.xsl.sax.ResultBase;
+import com.jclark.xsl.sax.XMLProcessorEx;
+import com.jclark.xsl.sax.XMLProcessorImpl;
import com.jclark.xsl.tr.Engine;
import com.jclark.xsl.tr.EngineImpl;
import com.jclark.xsl.tr.ParameterSet;
import com.jclark.xsl.tr.Sheet;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.Loggable;
@@ -76,15 +91,6 @@
import org.apache.log.Logger;
import org.xml.sax.*;
import org.xml.sax.ext.LexicalHandler;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
/**
* This Transformer use the XT processor.
1.6.2.1 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- RoleFilterTransformer.java 22 Feb 2002 07:03:56 -0000 1.6
+++ RoleFilterTransformer.java 31 Jan 2003 07:00:49 -0000 1.6.2.1
@@ -50,8 +50,11 @@
*/
package org.apache.cocoon.transformation;
+import java.io.IOException;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -59,10 +62,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.StringTokenizer;
/**
* Filter XML fragments based on a user's role. This will help in
1.9.2.1 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- WriteDOMSessionTransformer.java 22 Feb 2002 07:03:56 -0000 1.9
+++ WriteDOMSessionTransformer.java 31 Jan 2003 07:00:49 -0000 1.9.2.1
@@ -50,8 +50,12 @@
*/
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.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -60,11 +64,6 @@
import org.apache.cocoon.xml.dom.DOMBuilder;
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;
/**
No revision
No revision
1.1.2.1 +0 -5
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/CannotCreateElementProcessorException.java
Index: CannotCreateElementProcessorException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/CannotCreateElementProcessorException.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CannotCreateElementProcessorException.java 6 Mar 2002 16:58:01 -0000
1.1
+++ CannotCreateElementProcessorException.java 31 Jan 2003 07:00:50 -0000
1.1.2.1
@@ -50,11 +50,6 @@
*/
package 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.*;
/**
* Exception to be thrown when an ElementProcessor cannot be created.
1.1.2.1 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java
Index: ElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ElementProcessor.java 6 Mar 2002 16:58:01 -0000 1.1
+++ ElementProcessor.java 31 Jan 2003 07:00:50 -0000 1.1.2.1
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.components.elementprocessor;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.components.elementprocessor.types.*;
import java.io.IOException;
+
+import org.apache.cocoon.components.elementprocessor.types.Attribute;
/**
* The ElementProcessor interface defines behavior for classes that
1.1.2.1 +0 -7
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java
Index: ElementProcessorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ElementProcessorFactory.java 6 Mar 2002 16:58:01 -0000 1.1
+++ ElementProcessorFactory.java 31 Jan 2003 07:00:50 -0000 1.1.2.1
@@ -50,13 +50,6 @@
*/
package org.apache.cocoon.components.elementprocessor;
-import org.apache.avalon.framework.component.Component;
-
-import org.apache.cocoon.components.elementprocessor.types.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import java.util.*;
/**
* Create instances of specific ElementProcessor implementations to
No revision
No revision
1.5.2.1 +7 -13
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractSAXSource.java
Index: AbstractSAXSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractSAXSource.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- AbstractSAXSource.java 22 Feb 2002 07:00:13 -0000 1.5
+++ AbstractSAXSource.java 31 Jan 2003 07:00:50 -0000 1.5.2.1
@@ -50,28 +50,22 @@
*/
package org.apache.cocoon.components.source;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.serialization.Serializer;
import org.apache.log.Logger;
-
-import org.xml.sax.InputSource;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
/**
* This abstract class provides convenience methods to implement
1.2.2.1 +5 -13
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractStreamWriteableSource.java
Index: AbstractStreamWriteableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/AbstractStreamWriteableSource.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- AbstractStreamWriteableSource.java 28 Feb 2002 18:00:50 -0000 1.2
+++ AbstractStreamWriteableSource.java 31 Jan 2003 07:00:50 -0000 1.2.2.1
@@ -54,26 +54,18 @@
*/
package org.apache.cocoon.components.source;
+import java.io.IOException;
+import java.io.OutputStream;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
-
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.WriteableSource;
import org.apache.cocoon.serialization.Serializer;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.cocoon.ProcessingException;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
/**
* This abstract class provides convenience methods to implement
No revision
No revision
1.8.2.3 +15 -11
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- CachingStreamPipeline.java 19 Dec 2002 11:24:31 -0000 1.8.2.2
+++ CachingStreamPipeline.java 31 Jan 2003 07:00:50 -0000 1.8.2.3
@@ -50,24 +50,28 @@
*/
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.framework.component.Component;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ConnectionResetException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.*;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.CachedStreamObject;
+import org.apache.cocoon.caching.CachingOutputStream;
+import org.apache.cocoon.caching.ComponentCacheKey;
+import org.apache.cocoon.caching.PipelineCacheKey;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Environment;
import org.xml.sax.SAXException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.SocketException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/** A <CODE>StreamPipeline</CODE> either
* <UL>
No revision
No revision
1.2.4.1 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/Attic/ManualAutoIncrementModule.java
Index: ManualAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/Attic/ManualAutoIncrementModule.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- ManualAutoIncrementModule.java 28 May 2002 13:41:28 -0000 1.2
+++ ManualAutoIncrementModule.java 31 Jan 2003 07:00:50 -0000 1.2.4.1
@@ -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.3.4.1 +5 -8
xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/Attic/HsqlIdentityAutoIncrementModule.java
Index: HsqlIdentityAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/Attic/HsqlIdentityAutoIncrementModule.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- HsqlIdentityAutoIncrementModule.java 7 Jun 2002 08:50:14 -0000 1.3
+++ HsqlIdentityAutoIncrementModule.java 31 Jan 2003 07:00:51 -0000 1.3.4.1
@@ -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;
No revision
No revision
1.9.2.1 +3 -11
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.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- XSPSessionHelper.java 6 Mar 2002 03:05:23 -0000 1.9
+++ XSPSessionHelper.java 31 Jan 2003 07:00:51 -0000 1.9.2.1
@@ -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;
+
+import org.apache.cocoon.environment.Session;
/**
* The <code>Session</code> object helper
1.11.2.1 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
Index: XSPCookieHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- XSPCookieHelper.java 27 Feb 2002 05:33:50 -0000 1.11
+++ XSPCookieHelper.java 31 Jan 2003 07:00:51 -0000 1.11.2.1
@@ -50,6 +50,10 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Map;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -58,10 +62,6 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Map;
-
/**
* This class is a helper class used by Cookie logicsheet
*
@@ -568,7 +568,7 @@
else if(propertyPrefix.equals("P"))
returnValue = currentCookie.getPath();
else if(propertyPrefix.equals("S"))
- returnValue = returnValue.valueOf(currentCookie.getSecure());
+ returnValue = String.valueOf(currentCookie.getSecure());
else if(propertyPrefix.equals("V"))
returnValue = currentCookie.getValue();
else if(propertyPrefix.equals("Ve"))
1.6.2.4 +14 -17
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- XSPUtil.java 21 Nov 2002 15:06:48 -0000 1.6.2.3
+++ XSPUtil.java 31 Jan 2003 07:00:51 -0000 1.6.2.4
@@ -50,32 +50,29 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
+import java.io.*;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.avalon.framework.CascadingRuntimeException;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.util.Tokenizer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.environment.Source;
-
-import java.io.*;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
/**
* The XSP <code>Utility</code> object helper
1.11.2.12 +2 -9
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlQuery.java
Index: EsqlQuery.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/Attic/EsqlQuery.java,v
retrieving revision 1.11.2.11
retrieving revision 1.11.2.12
diff -u -r1.11.2.11 -r1.11.2.12
--- EsqlQuery.java 19 Dec 2002 11:24:29 -0000 1.11.2.11
+++ EsqlQuery.java 31 Jan 2003 07:00:51 -0000 1.11.2.12
@@ -50,15 +50,8 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.PreparedStatement;
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
+import java.sql.*;
import java.util.ArrayList;
-import java.lang.reflect.Field;
/**
* This helper class takes care of contstructing queries
* and cursor positioning (paging) for all different kinds
1.8.2.1 +7 -10
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- XSPResponseHelper.java 27 Feb 2002 05:33:50 -0000 1.8
+++ XSPResponseHelper.java 31 Jan 2003 07:00:51 -0000 1.8.2.1
@@ -50,19 +50,16 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-
-import java.util.Map;
-import java.util.Locale;
-import java.util.Date;
-import java.text.ParseException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
/**
* The XSP <code>Response</code> object helper
1.8.2.1 +12 -16
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java
Index: JSGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- JSGenerator.java 8 Mar 2002 04:08:53 -0000 1.8
+++ JSGenerator.java 31 Jan 2003 07:00:51 -0000 1.8.2.1
@@ -50,36 +50,32 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
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.parameters.Parameters;
-
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.xml.XMLizable;
-
+import org.apache.cocoon.environment.SourceResolver;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ImporterTopLevel;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.Script;
import org.mozilla.javascript.Scriptable;
-import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.text.ParseException;
-import java.text.DateFormat;
/**
* Class representing interpreted XSP-generated
No revision
No revision
1.4.2.1 +1 -13
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/IndexHelperField.java
Index: IndexHelperField.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/IndexHelperField.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- IndexHelperField.java 22 Feb 2002 07:00:12 -0000 1.4
+++ IndexHelperField.java 31 Jan 2003 07:00:52 -0000 1.4.2.1
@@ -49,19 +49,7 @@
*/
package org.apache.cocoon.components.search;
-import org.apache.lucene.document.DateField;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.xml.sax.Attributes;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
/**
* A helper class for generating a lucene document in a SAX ContentHandler.
1.9.2.3 +3 -22
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneXMLIndexerImpl.java
Index: SimpleLuceneXMLIndexerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneXMLIndexerImpl.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- SimpleLuceneXMLIndexerImpl.java 3 Aug 2002 02:33:35 -0000 1.9.2.2
+++ SimpleLuceneXMLIndexerImpl.java 31 Jan 2003 07:00:52 -0000 1.9.2.3
@@ -50,22 +50,16 @@
*/
package org.apache.cocoon.components.search;
-import java.io.*;
-
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
-import java.util.ArrayList;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.*;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -73,26 +67,13 @@
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.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
import org.apache.lucene.document.DateField;
-
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
/**
* A simple class building lucene documents from xml content.
1.5.2.1 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneXMLIndexer.java
Index: LuceneXMLIndexer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneXMLIndexer.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- LuceneXMLIndexer.java 22 Feb 2002 07:00:12 -0000 1.5
+++ LuceneXMLIndexer.java 31 Jan 2003 07:00:52 -0000 1.5.2.1
@@ -51,13 +51,10 @@
package org.apache.cocoon.components.search;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import org.apache.avalon.framework.component.Component;
-
import org.apache.cocoon.ProcessingException;
-import org.apache.lucene.document.Document;
/**
* The avalon behavioural component interface of generating
1.5.2.1 +9 -14
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneCocoonSearcherImpl.java
Index: SimpleLuceneCocoonSearcherImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneCocoonSearcherImpl.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- SimpleLuceneCocoonSearcherImpl.java 22 Feb 2002 07:00:12 -0000 1.5
+++ SimpleLuceneCocoonSearcherImpl.java 31 Jan 2003 07:00:52 -0000 1.5.2.1
@@ -50,10 +50,7 @@
*/
package org.apache.cocoon.components.search;
import java.io.File;
-
import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
@@ -64,17 +61,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.util.ClassUtils;
-
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.DateField;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.*;
-import org.apache.lucene.queryParser.*;
-import org.apache.lucene.search.*;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
@@ -516,7 +511,7 @@
*/
public boolean indexReaderIsValid(Directory directory) throws IOException {
return indexReader != null &&
- indexReader.lastModified(directory) == lastModified;
+ IndexReader.lastModified(directory) == lastModified;
}
@@ -541,7 +536,7 @@
private void createIndexReader(Directory directory) throws IOException {
close();
indexReader = IndexReader.open(directory);
- lastModified = indexReader.lastModified(directory);
+ lastModified = IndexReader.lastModified(directory);
}
}
}
1.5.2.1 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneIndexContentHandler.java
Index: LuceneIndexContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneIndexContentHandler.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- LuceneIndexContentHandler.java 22 Feb 2002 07:00:12 -0000 1.5
+++ LuceneIndexContentHandler.java 31 Jan 2003 07:00:52 -0000 1.5.2.1
@@ -55,15 +55,11 @@
import java.util.List;
import java.util.Stack;
-import org.apache.lucene.document.DateField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
/**
1.4.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneCocoonPager.java
Index: LuceneCocoonPager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/LuceneCocoonPager.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- LuceneCocoonPager.java 22 Feb 2002 07:00:12 -0000 1.4
+++ LuceneCocoonPager.java 31 Jan 2003 07:00:52 -0000 1.4.2.1
@@ -50,13 +50,11 @@
*/
package org.apache.cocoon.components.search;
-import java.io.File;
import java.io.IOException;
-import java.util.ListIterator;
import java.util.ArrayList;
+import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
1.6.2.2 +5 -11
xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneCocoonIndexerImpl.java
Index: SimpleLuceneCocoonIndexerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/Attic/SimpleLuceneCocoonIndexerImpl.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- SimpleLuceneCocoonIndexerImpl.java 18 Apr 2002 12:56:41 -0000 1.6.2.1
+++ SimpleLuceneCocoonIndexerImpl.java 31 Jan 2003 07:00:52 -0000 1.6.2.2
@@ -54,28 +54,22 @@
import java.net.URL;
import java.util.Iterator;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
-
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-
import org.apache.avalon.framework.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.cocoon.ProcessingException;
-
import org.apache.cocoon.components.crawler.CocoonCrawler;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.DateField;
-
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.*;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
import org.apache.lucene.store.Directory;
/**
No revision
No revision
1.5.2.2 +2 -5
xml-cocoon2/src/java/org/apache/cocoon/components/notification/NotifyingCascadingRuntimeException.java
Index: NotifyingCascadingRuntimeException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/notification/NotifyingCascadingRuntimeException.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- NotifyingCascadingRuntimeException.java 15 Jul 2002 14:52:59 -0000 1.5.2.1
+++ NotifyingCascadingRuntimeException.java 31 Jan 2003 07:00:53 -0000 1.5.2.2
@@ -50,12 +50,9 @@
*/
package org.apache.cocoon.components.notification;
-import org.apache.avalon.framework.CascadingRuntimeException;
-
import java.util.Map;
-import java.io.PrintStream;
-import java.io.PrintWriter;
+import org.apache.avalon.framework.CascadingRuntimeException;
/**
* A CascadingRuntimeException that is also Notifying.
1.5.2.2 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/components/notification/SimpleNotifyingBean.java
Index: SimpleNotifyingBean.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/notification/SimpleNotifyingBean.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SimpleNotifyingBean.java 15 Jul 2002 14:52:59 -0000 1.5.2.1
+++ SimpleNotifyingBean.java 31 Jan 2003 07:00:53 -0000 1.5.2.2
@@ -50,10 +50,8 @@
*/
package org.apache.cocoon.components.notification;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* A simple bean implementation of Notifying.
No revision
No revision
1.1.2.1 +7 -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.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AbstractElementProcessorFactory.java 6 Mar 2002 16:58:02 -0000 1.1
+++ AbstractElementProcessorFactory.java 31 Jan 2003 07:00:53 -0000 1.1.2.1
@@ -50,15 +50,16 @@
*/
package org.apache.cocoon.components.elementprocessor.impl;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-
-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.AbstractLoggable;
+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
No revision
No revision
1.5.2.3 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
Index: XMLByteStreamCompiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- XMLByteStreamCompiler.java 21 Nov 2002 15:06:48 -0000 1.5.2.2
+++ XMLByteStreamCompiler.java 31 Jan 2003 07:00:53 -0000 1.5.2.3
@@ -50,14 +50,13 @@
*/
package org.apache.cocoon.components.sax;
+import java.util.HashMap;
+
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.Component;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-import java.util.HashMap;
/**
* This a simple xml compiler which outputs a byte array.
1.7.2.3 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- XMLByteStreamInterpreter.java 26 Aug 2002 11:13:36 -0000 1.7.2.2
+++ XMLByteStreamInterpreter.java 31 Jan 2003 07:00:53 -0000 1.7.2.3
@@ -50,13 +50,12 @@
*/
package org.apache.cocoon.components.sax;
+import java.util.ArrayList;
+
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.ArrayList;
/**
* This a simple xml compiler which takes a byte array as input.
No revision
No revision
1.13.2.11 +2 -5
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.13.2.10
retrieving revision 1.13.2.11
diff -u -r1.13.2.10 -r1.13.2.11
--- CocoonComponentManager.java 30 Jan 2003 16:20:20 -0000 1.13.2.10
+++ CocoonComponentManager.java 31 Jan 2003 07:00:53 -0000 1.13.2.11
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.components;
-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.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.framework.component.Component;
@@ -68,9 +68,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.environment.Environment;
-import java.net.MalformedURLException;
-
-import org.xml.sax.SAXException;
/**
* Cocoon Component Manager.
1.1.2.1 +5 -9
xml-cocoon2/src/java/org/apache/cocoon/components/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/LifecycleHelper.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- LifecycleHelper.java 4 Mar 2002 18:16:45 -0000 1.1
+++ LifecycleHelper.java 31 Jan 2003 07:00:53 -0000 1.1.2.1
@@ -50,6 +50,10 @@
*/
package org.apache.cocoon.components;
+import org.apache.avalon.excalibur.component.RoleManageable;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.excalibur.logger.LogKitManageable;
+import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
@@ -59,17 +63,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.avalon.excalibur.component.RoleManageable;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-
import org.apache.log.Logger;
/**
No revision
No revision
1.2.2.1 +8 -14
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java
Index: Pizza.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/Pizza.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Pizza.java 22 Feb 2002 07:00:09 -0000 1.2
+++ Pizza.java 31 Jan 2003 07:00:53 -0000 1.2.2.1
@@ -50,25 +50,19 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.cocoon.components.language.programming.CompilerError;
-import org.apache.cocoon.util.ClassUtils;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
import net.sf.pizzacompiler.compiler.ClassReader;
import net.sf.pizzacompiler.compiler.FileCompilerOutput;
import net.sf.pizzacompiler.compiler.FileSourceReader;
import net.sf.pizzacompiler.compiler.Main;
-import org.apache.log.Hierarchy;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.log.Hierarchy;
/**
* This class wraps the Pizza Java Compiler.
No revision
No revision
1.5.2.1 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/servlet/ParanoidClassLoader.java
Index: ParanoidClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/ParanoidClassLoader.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ParanoidClassLoader.java 20 Mar 2002 11:00:06 -0000 1.5
+++ ParanoidClassLoader.java 31 Jan 2003 07:00:54 -0000 1.5.2.1
@@ -50,14 +50,12 @@
*/
package org.apache.cocoon.servlet;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLStreamHandlerFactory;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
/**
* The <code>ParanoidClassLoader</code> reverses the search order for
1.2.2.3 +10 -15
xml-cocoon2/src/java/org/apache/cocoon/servlet/BootstrapServlet.java
Index: BootstrapServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/BootstrapServlet.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- BootstrapServlet.java 15 Jul 2002 14:48:05 -0000 1.2.2.2
+++ BootstrapServlet.java 31 Jan 2003 07:00:54 -0000 1.2.2.3
@@ -50,23 +50,18 @@
*/
package org.apache.cocoon.servlet;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.io.IOException;
import java.io.File;
-
-import java.util.*;
-import javax.servlet.ServletContext;
+import java.io.IOException;
import java.io.InputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServlet;
/**
* A bootstrap servlet to allow Cocoon to run in servlet engines that aren't fully
No revision
No revision
1.9.2.3 +14 -20
xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java
Index: SimpleCocoonCrawlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- SimpleCocoonCrawlerImpl.java 17 Aug 2002 04:10:12 -0000 1.9.2.2
+++ SimpleCocoonCrawlerImpl.java 31 Jan 2003 07:00:54 -0000 1.9.2.3
@@ -50,33 +50,27 @@
*/
package org.apache.cocoon.components.crawler;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
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.parameters.Parameters;
-
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.Tokenizer;
-
-import org.apache.log.Logger;
-
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
/**
* A simple cocoon crawler.
No revision
No revision
1.9.2.2 +8 -11
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- Logicsheet.java 16 Jun 2002 22:33:36 -0000 1.9.2.1
+++ Logicsheet.java 31 Jan 2003 07:00:54 -0000 1.9.2.2
@@ -50,27 +50,24 @@
*/
package org.apache.cocoon.components.language.markup;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.transform.sax.TransformerHandler;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLoggable;
-
+import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.xslt.XSLTProcessor;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.ProcessingException;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLFilterImpl;
-
-import javax.xml.transform.sax.TransformerHandler;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
/**
* A code-generation logicsheet. This class is actually a wrapper for
1.8.2.1 +3 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java
Index: NamedLogicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- NamedLogicsheet.java 22 Feb 2002 07:00:08 -0000 1.8
+++ NamedLogicsheet.java 31 Jan 2003 07:00:54 -0000 1.8.2.1
@@ -50,15 +50,12 @@
*/
package org.apache.cocoon.components.language.markup;
+import java.io.IOException;
+
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
-
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
/**
* An extension to <code>Logicsheet</code> that is associated with a namespace.
No revision
No revision
1.17.2.1 +29 -34
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- DeliImpl.java 22 Feb 2002 07:00:07 -0000 1.17
+++ DeliImpl.java 31 Jan 2003 07:00:54 -0000 1.17.2.1
@@ -50,54 +50,49 @@
*/
package org.apache.cocoon.components.deli;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import com.hp.hpl.deli.Profile;
+import com.hp.hpl.deli.ProfileAttribute;
+import com.hp.hpl.deli.Workspace;
+
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.activity.Initializable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.Composable;
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.AbstractLoggable;
-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.environment.http.HttpContext;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.Constants;
-
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.TreeSet;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.net.MalformedURLException;
-import java.security.Principal;
-
+import org.apache.cocoon.environment.Request;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.Text;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletRequest;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-
-import com.hp.hpl.deli.Profile;
-import com.hp.hpl.deli.ProfileAttribute;
-import com.hp.hpl.deli.Workspace;
/**
* Allows the use of <a href="http://www-uk.hpl.hp.com/people/marbut/";>DELI</a>
No revision
No revision
1.1.2.1 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/Attic/POIFSElementProcessor.java
Index: POIFSElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/Attic/POIFSElementProcessor.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- POIFSElementProcessor.java 6 Mar 2002 16:58:02 -0000 1.1
+++ POIFSElementProcessor.java 31 Jan 2003 07:00:55 -0000 1.1.2.1
@@ -51,9 +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;
/**
No revision
No revision
1.9.2.4 +9 -10
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- GeneratorSelector.java 19 Dec 2002 11:24:28 -0000 1.9.2.3
+++ GeneratorSelector.java 31 Jan 2003 07:00:55 -0000 1.9.2.4
@@ -50,28 +50,27 @@
*/
package org.apache.cocoon.components.language.generator;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.excalibur.component.ComponentHandler;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.component.LogkitLoggerManager;
+import org.apache.avalon.excalibur.component.RoleManager;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
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.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.programming.Program;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
/**
* This interface is the common base of all Compiled Components. This
No revision
No revision
1.10.2.3 +10 -11
xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/Attic/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/Attic/ServerImpl.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ServerImpl.java 19 Dec 2002 11:24:28 -0000 1.10.2.2
+++ ServerImpl.java 31 Jan 2003 07:00:55 -0000 1.10.2.3
@@ -50,24 +50,23 @@
*/
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.AbstractLoggable;
-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;
/**
* This class runs an instance of HSQLDB Server.
No revision
No revision
1.4.2.1 +5 -9
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/EPStyle.java
Index: EPStyle.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/EPStyle.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- EPStyle.java 8 Apr 2002 18:21:50 -0000 1.4
+++ EPStyle.java 31 Jan 2003 07:00:55 -0000 1.4.2.1
@@ -54,22 +54,18 @@
-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.1.2.1 +5 -7
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/Workbook.java
Index: Workbook.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/Workbook.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Workbook.java 6 Mar 2002 16:58:02 -0000 1.1
+++ Workbook.java 31 Jan 2003 07:00:55 -0000 1.1.2.1
@@ -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.1.2.1 +7 -12
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/Sheet.java
Index: Sheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Attic/Sheet.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Sheet.java 6 Mar 2002 16:58:02 -0000 1.1
+++ Sheet.java 31 Jan 2003 07:00:55 -0000 1.1.2.1
@@ -54,24 +54,19 @@
-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.AbstractLoggable;
+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
No revision
No revision
1.4.4.5 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
Index: DigestMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -u -r1.4.4.4 -r1.4.4.5
--- DigestMetaModule.java 17 Jan 2003 13:58:53 -0000 1.4.4.4
+++ DigestMetaModule.java 31 Jan 2003 07:00:56 -0000 1.4.4.5
@@ -50,19 +50,18 @@
*/
package org.apache.cocoon.components.modules.input;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.util.HashMap;
-
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.Iterator;
import java.util.Map;
-import java.io.UnsupportedEncodingException;
+
+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.util.HashMap;
/** Meta module that obtains values from other module and returns
* message digest of value. Very useful for storing and checking
@@ -118,7 +117,7 @@
this.defaultProvider =
this.inputConf.getAttribute("provider",this.defaultProvider);
this.defaultSalt = this.inputConf.getAttribute("salt",this.defaultSalt);
this.defaultEncode = this.inputConf.getAttribute("encode","false");
- if (this.encodingNames.get(this.defaultEncode) == null) {
+ if (encodingNames.get(this.defaultEncode) == null) {
if (getLogger().isErrorEnabled())
getLogger().error("Requested encoding is unknown:
"+this.defaultEncode);
this.defaultEncode="false";
1.2.2.2 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/Attic/RequestContextPathModule.java
Index: RequestContextPathModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/Attic/RequestContextPathModule.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- RequestContextPathModule.java 17 Nov 2002 19:12:49 -0000 1.2.2.1
+++ RequestContextPathModule.java 31 Jan 2003 07:00:56 -0000 1.2.2.2
@@ -52,17 +52,15 @@
package org.apache.cocoon.components.modules.input;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
-import java.util.StringTokenizer;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.environment.ObjectModelHelper;
/**
* RequestContextPathModule allows to use the request context path in
No revision
No revision
1.4.4.1 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
Index: RequestAttributeOutputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- RequestAttributeOutputModule.java 9 Aug 2002 08:32:10 -0000 1.4
+++ RequestAttributeOutputModule.java 31 Jan 2003 07:00:56 -0000 1.4.4.1
@@ -51,11 +51,10 @@
package org.apache.cocoon.components.modules.output;
-import java.util.Enumeration;
import java.util.Map;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.ObjectModelHelper;
+
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.cocoon.environment.ObjectModelHelper;
/**
* Abstraction layer to encapsulate different output
No revision
No revision
1.3.2.1 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/CompiledJavascriptLanguage.java
Index: CompiledJavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/CompiledJavascriptLanguage.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- CompiledJavascriptLanguage.java 22 Feb 2002 07:00:10 -0000 1.3
+++ CompiledJavascriptLanguage.java 31 Jan 2003 07:00:56 -0000 1.3.2.1
@@ -107,7 +107,7 @@
pathname + File.separator + filename + "." +
this.getSourceExtension()
};
- compiler.main(args);
+ Main.main(args);
} catch (Exception e) {
getLogger().warn("JavascriptLanguage.compile", e);
throw new LanguageException(e.getMessage());
No revision
No revision
1.22.2.8 +8 -1 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
diff -u -r1.22.2.7 -r1.22.2.8
--- Cocoon.java 10 Jan 2003 10:43:19 -0000 1.22.2.7
+++ Cocoon.java 31 Jan 2003 07:00:56 -0000 1.22.2.8
@@ -698,6 +698,13 @@
}
/**
+ * Get the sitemap component configurations
+ */
+ public Configuration getComponentConfigurations() {
+ return null;
+ }
+
+ /**
* Accessor for active request count
*/
public int getActiveRequestCount() {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
