cziegeler 2003/01/30 23:51:19
Modified: src/java/org/apache/cocoon/matching Tag: cocoon_2_0_3_branch
AbstractWildcardMatcher.java ParameterMatcher.java
WildcardURIMatcher.java
WildcardParameterMatcher.java
AbstractRegexpMatcher.java PreparableMatcher.java
RegexpParameterMatcher.java RegexpURIMatcher.java
src/java/org/apache/cocoon/components/source Tag:
cocoon_2_0_3_branch URLSource.java
DelayedRefreshSourceWrapper.java XMLDBSource.java
CocoonSourceFactory.java SourceHandlerImpl.java
XMLDBSourceFactory.java FileSource.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
Tag: cocoon_2_0_3_branch ReadNode.java
ReadNodeBuilder.java CallNodeBuilder.java
TransformNodeBuilder.java TransformNode.java
RedirectToURINode.java MountNode.java
PipelinesNodeBuilder.java MountNodeBuilder.java
SelectNode.java ActNodeBuilder.java
PreparableMatchNode.java ActionSetNode.java
SitemapLanguage.java SerializeNodeBuilder.java
SelectNodeBuilder.java HandleErrorsNode.java
SitemapNodeBuilder.java RedirectToNodeBuilder.java
MatchNodeBuilder.java ViewNodeBuilder.java
ActSetNode.java SerializeNode.java
AggregateNodeBuilder.java CallNode.java
GenerateNodeBuilder.java GenerateNode.java
src/java/org/apache/cocoon/reading Tag: cocoon_2_0_3_branch
JSPReader.java DatabaseReader.java
src/java/org/apache/cocoon/environment/commandline Tag:
cocoon_2_0_3_branch
AbstractCommandLineEnvironment.java
src/java/org/apache/cocoon/transformation Tag:
cocoon_2_0_3_branch LDAPTransformer.java
SQLTransformer.java I18nTransformer.java
EncodeURLTransformer.java
src/java/org/apache/cocoon/serialization Tag:
cocoon_2_0_3_branch ElementProcessorSerializer.java
POIFSSerializer.java HSSFSerializer.java
ZipArchiveSerializer.java RTFSerializer.java
AbstractTextSerializer.java
src/java/org/apache/cocoon/components/treeprocessor Tag:
cocoon_2_0_3_branch InvokeContext.java
ContainerNode.java
PipelineEventComponentProcessingNode.java
ProcessingNodeBuilder.java DefaultTreeBuilder.java
treeprocessor-builtins.xml
AbstractProcessingNodeBuilder.java
ContainerNodeBuilder.java
AbstractParentProcessingNode.java
SimpleSelectorProcessingNode.java TreeBuilder.java
src/java/org/apache/cocoon/components/url Tag:
cocoon_2_0_3_branch URLFactoryImpl.java
URLFactory.java
src/java/org/apache/cocoon/selection Tag:
cocoon_2_0_3_branch NamedPatternsSelector.java
RequestMethodSelector.java
SessionAttributeSelector.java BrowserSelector.java
HostSelector.java RequestParameterSelector.java
SessionStateSelector.java
RequestAttributeSelector.java
src/java/org/apache/cocoon/environment Tag:
cocoon_2_0_3_branch AbstractEnvironment.java
src/java/org/apache/cocoon/i18n Tag: cocoon_2_0_3_branch
XMLResourceBundleFactory.java
src/java/org/apache/cocoon/components/treeprocessor/variables
Tag: cocoon_2_0_3_branch VariableResolver.java
VariableResolverFactory.java
NOPVariableResolver.java
src/java/org/apache/cocoon/components/xslt Tag:
cocoon_2_0_3_branch XSLTProcessorImpl.java
src/java/org/apache/cocoon/components/store Tag:
cocoon_2_0_3_branch StoreJanitorImpl.java
Log:
Backporting some things from 2.1
Organizing imports
Revision Changes Path
No revision
No revision
1.4.2.1 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
Index: AbstractWildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- AbstractWildcardMatcher.java 22 Feb 2002 07:03:52 -0000 1.4
+++ AbstractWildcardMatcher.java 31 Jan 2003 07:51:12 -0000 1.4.2.1
@@ -50,16 +50,12 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.matching.helpers.WildcardHelper;
-
-import java.util.HashMap;
-import java.util.Map;
/**
1.1.2.3 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java
Index: ParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/ParameterMatcher.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ParameterMatcher.java 3 Oct 2002 04:40:44 -0000 1.1.2.2
+++ ParameterMatcher.java 31 Jan 2003 07:51:12 -0000 1.1.2.3
@@ -50,13 +50,11 @@
*/
package org.apache.cocoon.matching;
-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.Request;
-
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
/**
* This class allows for matching based on a parameter provided from the
sitemap.
1.5.2.1 +3 -8
xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java
Index: WildcardURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- WildcardURIMatcher.java 22 Feb 2002 07:03:52 -0000 1.5
+++ WildcardURIMatcher.java 31 Jan 2003 07:51:12 -0000 1.5.2.1
@@ -50,15 +50,10 @@
*/
package org.apache.cocoon.matching;
-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.framework.thread.ThreadSafe;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Match the request URI against a wildcard expression.
1.1.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardParameterMatcher.java
Index: WildcardParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- WildcardParameterMatcher.java 5 Mar 2002 01:09:20 -0000 1.1
+++ WildcardParameterMatcher.java 31 Jan 2003 07:51:12 -0000 1.1.2.1
@@ -50,14 +50,12 @@
*/
package org.apache.cocoon.matching;
+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.parameters.Parameters;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a sitemap parameter against a wildcard expression.
1.5.2.4 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java
Index: AbstractRegexpMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractRegexpMatcher.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- AbstractRegexpMatcher.java 15 Jul 2002 14:42:49 -0000 1.5.2.3
+++ AbstractRegexpMatcher.java 31 Jan 2003 07:51:12 -0000 1.5.2.4
@@ -50,19 +50,16 @@
*/
package org.apache.cocoon.matching;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.regexp.RE;
import org.apache.regexp.RECompiler;
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Base class for all matchers using a regular expression pattern.
1.5.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/PreparableMatcher.java
Index: PreparableMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/PreparableMatcher.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- PreparableMatcher.java 22 Feb 2002 07:03:52 -0000 1.5
+++ PreparableMatcher.java 31 Jan 2003 07:51:12 -0000 1.5.2.1
@@ -50,12 +50,10 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Map;
/**
* A matcher that can prepare patterns during sitemap setup for faster match
at request time.
1.1.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java
Index: RegexpParameterMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpParameterMatcher.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- RegexpParameterMatcher.java 5 Mar 2002 01:09:20 -0000 1.1
+++ RegexpParameterMatcher.java 31 Jan 2003 07:51:12 -0000 1.1.2.1
@@ -50,14 +50,12 @@
*/
package org.apache.cocoon.matching;
+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.parameters.Parameters;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-
-import java.util.Map;
/**
* Matches a sitemap parameter against a regular expression.
1.5.2.2 +3 -13
xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java
Index: RegexpURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- RegexpURIMatcher.java 15 Jul 2002 14:48:05 -0000 1.5.2.1
+++ RegexpURIMatcher.java 31 Jan 2003 07:51:12 -0000 1.5.2.2
@@ -50,20 +50,10 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.sitemap.PatternException;
-
-import org.apache.regexp.RE;
-import org.apache.regexp.RECompiler;
-import org.apache.regexp.REProgram;
-import org.apache.regexp.RESyntaxException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* Matches the request URIs against a regular expression pattern.
No revision
No revision
1.13.2.4 +9 -24
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/URLSource.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- URLSource.java 2 Aug 2002 00:25:10 -0000 1.13.2.3
+++ URLSource.java 31 Jan 2003 07:51:12 -0000 1.13.2.4
@@ -50,39 +50,24 @@
*/
package org.apache.cocoon.components.source;
-import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceUtil;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Document;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringWriter;
import java.lang.reflect.Method;
import java.net.HttpURLConnection;
-import java.net.URLConnection;
-import java.net.URL;
import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.Iterator;
-import java.util.Properties;
import java.util.jar.JarEntry;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
+
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
/**
* Description of a source which is described by an URL.
1.4.2.1 +7 -7
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/DelayedRefreshSourceWrapper.java
Index: DelayedRefreshSourceWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/DelayedRefreshSourceWrapper.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- DelayedRefreshSourceWrapper.java 22 Feb 2002 07:00:13 -0000 1.4
+++ DelayedRefreshSourceWrapper.java 31 Jan 2003 07:51:12 -0000 1.4.2.1
@@ -50,15 +50,15 @@
*/
package org.apache.cocoon.components.source;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.XMLizable;
-import org.xml.sax.InputSource;
import java.io.IOException;
import java.io.InputStream;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.xml.XMLizable;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
1.7.2.2 +7 -24
xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java
Index: XMLDBSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- XMLDBSource.java 3 Aug 2002 16:44:13 -0000 1.7.2.1
+++ XMLDBSource.java 31 Jan 2003 07:51:12 -0000 1.7.2.2
@@ -50,39 +50,22 @@
*/
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
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.cocoon.xml.IncludeXMLConsumer;
import org.apache.log.Logger;
-
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
-import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.base.ResourceSet;
import org.xmldb.api.base.ResourceIterator;
+import org.xmldb.api.base.ResourceSet;
+import org.xmldb.api.base.XMLDBException;
import org.xmldb.api.modules.XMLResource;
import org.xmldb.api.modules.XPathQueryService;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.ContentHandler;
-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 class implements the xmldb:// pseudo-protocol and allows to get XML
1.4.2.2 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/components/source/CocoonSourceFactory.java
Index: CocoonSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/CocoonSourceFactory.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- CocoonSourceFactory.java 4 Aug 2002 04:11:52 -0000 1.4.2.1
+++ CocoonSourceFactory.java 31 Jan 2003 07:51:12 -0000 1.4.2.2
@@ -50,17 +50,16 @@
*/
package org.apache.cocoon.components.source;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.Processor;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.Processor;
-import org.apache.cocoon.components.CocoonComponentManager;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
/**
* This class implements the cocoon: protocol.
1.8.2.2 +8 -10
xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/SourceHandlerImpl.java
Index: SourceHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/Attic/SourceHandlerImpl.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- SourceHandlerImpl.java 19 Dec 2002 11:24:32 -0000 1.8.2.1
+++ SourceHandlerImpl.java 31 Jan 2003 07:51:12 -0000 1.8.2.2
@@ -50,8 +50,14 @@
*/
package org.apache.cocoon.components.source;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -63,19 +69,11 @@
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.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.util.ClassUtils;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
1.4.2.2 +6 -10
xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java
Index: XMLDBSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- XMLDBSourceFactory.java 3 Aug 2002 16:44:13 -0000 1.4.2.1
+++ XMLDBSourceFactory.java 31 Jan 2003 07:51:12 -0000 1.4.2.2
@@ -50,6 +50,11 @@
*/
package org.apache.cocoon.components.source;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -59,18 +64,9 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.sitemap.Sitemap;
-
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.2.2.4 +6 -16
xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSource.java
Index: FileSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSource.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- FileSource.java 9 Jan 2003 17:45:01 -0000 1.2.2.3
+++ FileSource.java 31 Jan 2003 07:51:12 -0000 1.2.2.4
@@ -54,24 +54,14 @@
*/
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentManager;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.util.ConcurrentModificationException;
-import org.apache.cocoon.environment.WriteableSource;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.net.MalformedURLException;
-
-import java.util.ConcurrentModificationException;
+import org.apache.cocoon.environment.WriteableSource;
/**
* A <code>WriteableSource</code> for 'file:/' system IDs.
No revision
No revision
1.1.2.3 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
Index: ReadNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ReadNode.java 9 Jan 2003 17:45:01 -0000 1.1.2.2
+++ ReadNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.3
@@ -50,16 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.environment.Environment;
+import java.util.Map;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
/**
*
1.1.2.3 +2 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNodeBuilder.java
Index: ReadNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNodeBuilder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ReadNodeBuilder.java 9 Jan 2003 17:45:01 -0000 1.1.2.2
+++ ReadNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.3
@@ -51,15 +51,11 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
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.reading.Reader;
-
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.reading.Reader;
/**
*
1.2.2.2 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java
Index: CallNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- CallNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ CallNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -52,14 +52,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-
-import java.util.*;
/**
*
1.1.2.2 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java
Index: TransformNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TransformNodeBuilder.java 25 Nov 2002 21:52:00 -0000 1.1.2.1
+++ TransformNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,17 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.cocoon.transformation.Transformer;
+import java.util.Collection;
+import org.apache.avalon.framework.configuration.Configuration;
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.transformation.Transformer;
/**
*
1.1.2.2 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java
Index: TransformNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TransformNode.java 25 Nov 2002 21:52:00 -0000 1.1.2.1
+++ TransformNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,19 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
+import java.util.Map;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import
org.apache.cocoon.components.treeprocessor.PipelineEventComponentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import org.apache.avalon.framework.parameters.Parameters;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.2.2.2 +3 -10
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToURINode.java
Index: RedirectToURINode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToURINode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- RedirectToURINode.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ RedirectToURINode.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,18 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.2.2.2 +7 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
Index: MountNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- MountNode.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ MountNode.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,16 +50,19 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
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.components.treeprocessor.AbstractProcessingNode;
-import org.apache.cocoon.components.treeprocessor.TreeProcessor;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
+import org.apache.cocoon.components.treeprocessor.TreeProcessor;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-import java.util.*;
/**
*
1.2.2.2 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java
Index: PipelinesNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PipelinesNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ PipelinesNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -55,8 +55,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.treeprocessor.ContainerNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import java.util.HashMap;
-import java.util.Map;
/**
* Builds a <map:pipelines>
@@ -74,6 +72,7 @@
Configuration child = config.getChild("component-configurations",
false);
if (child != null) {
this.checkNamespace(child);
+
this.treeBuilder.getProcessor().setComponentConfigurations(child);
}
PipelinesNode node = new
PipelinesNode(this.treeBuilder.getProcessor());
this.treeBuilder.setupNode(node, config);
@@ -81,7 +80,6 @@
ProcessingNode[] children = buildChildNodes(config);
if (children.length == 0) {
String msg = "There must be at least one pipeline at " +
config.getLocation();
- getLogger().error(msg);
throw new ConfigurationException(msg);
}
1.1.2.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
Index: MountNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MountNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ MountNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -52,10 +52,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
/**
1.2.2.2 +6 -13
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java
Index: SelectNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- SelectNode.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ SelectNode.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,29 +50,22 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+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.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.selection.Selector;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import
org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.1.2.2 +1 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java
Index: ActNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ActNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ ActNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -51,19 +51,12 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.cocoon.acting.Action;
-
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
-import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
/**
*
1.1.2.2 +12 -14
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
Index: PreparableMatchNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PreparableMatchNode.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ PreparableMatchNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,24 +50,22 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
-import
org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-import org.apache.cocoon.matching.Matcher;
-import org.apache.cocoon.matching.PreparableMatcher;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
+import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.Composable;
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.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-
-import java.util.*;
+import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
+import
org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
+import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.matching.PreparableMatcher;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
1.2.2.2 +10 -13
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java
Index: ActionSetNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ActionSetNode.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ ActionSetNode.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,26 +50,23 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-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.ComponentSelector;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.acting.Action;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-
-import org.apache.cocoon.sitemap.PatternException;
-
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.NamedProcessingNode;
import
org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
-
-import java.util.*;
+import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
/**
*
1.4.2.4 +6 -16
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Index: SitemapLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- SitemapLanguage.java 25 Nov 2002 21:51:59 -0000 1.4.2.3
+++ SitemapLanguage.java 31 Jan 2003 07:51:13 -0000 1.4.2.4
@@ -50,33 +50,23 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.ComponentException;
+import java.util.*;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
-
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.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.excalibur.component.RoleManager;
-
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.ExtendedComponentSelector;
import org.apache.cocoon.components.LifecycleHelper;
-
-import org.apache.cocoon.generation.Generator;
-import org.apache.cocoon.transformation.Transformer;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.sitemap.SitemapComponentSelector;
-
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import org.apache.cocoon.components.treeprocessor.DefaultTreeBuilder;
-
+import org.apache.cocoon.generation.Generator;
+import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.sitemap.SitemapComponentSelector;
import org.apache.cocoon.util.StringUtils;
-
-import java.util.*;
/**
* The tree builder for the sitemap language.
1.1.2.3 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNodeBuilder.java
Index: SerializeNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNodeBuilder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SerializeNodeBuilder.java 9 Jan 2003 17:45:01 -0000 1.1.2.2
+++ SerializeNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.3
@@ -50,18 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-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.serialization.Serializer;
+import java.util.Collection;
+import org.apache.avalon.framework.configuration.Configuration;
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.serialization.Serializer;
/**
*
1.1.2.2 +5 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNodeBuilder.java
Index: SelectNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SelectNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SelectNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ SelectNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,19 +50,16 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.selection.Selector;
-
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
-import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.selection.Selector;
/**
*
1.1.2.2 +2 -10
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Index: HandleErrorsNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HandleErrorsNode.java 8 Aug 2002 03:21:28 -0000 1.1.2.1
+++ HandleErrorsNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,19 +50,11 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.activity.Disposable;
-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.ResourceNotFoundException;
-
-import org.apache.cocoon.environment.Environment;
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-
-import java.util.*;
+import org.apache.cocoon.environment.Environment;
/**
* Handles <map:handle-errors>
1.1.2.1 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapNodeBuilder.java
Index: SitemapNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SitemapNodeBuilder.java 5 Mar 2002 08:26:23 -0000 1.1
+++ SitemapNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.1
@@ -53,12 +53,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder;
-
-import java.util.*;
/**
* Builds all nodes below the top-level <sitemap> element, and returns
the
1.1.2.2 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToNodeBuilder.java
Index: RedirectToNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/RedirectToNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RedirectToNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ RedirectToNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,18 +50,17 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+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.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
/**
*
1.2.2.2 +3 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNodeBuilder.java
Index: MatchNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNodeBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- MatchNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ MatchNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,20 +50,15 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.ComponentSelector;
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.matching.Matcher;
-import org.apache.cocoon.matching.PreparableMatcher;
import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import
org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.matching.PreparableMatcher;
/**
*
1.1.2.1 +1 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
Index: ViewNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ViewNodeBuilder.java 5 Mar 2002 08:26:23 -0000 1.1
+++ ViewNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.1
@@ -53,15 +53,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.treeprocessor.NamedContainerNodeBuilder;
import org.apache.cocoon.components.treeprocessor.NamedProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.TreeBuilder;
-
-import org.apache.cocoon.util.StringUtils;
-
-import java.util.*;
/**
* Builds a <map:view>
1.2.2.2 +5 -18
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActSetNode.java
Index: ActSetNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActSetNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ActSetNode.java 25 Nov 2002 21:51:59 -0000 1.2.2.1
+++ ActSetNode.java 31 Jan 2003 07:51:13 -0000 1.2.2.2
@@ -50,27 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.acting.Action;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-
-import org.apache.cocoon.sitemap.PatternException;
+import java.util.Map;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.ParameterizableProcessingNode;
-import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleParentProcessingNode;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.cocoon.environment.Environment;
/**
* Handles <map:act type="..."> (action-sets calls are handled by
[EMAIL PROTECTED] ActSetNode}).
1.1.2.4 +3 -8
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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SerializeNode.java 9 Jan 2003 17:45:01 -0000 1.1.2.3
+++ SerializeNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.4
@@ -51,19 +51,14 @@
package org.apache.cocoon.components.treeprocessor.sitemap;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.pipeline.StreamPipeline;
-
-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.3.2.2 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java
Index: AggregateNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNodeBuilder.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- AggregateNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.3.2.1
+++ AggregateNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.3.2.2
@@ -50,17 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.*;
+
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
+import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
-
-import java.util.*;
/**
*
1.3.2.2 +6 -11
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNode.java
Index: CallNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNode.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- CallNode.java 25 Nov 2002 21:51:59 -0000 1.3.2.1
+++ CallNode.java 31 Jan 2003 07:51:13 -0000 1.3.2.2
@@ -50,15 +50,12 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+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.ComponentException;
-
-import org.apache.cocoon.environment.Environment;
-
-import org.apache.cocoon.sitemap.PatternException;
-
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
import org.apache.cocoon.components.treeprocessor.AbstractProcessingNode;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
@@ -66,9 +63,7 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.List;
-import java.util.Map;
+import org.apache.cocoon.environment.Environment;
/**
*
1.1.2.2 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNodeBuilder.java
Index: GenerateNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNodeBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- GenerateNodeBuilder.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ GenerateNodeBuilder.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,17 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.avalon.framework.configuration.Configuration;
-
-import org.apache.cocoon.generation.Generator;
+import java.util.Collection;
+import org.apache.avalon.framework.configuration.Configuration;
import
org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
import
org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
-import java.util.*;
+import org.apache.cocoon.generation.Generator;
/**
*
1.1.2.2 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java
Index: GenerateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- GenerateNode.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ GenerateNode.java 31 Jan 2003 07:51:13 -0000 1.1.2.2
@@ -50,8 +50,7 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.sitemap.PatternException;
+import java.util.Map;
import org.apache.cocoon.components.treeprocessor.CategoryNode;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
@@ -59,10 +58,8 @@
import
org.apache.cocoon.components.treeprocessor.PipelineEventComponentProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
-
-import org.apache.avalon.framework.parameters.Parameters;
-
-import java.util.*;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.sitemap.PatternException;
/**
*
No revision
No revision
1.4.2.3 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/reading/Attic/JSPReader.java
Index: JSPReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/Attic/JSPReader.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JSPReader.java 17 Dec 2002 11:09:32 -0000 1.4.2.2
+++ JSPReader.java 31 Jan 2003 07:51:14 -0000 1.4.2.3
@@ -61,12 +61,8 @@
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.jsp.JSPEngine;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.http.HttpEnvironment;
/**
1.8.2.1 +16 -9
xml-cocoon2/src/java/org/apache/cocoon/reading/Attic/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- DatabaseReader.java 22 Feb 2002 07:03:54 -0000 1.8
+++ DatabaseReader.java 31 Jan 2003 07:51:14 -0000 1.8.2.1
@@ -50,10 +50,24 @@
*/
package org.apache.cocoon.reading;
+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.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.excalibur.pool.Poolable;
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.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -70,13 +84,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.HashUtil;
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;
/**
* This Reader pulls a resource from a database. It is configured with
No revision
No revision
1.7.2.1 +7 -8
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Index: AbstractCommandLineEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- AbstractCommandLineEnvironment.java 27 Mar 2002 15:13:40 -0000
1.7
+++ AbstractCommandLineEnvironment.java 31 Jan 2003 07:51:14 -0000
1.7.2.1
@@ -50,20 +50,19 @@
*/
package org.apache.cocoon.environment.commandline;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Source;
import org.apache.log.Logger;
import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
/**
* This environment is used to save the requested file to disk.
No revision
No revision
1.6.2.2 +37 -37
xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/LDAPTransformer.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- LDAPTransformer.java 3 Oct 2002 04:51:47 -0000 1.6.2.1
+++ LDAPTransformer.java 31 Jan 2003 07:51:14 -0000 1.6.2.2
@@ -1169,59 +1169,59 @@
protected LDAPQuery (LDAPTransformer transformer) {
this.transformer = transformer;
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_INITIALIZER_ELEMENT))
{
- initializer =
transformer.default_properties.getProperty(transformer.MAGIC_INITIALIZER_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_INITIALIZER_ELEMENT)) {
+ initializer =
transformer.default_properties.getProperty(MAGIC_INITIALIZER_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SERVERURL_ELEMENT))
{
- serverurl =
transformer.default_properties.getProperty(transformer.MAGIC_SERVERURL_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SERVERURL_ELEMENT)) {
+ serverurl =
transformer.default_properties.getProperty(MAGIC_SERVERURL_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_PORT_ELEMENT)) {
- port =
Integer.parseInt(transformer.default_properties.getProperty(transformer.MAGIC_PORT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_PORT_ELEMENT)) {
+ port =
Integer.parseInt(transformer.default_properties.getProperty(MAGIC_PORT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ROOT_DN_ELEMENT)) {
- root_dn =
transformer.default_properties.getProperty(transformer.MAGIC_ROOT_DN_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ROOT_DN_ELEMENT)) {
+ root_dn =
transformer.default_properties.getProperty(MAGIC_ROOT_DN_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_PASSWORD_ELEMENT))
{
- password =
transformer.default_properties.getProperty(transformer.MAGIC_PASSWORD_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_PASSWORD_ELEMENT)) {
+ password =
transformer.default_properties.getProperty(MAGIC_PASSWORD_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_VERSION_ELEMENT)) {
- version =
transformer.default_properties.getProperty(transformer.MAGIC_VERSION_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_VERSION_ELEMENT)) {
+ version =
transformer.default_properties.getProperty(MAGIC_VERSION_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SCOPE_ELEMENT)) {
- scope =
transformer.default_properties.getProperty(transformer.MAGIC_SCOPE_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SCOPE_ELEMENT)) {
+ scope =
transformer.default_properties.getProperty(MAGIC_SCOPE_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_AUTHENTICATION_ELEMENT))
{
- authentication =
transformer.default_properties.getProperty(transformer.MAGIC_AUTHENTICATION_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_AUTHENTICATION_ELEMENT)) {
+ authentication =
transformer.default_properties.getProperty(MAGIC_AUTHENTICATION_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SEARCHBASE_ELEMENT))
{
- searchbase =
transformer.default_properties.getProperty(transformer.MAGIC_SEARCHBASE_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SEARCHBASE_ELEMENT)) {
+ searchbase =
transformer.default_properties.getProperty(MAGIC_SEARCHBASE_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SHOW_ATTRIBUTE_ELEMENT))
{
- showAttribute =
transformer.default_properties.getProperty(transformer.MAGIC_SHOW_ATTRIBUTE_ELEMENT).equals("FALSE")
? false : true;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SHOW_ATTRIBUTE_ELEMENT)) {
+ showAttribute =
transformer.default_properties.getProperty(MAGIC_SHOW_ATTRIBUTE_ELEMENT).equals("FALSE")
? false : true;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DOC_ELEMENT)) {
- doc_element =
transformer.default_properties.getProperty(transformer.MAGIC_DOC_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DOC_ELEMENT)) {
+ doc_element =
transformer.default_properties.getProperty(MAGIC_DOC_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ROW_ELEMENT)) {
- row_element =
transformer.default_properties.getProperty(transformer.MAGIC_ROW_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ROW_ELEMENT)) {
+ row_element =
transformer.default_properties.getProperty(MAGIC_ROW_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ERROR_ELEMENT)) {
- error_element =
transformer.default_properties.getProperty(transformer.MAGIC_ERROR_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ERROR_ELEMENT)) {
+ error_element =
transformer.default_properties.getProperty(MAGIC_ERROR_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SAX_ERROR)) {
- sax_error =
transformer.default_properties.getProperty(transformer.MAGIC_SAX_ERROR).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SAX_ERROR)) {
+ sax_error =
transformer.default_properties.getProperty(MAGIC_SAX_ERROR).equals("TRUE") ?
true : false;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DEREF_LINK_ELEMENT))
{
- deref_link =
transformer.default_properties.getProperty(transformer.MAGIC_DEREF_LINK_ELEMENT).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DEREF_LINK_ELEMENT)) {
+ deref_link =
transformer.default_properties.getProperty(MAGIC_DEREF_LINK_ELEMENT).equals("TRUE")
? true : false;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_COUNT_LIMIT_ELEMENT))
{
- count_limit =
Long.parseLong(transformer.default_properties.getProperty(transformer.MAGIC_COUNT_LIMIT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_COUNT_LIMIT_ELEMENT)) {
+ count_limit =
Long.parseLong(transformer.default_properties.getProperty(MAGIC_COUNT_LIMIT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_TIME_LIMIT_ELEMENT))
{
- time_limit =
Integer.parseInt(transformer.default_properties.getProperty(transformer.MAGIC_TIME_LIMIT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_TIME_LIMIT_ELEMENT)) {
+ time_limit =
Integer.parseInt(transformer.default_properties.getProperty(MAGIC_TIME_LIMIT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DEBUG_ELEMENT)) {
- debug =
transformer.default_properties.getProperty(transformer.MAGIC_DEBUG_ELEMENT).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DEBUG_ELEMENT)) {
+ debug =
transformer.default_properties.getProperty(MAGIC_DEBUG_ELEMENT).equals("TRUE")
? true : false;
}
}
1.10.2.5 +7 -7
xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- SQLTransformer.java 14 Nov 2002 15:30:59 -0000 1.10.2.4
+++ SQLTransformer.java 31 Jan 2003 07:51:15 -0000 1.10.2.5
@@ -1120,9 +1120,9 @@
}
protected String getColumnValue( int i ) throws SQLException {
- String retval = transformer.getStringValue( rs.getObject( i ) );
+ String retval = SQLTransformer.getStringValue( rs.getObject( i
) );
if (rs.getMetaData().getColumnType(i) == 8)
- retval = transformer.getStringValue( rs.getBigDecimal( i ) );
+ retval = SQLTransformer.getStringValue( rs.getBigDecimal( i ) );
return retval;
}
@@ -1130,7 +1130,7 @@
//for a given "name" versus number. That being said this shouldn't
be an issue
//as this function is only called for ancestor lookups.
protected String getColumnValue( String name ) throws SQLException {
- String retval = transformer.getStringValue( rs.getObject( name
) );
+ String retval = SQLTransformer.getStringValue( rs.getObject(
name ) );
// if (rs.getMetaData().getColumnType( name ) == 8)
// retval = transformer.getStringValue( rs.getBigDecimal( name ) );
return retval;
@@ -1250,7 +1250,7 @@
Object obj = cst.getObject( counter.intValue() );
if ( !( obj instanceof ResultSet ) ) {
transformer.start( (String)
outParametersNames.get( counter ), attr );
- this.serializeData(manager,
transformer.getStringValue( obj ) );
+ this.serializeData(manager,
SQLTransformer.getStringValue( obj ) );
transformer.end( (String)
outParametersNames.get( counter ) );
} else {
ResultSet rs = (ResultSet) obj;
@@ -1262,9 +1262,9 @@
for ( int i = 1; i <=
md.getColumnCount(); i++ ) {
transformer.start( md.getColumnName(
i ).toLowerCase(), attr );
if ( md.getColumnType( i ) == 8 ) {
//prevent nasty exponent notation
- this.serializeData(manager,
transformer.getStringValue( rs.getBigDecimal( i ) ));
+ this.serializeData(manager,
SQLTransformer.getStringValue( rs.getBigDecimal( i ) ));
} else {
- this.serializeData(manager,
transformer.getStringValue( rs.getObject( i ) ));
+ this.serializeData(manager,
SQLTransformer.getStringValue( rs.getObject( i ) ));
}
transformer.end( md.getColumnName( i
).toLowerCase() );
}
1.13.2.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -r1.13.2.6 -r1.13.2.7
--- I18nTransformer.java 27 Nov 2002 10:51:29 -0000 1.13.2.6
+++ I18nTransformer.java 31 Jan 2003 07:51:15 -0000 1.13.2.7
@@ -1252,7 +1252,7 @@
String result;
if (indexedParams.size() > 0 && substitute_text.length() > 0) {
debug("Text for susbtitution: " + substitute_text);
- result = formatter.format(substitute_text,
indexedParams.toArray());
+ result = MessageFormat.format(substitute_text,
indexedParams.toArray());
debug("Result of susbtitution: " + result);
} else {
result = substitute_text;
1.1.2.4 +102 -71
xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Index: EncodeURLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EncodeURLTransformer.java 30 Jan 2003 16:20:14 -0000 1.1.2.3
+++ EncodeURLTransformer.java 31 Jan 2003 07:51:16 -0000 1.1.2.4
@@ -59,6 +59,7 @@
import org.apache.avalon.framework.parameters.Parameters;
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.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -76,7 +77,7 @@
* <p>
* This transformer applies encodeURL method to URLs.
* You may want to use this transform to avoid doing the manually
- * encodeURL() call.
+ * encodeURL() calls.
* </p>
* <p>
* Usually this transformer is appended as last transformer before
@@ -91,20 +92,20 @@
* Usage in a sitemap:
* </p>
* <pre><tt>
- * <map:composition>
+ * <map:composition>
* ...
- * <map:transformers>
+ * <map:transformers>
* ...
- * <map:transformer type="encodeURL"
- *
src="org.apache.cocoon.optional.transformation.EncodeURLTransformer">
- * <exclude-name>img/@src</exclude-name>
- *
<include-name>.&asterik;/@href|.&asterik;/@src|.&asterik;/@action</include-name>
- * </map:transformer>
+ * <map:transformer type="encodeURL"
+ *
src="org.apache.cocoon.optional.transformation.EncodeURLTransformer">
+ * <exclude-name>img/@src</exclude-name>
+ *
<include-name>.&asterik;/@href|.&asterik;/@src|.&asterik;/@action</include-name>
+ * </map:transformer>
* ...
- * <map:pipelines>
- * <map:pipeline>
+ * <map:pipelines>
+ * <map:pipeline>
* ...
- * <map:transform type="encodeURL"/>
+ * <map:transform type="encodeURL"/>
* ...
* </pre></tt>
*
@@ -124,37 +125,29 @@
public class EncodeURLTransformer
extends AbstractTransformer
- implements Configurable {
+ implements Configurable, Cacheable {
/**
* Configuration name for specifying excluding patterns,
* ie exclude-name.
- *
- * @since
*/
public final static String EXCLUDE_NAME = "exclude-name";
/**
* Configuration name for specifying including patterns,
* ie include-name.
- *
- * @since
*/
public final static String INCLUDE_NAME = "include-name";
/**
* Configuration default exclude pattern,
* ie img/@src
- *
- * @since
*/
public final static String EXCLUDE_NAME_DEFAULT = "img/@src";
/**
* Configuration default exclude pattern,
* ie .*\/@href|.*\/@action|frame/@src
- *
- * @since
*/
public final static String INCLUDE_NAME_DEFAULT =
".*/@href|.*/@action|frame/@src";
@@ -163,9 +156,31 @@
private ElementAttributeMatching elementAttributeMatching;
private Response response;
- private Session session;
+ private boolean isEncodeURLNeeded;
+ private Session session;
+ /**
+ * check if encoding of URLs is neccessary.
+ *
+ * THis is true if session object exists, and session-id
+ * was provided from URL, or session is new.
+ * The result is stored in some instance variables
+ */
+ protected void checkForEncoding(Request request) {
+ this.session = request.getSession();
+ this.isEncodeURLNeeded = false;
+
+ if ( null != this.session ) {
+ // do encoding if session id is from URL, or the session is new,
+ // fixes BUG #13855, due to [EMAIL PROTECTED]
+ if ( request.isRequestedSessionIdFromURL() ||
this.session.isNew()) {
+ this.isEncodeURLNeeded = true;
+ }
+ }
+ }
+
+
/**
* Setup the transformer.
* <p>
@@ -180,27 +195,23 @@
public void setup(SourceResolver resolver, Map objectModel, String
source, Parameters parameters)
throws ProcessingException, SAXException, IOException {
- final Request request = ObjectModelHelper.getRequest(objectModel);
- this.session = request.getSession( false );
- if ( null != this.session ) {
- // do encoding if session id is from URL, or the session is new,
- // fixes BUG #13855, due to [EMAIL PROTECTED]
- if ( request.isRequestedSessionIdFromURL() ||
this.session.isNew()) {
- this.response = ObjectModelHelper.getResponse(objectModel);
- final String includeName =
parameters.getParameter(INCLUDE_NAME,
-
this.includeNameConfigure);
- final String excludeName =
parameters.getParameter(EXCLUDE_NAME,
-
this.excludeNameConfigure);
- try {
- this.elementAttributeMatching = new
ElementAttributeMatching(includeName, excludeName);
- } catch (RESyntaxException reex) {
- final String message = "Cannot parse include-name: " +
includeName + " " +
- "or exclude-name: " + excludeName + "!";
- throw new ProcessingException(message, reex);
- }
- } else {
- // we don't need to encode
- this.session = null;
+ this.checkForEncoding(ObjectModelHelper.getRequest(objectModel));
+
+ if (this.isEncodeURLNeeded) {
+ this.response = ObjectModelHelper.getResponse(objectModel);
+
+ // don't check if URL encoding is needed now, as
+ // a generator might create a new session
+ final String includeName = parameters.getParameter(INCLUDE_NAME,
+
this.includeNameConfigure);
+ final String excludeName = parameters.getParameter(EXCLUDE_NAME,
+
this.excludeNameConfigure);
+ try {
+ this.elementAttributeMatching = new
ElementAttributeMatching(includeName, excludeName);
+ } catch (RESyntaxException reex) {
+ final String message = "Cannot parse include-name: " +
includeName + " " +
+ "or exclude-name: " + excludeName + "!";
+ throw new ProcessingException(message, reex);
}
}
}
@@ -211,18 +222,16 @@
*
* @param configuration Description of Parameter
* @exception ConfigurationException Description of Exception
- * @since
*/
public void configure(Configuration configuration) throws
ConfigurationException {
- if (configuration != null) {
- Configuration child;
+ Configuration child;
- child = configuration.getChild(INCLUDE_NAME);
- this.includeNameConfigure = child.getValue(INCLUDE_NAME_DEFAULT);
+ child = configuration.getChild(INCLUDE_NAME);
+ this.includeNameConfigure = child.getValue(INCLUDE_NAME_DEFAULT);
+
+ child = configuration.getChild(EXCLUDE_NAME);
+ this.excludeNameConfigure = child.getValue(EXCLUDE_NAME_DEFAULT);
- child = configuration.getChild(EXCLUDE_NAME);
- this.excludeNameConfigure = child.getValue(EXCLUDE_NAME_DEFAULT);
- }
if (this.includeNameConfigure == null) {
String message = "Configure " + INCLUDE_NAME + "!";
throw new ConfigurationException(message);
@@ -235,9 +244,7 @@
/**
- *Description of the Method
- *
- * @since
+ * Recycle resources of this transformer
*/
public void recycle() {
super.recycle();
@@ -254,10 +261,10 @@
* @return The generated key hashes the src
*/
public long generateKey() {
- if ( null == this.session ) {
- return 1;
+ if ( this.isEncodeURLNeeded ) {
+ return 0;
}
- return 0;
+ return 1;
}
/**
@@ -267,10 +274,10 @@
* component is currently not cacheable.
*/
public CacheValidity generateValidity() {
- if ( null == this.session ) {
- return NOPCacheValidity.CACHE_VALIDITY;
+ if ( this.isEncodeURLNeeded ) {
+ return null;
}
- return null;
+ return NOPCacheValidity.CACHE_VALIDITY;
}
/**
@@ -281,12 +288,11 @@
* @param raw name of the element
* @param attributes list
* @exception SAXException Description of Exception
- * @since
*/
public void startElement(String uri, String name, String raw, Attributes
attributes)
throws SAXException {
- if (this.session != null && this.elementAttributeMatching != null) {
+ if (this.isEncodeURLNeeded && this.elementAttributeMatching != null)
{
String lname = name;
if (attributes != null && attributes.getLength() > 0) {
AttributesImpl new_attributes = new
AttributesImpl(attributes);
@@ -296,7 +302,10 @@
String value = new_attributes.getValue(i);
if
(elementAttributeMatching.matchesElementAttribute(lname, attr_lname)) {
- final String new_value = response.encodeURL( value );
+ // don't use simply response.encodeURL
+ // but be more smart about the url encoding
+ //final String new_value = this.response.encodeURL(
value );
+ final String new_value = this.encodeURL( value,
response );
if (getLogger().isDebugEnabled()) {
this.getLogger().debug("element/@attribute
matches: " + name + "/@" + attr_lname);
this.getLogger().debug("encodeURL: " + value + "
-> " + new_value);
@@ -314,6 +323,35 @@
}
/**
+ * Do the URL rewriting.
+ * <p>
+ * Check if <code>url</code> contains already the sessionid, some
servlet-engines
+ * just appends the session-id without checking if the sessionid is
already present.
+ * </p>
+ *
+ * @param url the URL probably without sessionid.
+ * @param request the http request
+ * @param response the http response
+ * @return String the original url inclusive the sessionid
+ */
+ private String encodeURL(String url, Response response) {
+ String encoded_url;
+ if (this.response != null) {
+ // As some servlet-engine does not check if url has been already
rewritten
+ if (this.session != null && url.indexOf(this.session.getId()) >
-1) {
+ // url contains already the session id encoded
+ encoded_url = url;
+ } else {
+ // do encode the session id
+ encoded_url = this.response.encodeURL(url);
+ }
+ } else {
+ encoded_url = url;
+ }
+ return encoded_url;
+ }
+
+ /**
* A helper class for matching element names, and attribute names.
*
* <p>
@@ -328,13 +366,11 @@
/**
* Regular expression of including patterns
*
- * @since
*/
protected RE includeNameRE;
/**
* Regular expression of excluding patterns
*
- * @since
*/
protected RE excludeNameRE;
@@ -345,7 +381,6 @@
* @param includeName Description of Parameter
* @param excludeName Description of Parameter
* @exception RESyntaxException Description of Exception
- * @since
*/
public ElementAttributeMatching(String includeName, String
excludeName) throws RESyntaxException {
includeNameRE = new RE(includeName, RE.MATCH_CASEINDEPENDENT);
@@ -361,7 +396,6 @@
* @param attr_name
* @return boolean true iff value of attribute_name
should get rewritten, else
* false.
- * @since
*/
public boolean matchesElementAttribute(String element_name, String
attr_name) {
String element_attr_name =
canonicalizeElementAttribute(element_name, attr_name);
@@ -385,7 +419,6 @@
* @param element_name Description of Parameter
* @param attr_name Description of Parameter
* @return Description of the Returned Value
- * @since
*/
private String canonicalizeElementAttribute(String element_name,
String attr_name) {
return element_name + "/@" + attr_name;
@@ -398,7 +431,6 @@
* @param element_attr_name
* @return boolean true iff exclude-name matches
element_name, attr_name, else
* false.
- * @since
*/
private boolean matchesExcludesElementAttribute(String
element_attr_name) {
boolean match = excludeNameRE.match(element_attr_name);
@@ -412,7 +444,6 @@
* @param element_attr_name
* @return boolean true iff include-name matches
element_name, attr_name, else
* false.
- * @since
*/
private boolean matchesIncludesElementAttribute(String
element_attr_name) {
boolean match = includeNameRE.match(element_attr_name);
No revision
No revision
1.1.2.1 +9 -15
xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/ElementProcessorSerializer.java
Index: ElementProcessorSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/ElementProcessorSerializer.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ElementProcessorSerializer.java 6 Mar 2002 16:58:50 -0000 1.1
+++ ElementProcessorSerializer.java 31 Jan 2003 07:51:16 -0000 1.1.2.1
@@ -50,26 +50,20 @@
*/
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 org.apache.avalon.framework.component.ComponentManager;
-
-import
org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
-import org.apache.cocoon.components.elementprocessor.*;
-import org.apache.cocoon.components.elementprocessor.types.*;
+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.AbstractLoggable;
-
+import
org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
+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.1.2.2 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/POIFSSerializer.java
Index: POIFSSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/POIFSSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- POIFSSerializer.java 15 Jul 2002 14:52:59 -0000 1.1.2.1
+++ POIFSSerializer.java 31 Jan 2003 07:51:16 -0000 1.1.2.2
@@ -54,12 +54,8 @@
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.2.2 +0 -3
xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/HSSFSerializer.java
Index: HSSFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/HSSFSerializer.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- HSSFSerializer.java 15 Jul 2002 14:52:59 -0000 1.3.2.1
+++ HSSFSerializer.java 31 Jan 2003 07:51:16 -0000 1.3.2.2
@@ -51,9 +51,6 @@
package org.apache.cocoon.serialization;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentSelector;
-
-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.1.2.3 +8 -13
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.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ZipArchiveSerializer.java 6 Jan 2003 15:24:12 -0000 1.1.2.2
+++ ZipArchiveSerializer.java 31 Jan 2003 07:51:16 -0000 1.1.2.3
@@ -51,28 +51,23 @@
package org.apache.cocoon.serialization;
-import org.apache.avalon.excalibur.pool.Recyclable;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
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;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
/**
* A serializer that builds Zip archives by aggregating several sources.
1.5.2.3 +5 -18
xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/RTFSerializer.java
Index: RTFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/Attic/RTFSerializer.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- RTFSerializer.java 21 Nov 2002 15:06:49 -0000 1.5.2.2
+++ RTFSerializer.java 31 Jan 2003 07:51:16 -0000 1.5.2.3
@@ -50,30 +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.log.Priority;
import org.apache.log.util.OutputStreamLogger;
-
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.9.2.3 +20 -19
xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- AbstractTextSerializer.java 4 Dec 2002 08:43:27 -0000 1.9.2.2
+++ AbstractTextSerializer.java 31 Jan 2003 07:51:16 -0000 1.9.2.3
@@ -50,6 +50,22 @@
*/
package org.apache.cocoon.serialization;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -62,25 +78,10 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import java.io.OutputStream;
-import java.io.BufferedOutputStream;
-import java.io.StringWriter;
-import java.io.IOException;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
@@ -307,7 +308,7 @@
SAXTransformerFactory factory = getTransformerFactory();
- Boolean cacheValue =
(Boolean)this.needsNamespaceCache.get(factory.getClass().getName());
+ Boolean cacheValue =
(Boolean)needsNamespaceCache.get(factory.getClass().getName());
if (cacheValue != null) {
return cacheValue.booleanValue();
@@ -341,7 +342,7 @@
getLogger().debug("Trax handler " + handler.getClass().getName()
+ msg);
- this.needsNamespaceCache.put(factory.getClass().getName(), new
Boolean(needsIt));
+ needsNamespaceCache.put(factory.getClass().getName(), new
Boolean(needsIt));
return needsIt;
}
No revision
No revision
1.1.2.2 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
Index: InvokeContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- InvokeContext.java 23 Apr 2002 16:11:32 -0000 1.1.2.1
+++ InvokeContext.java 31 Jan 2003 07:51:17 -0000 1.1.2.2
@@ -50,19 +50,19 @@
*/
package org.apache.cocoon.components.treeprocessor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Recomposable;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.logger.Loggable;
-
import org.apache.cocoon.components.pipeline.EventPipeline;
import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.environment.Environment;
import org.apache.log.Logger;
-
-import java.util.*;
/**
* The invocation context of <code>ProcessingNode</code>s.
1.1.2.2 +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.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ContainerNode.java 25 Nov 2002 21:51:59 -0000 1.1.2.1
+++ ContainerNode.java 31 Jan 2003 07:51:17 -0000 1.1.2.2
@@ -52,8 +52,6 @@
import org.apache.cocoon.environment.Environment;
-import java.util.*;
-
/**
* A generic container node that just invokes its children.
*
1.2.2.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/PipelineEventComponentProcessingNode.java
Index: PipelineEventComponentProcessingNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/PipelineEventComponentProcessingNode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PipelineEventComponentProcessingNode.java 25 Nov 2002 21:51:59 -0000
1.2.2.1
+++ PipelineEventComponentProcessingNode.java 31 Jan 2003 07:51:17 -0000
1.2.2.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
-
import java.util.Map;
/**
1.2.2.2 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java
Index: ProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ProcessingNodeBuilder.java 15 Jul 2002 14:42:48 -0000 1.2.2.1
+++ ProcessingNodeBuilder.java 31 Jan 2003 07:51:17 -0000 1.2.2.2
@@ -52,9 +52,6 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import java.util.Map;
/**
* A <code>ProcessingNode</code> builder.
1.3.2.7 +9 -17
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Index: DefaultTreeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -r1.3.2.6 -r1.3.2.7
--- DefaultTreeBuilder.java 19 Dec 2002 11:24:32 -0000 1.3.2.6
+++ DefaultTreeBuilder.java 31 Jan 2003 07:51:17 -0000 1.3.2.7
@@ -50,6 +50,12 @@
*/
package org.apache.cocoon.components.treeprocessor;
+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.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
import org.apache.avalon.excalibur.component.RoleManageable;
@@ -57,39 +63,25 @@
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.pool.Recyclable;
-
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.ComponentManager;
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.Recomposable;
-
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.NamespacedSAXConfigurationHandler;
-
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
-
import org.apache.cocoon.components.ExtendedComponentSelector;
import org.apache.cocoon.components.LifecycleHelper;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.util.ClassUtils;
-
-import java.util.*;
/**
*
1.2.2.3 +1 -0
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml
Index: treeprocessor-builtins.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- treeprocessor-builtins.xml 13 Aug 2002 21:35:43 -0000 1.2.2.2
+++ treeprocessor-builtins.xml 31 Jan 2003 07:51:17 -0000 1.2.2.3
@@ -145,6 +145,7 @@
<node name="pipelines"
builder="org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNodeBuilder">
<allowed-children>pipeline</allowed-children>
+ <ignored-children>component-configurations</ignored-children>
</node>
<node name="views"
builder="org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder"/>
1.2.2.3 +6 -11
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- AbstractProcessingNodeBuilder.java 25 Nov 2002 21:51:59 -0000
1.2.2.2
+++ AbstractProcessingNodeBuilder.java 31 Jan 2003 07:51:17 -0000
1.2.2.3
@@ -50,22 +50,17 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import java.util.HashMap;
+import java.util.Map;
-import org.apache.avalon.framework.component.Recomposable;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import
org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
-
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Map;
-import java.util.HashMap;
/**
*
1.1.2.1 +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.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ContainerNodeBuilder.java 5 Mar 2002 08:26:22 -0000 1.1
+++ ContainerNodeBuilder.java 31 Jan 2003 07:51:17 -0000 1.1.2.1
@@ -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.2.2.3 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java
Index: AbstractParentProcessingNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNode.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- AbstractParentProcessingNode.java 25 Nov 2002 21:51:59 -0000 1.2.2.2
+++ AbstractParentProcessingNode.java 31 Jan 2003 07:51:17 -0000 1.2.2.3
@@ -50,10 +50,9 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.cocoon.environment.Environment;
-
-import java.util.List;
import java.util.Map;
+
+import org.apache.cocoon.environment.Environment;
/**
*
1.1.2.1 +2 -5
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/SimpleSelectorProcessingNode.java
Index: SimpleSelectorProcessingNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/SimpleSelectorProcessingNode.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- SimpleSelectorProcessingNode.java 5 Mar 2002 08:26:22 -0000 1.1
+++ SimpleSelectorProcessingNode.java 31 Jan 2003 07:51:17 -0000 1.1.2.1
@@ -51,12 +51,9 @@
package org.apache.cocoon.components.treeprocessor;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import
org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNode;
-import org.apache.cocoon.components.treeprocessor.ProcessingNode;
/**
*
1.2.2.1 +3 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java
Index: TreeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TreeBuilder.java 17 Mar 2002 21:55:22 -0000 1.2
+++ TreeBuilder.java 31 Jan 2003 07:51:17 -0000 1.2.2.1
@@ -50,15 +50,12 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.component.Component;
+import java.util.List;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.*;
/**
*
No revision
No revision
1.5.2.3 +9 -10
xml-cocoon2/src/java/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- URLFactoryImpl.java 19 Dec 2002 11:24:32 -0000 1.5.2.2
+++ URLFactoryImpl.java 31 Jan 2003 07:51:17 -0000 1.5.2.3
@@ -50,8 +50,14 @@
*/
package org.apache.cocoon.components.url;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -63,19 +69,12 @@
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.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.ClassUtils;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
1.3.2.1 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/url/Attic/URLFactory.java
Index: URLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/Attic/URLFactory.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- URLFactory.java 22 Feb 2002 07:00:14 -0000 1.3
+++ URLFactory.java 31 Jan 2003 07:51:17 -0000 1.3.2.1
@@ -50,11 +50,10 @@
*/
package org.apache.cocoon.components.url;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
import java.net.MalformedURLException;
import java.net.URL;
+
+import org.apache.avalon.framework.component.Component;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
No revision
No revision
1.5.2.1 +7 -7
xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java
Index: NamedPatternsSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- NamedPatternsSelector.java 22 Feb 2002 07:03:54 -0000 1.5
+++ NamedPatternsSelector.java 31 Jan 2003 07:51:17 -0000 1.5.2.1
@@ -50,17 +50,17 @@
*/
package org.apache.cocoon.selection;
+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.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.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
-import java.util.*;
/**
* Abstract class for selectors that select a value when it matches
1.1.2.2 +2 -7
xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java
Index: RequestMethodSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RequestMethodSelector.java 23 Apr 2002 17:17:10 -0000 1.1.2.1
+++ RequestMethodSelector.java 31 Jan 2003 07:51:17 -0000 1.1.2.2
@@ -49,17 +49,12 @@
*/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import java.util.Map;
+
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.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
-import java.util.Map;
/** A <code>Selector</code> that matches a getMethod() of the HTTP request.
* @author <a href="mailto:[EMAIL PROTECTED]">Maciek Kaminski</a>
1.7.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java
Index: SessionAttributeSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- SessionAttributeSelector.java 22 Feb 2002 07:03:54 -0000 1.7
+++ SessionAttributeSelector.java 31 Jan 2003 07:51:17 -0000 1.7.2.1
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.selection;
+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.logger.AbstractLoggable;
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.Request;
-
-import java.util.Map;
/**
* A <code>Selector</code> that matches a string against a configurable
session
1.5.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/selection/BrowserSelector.java
Index: BrowserSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/BrowserSelector.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- BrowserSelector.java 22 Feb 2002 07:03:54 -0000 1.5
+++ BrowserSelector.java 31 Jan 2003 07:51:18 -0000 1.5.2.1
@@ -50,14 +50,12 @@
*/
package org.apache.cocoon.selection;
+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.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
-import java.util.Map;
/**
* Tests a specific browser pattern against the requesting user-agent.
1.5.2.2 +3 -9
xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java
Index: HostSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- HostSelector.java 30 Jun 2002 23:26:56 -0000 1.5.2.1
+++ HostSelector.java 31 Jan 2003 07:51:18 -0000 1.5.2.2
@@ -50,18 +50,12 @@
*/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.configuration.Configurable;
+import java.util.Map;
+
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.framework.thread.ThreadSafe;
-
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
-import java.util.Map;
/**
* A <code>Selector</code> that matches a string from within the host
parameter
1.4.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/selection/RequestParameterSelector.java
Index: RequestParameterSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestParameterSelector.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- RequestParameterSelector.java 22 Feb 2002 07:03:54 -0000 1.4
+++ RequestParameterSelector.java 31 Jan 2003 07:51:18 -0000 1.4.2.1
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.selection;
+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.logger.AbstractLoggable;
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.Request;
-
-import java.util.Map;
/**
* A <code>Selector</code> that matches a string against a configurable
request parameter's value.
1.4.2.1 +1 -12
xml-cocoon2/src/java/org/apache/cocoon/selection/Attic/SessionStateSelector.java
Index: SessionStateSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/Attic/SessionStateSelector.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- SessionStateSelector.java 22 Feb 2002 07:03:54 -0000 1.4
+++ SessionStateSelector.java 31 Jan 2003 07:51:18 -0000 1.4.2.1
@@ -51,19 +51,8 @@
package org.apache.cocoon.selection;
-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.framework.thread.ThreadSafe;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-
import org.apache.cocoon.Constants;
-
-import java.util.Map;
/**
* This class generates source code to implement a selector that
1.6.2.1 +3 -5
xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java
Index: RequestAttributeSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- RequestAttributeSelector.java 22 Feb 2002 07:03:54 -0000 1.6
+++ RequestAttributeSelector.java 31 Jan 2003 07:51:18 -0000 1.6.2.1
@@ -50,17 +50,15 @@
*/
package org.apache.cocoon.selection;
+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.logger.AbstractLoggable;
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.Request;
-
-import java.util.Map;
/**
* A <code>Selector</code> that matches a string against a configurable
request
No revision
No revision
1.12.2.6 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.12.2.5
retrieving revision 1.12.2.6
diff -u -r1.12.2.5 -r1.12.2.6
--- AbstractEnvironment.java 4 Aug 2002 04:11:52 -0000 1.12.2.5
+++ AbstractEnvironment.java 31 Jan 2003 07:51:18 -0000 1.12.2.6
@@ -50,14 +50,6 @@
*/
package org.apache.cocoon.environment;
-import org.apache.avalon.excalibur.collections.IteratorEnumeration;
-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.source.SourceHandler;
-import org.xml.sax.SAXException;
-
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -65,6 +57,13 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.avalon.excalibur.collections.IteratorEnumeration;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.SourceHandler;
+import org.xml.sax.SAXException;
/**
* Base class for any environment
No revision
No revision
1.5.2.2 +10 -12
xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- XMLResourceBundleFactory.java 30 May 2002 11:56:46 -0000 1.5.2.1
+++ XMLResourceBundleFactory.java 31 Jan 2003 07:51:18 -0000 1.5.2.2
@@ -50,12 +50,19 @@
*/
package org.apache.cocoon.i18n;
+import java.io.FileNotFoundException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+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.DefaultComponentSelector;
-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.component.DefaultComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -63,15 +70,6 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.log.Logger;
import org.xml.sax.SAXParseException;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
/**
* This is the XMLResourceBundleFactory, the method for getting and
No revision
No revision
1.3.2.3 +6 -8
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolver.java
Index: VariableResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolver.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- VariableResolver.java 9 Jan 2003 17:45:01 -0000 1.3.2.2
+++ VariableResolver.java 31 Jan 2003 07:51:18 -0000 1.3.2.3
@@ -50,16 +50,14 @@
*/
package org.apache.cocoon.components.treeprocessor.variables;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.sitemap.PatternException;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.components.treeprocessor.InvokeContext;
-
import java.util.Collections;
-import java.util.Iterator;
import java.util.HashMap;
-import java.util.List;
+import java.util.Iterator;
import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.components.treeprocessor.InvokeContext;
+import org.apache.cocoon.sitemap.PatternException;
/**
* Utility class for handling {...} pattern substitutions in sitemap
statements.
1.1.2.2 +2 -7
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java
Index: VariableResolverFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/VariableResolverFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- VariableResolverFactory.java 25 Nov 2002 21:52:01 -0000 1.1.2.1
+++ VariableResolverFactory.java 31 Jan 2003 07:51:18 -0000 1.1.2.2
@@ -50,15 +50,10 @@
*/
package org.apache.cocoon.components.treeprocessor.variables;
-import org.apache.avalon.framework.component.ComponentManager;
+import java.util.List;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
public class VariableResolverFactory {
1.3.2.2 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/NOPVariableResolver.java
Index: NOPVariableResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/variables/NOPVariableResolver.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- NOPVariableResolver.java 25 Nov 2002 21:52:01 -0000 1.3.2.1
+++ NOPVariableResolver.java 31 Jan 2003 07:51:18 -0000 1.3.2.2
@@ -50,10 +50,9 @@
*/
package org.apache.cocoon.components.treeprocessor.variables;
-import org.apache.cocoon.components.treeprocessor.InvokeContext;
-
-import java.util.List;
import java.util.Map;
+
+import org.apache.cocoon.components.treeprocessor.InvokeContext;
/**
* No-op implementation of [EMAIL PROTECTED] VariableResolver} for constant
expressions
No revision
No revision
1.18.2.8 +24 -25
xml-cocoon2/src/java/org/apache/cocoon/components/xslt/Attic/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/Attic/XSLTProcessorImpl.java,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- XSLTProcessorImpl.java 19 Dec 2002 11:24:32 -0000 1.18.2.7
+++ XSLTProcessorImpl.java 31 Jan 2003 07:51:19 -0000 1.18.2.8
@@ -50,46 +50,45 @@
*/
package org.apache.cocoon.components.xslt;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamSource;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
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.ParameterException;
-
-import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.AggregatedCacheValidity;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.TimeStampCacheValidity;
-import org.apache.cocoon.caching.AggregatedCacheValidity;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.TraxErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLFilter;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Result;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.ArrayList;
+import org.xml.sax.XMLFilter;
/**
* This class defines the implementation of the [EMAIL PROTECTED]
XSLTProcessor}
No revision
No revision
1.11.2.3 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/components/store/Attic/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/Attic/StoreJanitorImpl.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- StoreJanitorImpl.java 19 Dec 2002 11:24:32 -0000 1.11.2.2
+++ StoreJanitorImpl.java 31 Jan 2003 07:51:19 -0000 1.11.2.3
@@ -50,6 +50,9 @@
*/
package org.apache.cocoon.components.store;
+import java.util.ArrayList;
+import java.util.Iterator;
+
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -58,10 +61,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-
/**
* This class is a implentation of a StoreJanitor. Store classes
* can register to the StoreJanitor. When memory is too low,
@@ -182,7 +181,7 @@
}
}
try {
- Thread.currentThread().sleep(this.cleanupthreadinterval *
1000);
+ Thread.sleep(this.cleanupthreadinterval * 1000);
} catch (InterruptedException ignore) {}
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
