Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 22308 invoked by uid 500); 20 Aug 2001 14:12:37 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 22299 invoked by uid 500); 20 Aug 2001 14:12:37 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Date: 20 Aug 2001 14:07:36 -0000 Message-ID: <20010820140736.33704.qmail@icarus.apache.org> From: dims@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N dims 01/08/20 07:07:36 Modified: src/org/apache/cocoon Tag: cocoon_20_branch Cocoon.java CodeFactory.java Main.java Notification.java Notifier.java ProcessingException.java cocoon.roles src/org/apache/cocoon/acting Tag: cocoon_20_branch AbstractAction.java AbstractComplementaryConfigurableAction.java AbstractConfigurableAction.java AbstractDatabaseAction.java AbstractValidatorAction.java Action.java ComposerAction.java ConfigurableComposerAction.java DatabaseAddAction.java DatabaseAuthenticatorAction.java DatabaseDeleteAction.java DatabaseUpdateAction.java FormValidatorAction.java HelloAction.java HttpHeaderAction.java LangSelect.java LocaleAction.java OraAddAction.java RequestParamAction.java ResourceExistsAction.java SendmailAction.java SessionInvalidatorAction.java SessionIsValidAction.java SessionPropagatorAction.java SessionStateAction.java SessionValidatorAction.java ValidatorActionHelper.java src/org/apache/cocoon/caching Tag: cocoon_20_branch AggregatedCacheValidity.java CompositeCacheValidity.java PipelineCacheKey.java src/org/apache/cocoon/components/browser Tag: cocoon_20_branch Browser.java src/org/apache/cocoon/components/classloader Tag: cocoon_20_branch ClassLoaderManager.java ClassLoaderManagerImpl.java RepositoryClassLoader.java src/org/apache/cocoon/components/jsp Tag: cocoon_20_branch JSPEngine.java JSPEngineImpl.java src/org/apache/cocoon/components/language/generator Tag: cocoon_20_branch GeneratorSelector.java ProgramGenerator.java ProgramGeneratorImpl.java src/org/apache/cocoon/components/language/markup Tag: cocoon_20_branch AbstractMarkupLanguage.java Logicsheet.java LogicsheetCodeGenerator.java MarkupCodeGenerator.java MarkupLanguage.java NamedLogicsheet.java src/org/apache/cocoon/components/language/markup/sitemap Tag: cocoon_20_branch SitemapMarkupLanguage.java src/org/apache/cocoon/components/language/markup/xsp Tag: cocoon_20_branch XSPCookieHelper.java XSPFormValidatorHelper.java XSPGenerator.java XSPMarkupLanguage.java XSPObjectHelper.java XSPRequestHelper.java XSPResponseHelper.java XSPUtil.java src/org/apache/cocoon/components/language/programming Tag: cocoon_20_branch AbstractProgrammingLanguage.java CompiledProgrammingLanguage.java LanguageCompiler.java ProgrammingLanguage.java src/org/apache/cocoon/components/language/programming/java Tag: cocoon_20_branch AbstractJavaCompiler.java JavaLanguage.java Javac.java Jikes.java JstyleFormatter.java src/org/apache/cocoon/components/language/programming/javascript Tag: cocoon_20_branch JavascriptLanguage.java src/org/apache/cocoon/components/parser Tag: cocoon_20_branch JaxpParser.java Parser.java XercesParser.java src/org/apache/cocoon/components/pipeline Tag: cocoon_20_branch AbstractEventPipeline.java AbstractStreamPipeline.java CacheableEventPipeline.java CachingEventPipeline.java CachingStreamPipeline.java EventPipeline.java NonCachingEventPipeline.java NonCachingStreamPipeline.java StreamPipeline.java src/org/apache/cocoon/components/sax Tag: cocoon_20_branch XMLByteStreamCompiler.java XMLByteStreamInterpreter.java XMLTeePipe.java src/org/apache/cocoon/components/saxconnector Tag: cocoon_20_branch LoggingSAXConnector.java src/org/apache/cocoon/components/source Tag: cocoon_20_branch CocoonSourceFactory.java SitemapSource.java SourceFactory.java SourceHandler.java SourceHandlerImpl.java URLSource.java src/org/apache/cocoon/components/store Tag: cocoon_20_branch FilesystemStore.java MRUMemoryStore.java MemoryStore.java Store.java src/org/apache/cocoon/components/transcoder Tag: cocoon_20_branch ExtendableTranscoderFactory.java src/org/apache/cocoon/components/url Tag: cocoon_20_branch ContextURLFactory.java ResourceURLFactory.java URLFactory.java URLFactoryImpl.java src/org/apache/cocoon/environment Tag: cocoon_20_branch AbstractEnvironment.java Environment.java Request.java Response.java Source.java SourceResolver.java src/org/apache/cocoon/environment/commandline Tag: cocoon_20_branch AbstractCommandLineEnvironment.java CommandLineRequest.java CommandLineResponse.java CommandlineContext.java FileSavingEnvironment.java LinkSamplingEnvironment.java src/org/apache/cocoon/environment/http Tag: cocoon_20_branch HttpContext.java HttpEnvironment.java HttpRequest.java HttpResponse.java HttpSession.java RequestWrapper22.java RequestWrapper23.java RequestWrapperMaybeUpload22.java RequestWrapperMaybeUpload23.java src/org/apache/cocoon/environment/wrapper Tag: cocoon_20_branch EnvironmentWrapper.java RequestParameters.java RequestWrapper.java src/org/apache/cocoon/generation Tag: cocoon_20_branch AbstractGenerator.java AbstractServerPage.java ComposerGenerator.java DirectoryGenerator.java FileGenerator.java FragmentExtractorGenerator.java Generator.java HTMLGenerator.java ImageDirectoryGenerator.java JspGenerator.java PhpGenerator.java RequestGenerator.java ScriptGenerator.java ServerPagesGenerator.java ServletGenerator.java StatusGenerator.java StreamGenerator.java VelocityGenerator.java src/org/apache/cocoon/matching Tag: cocoon_20_branch BrowserMatcherFactory.java Matcher.java RequestParamMatcher.java WildcardHeaderMatcherFactory.java WildcardParameterValueMatcherFactory.java WildcardSessionStateMatcherFactory.java src/org/apache/cocoon/reading Tag: cocoon_20_branch AbstractReader.java DatabaseReader.java Reader.java ResourceReader.java src/org/apache/cocoon/selection Tag: cocoon_20_branch BrowserSelectorFactory.java HeaderSelectorFactory.java HostSelectorFactory.java ParameterSelectorFactory.java RequestSelectorFactory.java Selector.java SessionStateSelectorFactory.java src/org/apache/cocoon/selection/helpers Tag: cocoon_20_branch CodedSelectorHelper.java src/org/apache/cocoon/serialization Tag: cocoon_20_branch AbstractSerializer.java AbstractTextSerializer.java FOPSerializer.java HTMLSerializer.java LinkSerializer.java PCLSerializer.java PSSerializer.java SVGSerializer.java TextSerializer.java XMLSerializer.java src/org/apache/cocoon/servlet Tag: cocoon_20_branch CocoonServlet.java ParanoidClassLoader.java ParanoidCocoonServlet.java src/org/apache/cocoon/sitemap Tag: cocoon_20_branch AbstractSitemap.java ContentAggregator.java Handler.java LinkTranslator.java Manager.java SitemapComponentSelector.java SitemapModelComponent.java SitemapOutputComponent.java SitemapRedirector.java XSLTFactoryLoader.java src/org/apache/cocoon/transformation Tag: cocoon_20_branch AbstractDOMTransformer.java CIncludeTransformer.java FilterTransformer.java FragmentExtractorTransformer.java I18nTransformer.java LDAPTransformer.java LogTransformer.java ReadDOMSessionTransformer.java SQLTransformer.java TraxTransformer.java WriteDOMSessionTransformer.java XIncludeTransformer.java XTTransformer.java src/org/apache/cocoon/util Tag: cocoon_20_branch ClassUtils.java IOUtils.java NetUtils.java PostInputStream.java StringUtils.java TraxErrorHandler.java src/org/apache/cocoon/util/log Tag: cocoon_20_branch CocoonLogFormatter.java ExtensiblePatternFormatter.java XMLCocoonLogFormatter.java src/org/apache/cocoon/xml Tag: cocoon_20_branch AbstractDOMFragment.java AbstractSAXFragment.java AbstractXMLConsumer.java AbstractXMLPipe.java ContentHandlerWrapper.java DocumentHandlerAdapter.java DocumentHandlerWrapper.java LoggingEntityResolver.java XMLProducer.java src/org/apache/cocoon/xml/dom Tag: cocoon_20_branch DOMBuilder.java DOMStreamer.java SVGBuilder.java src/org/apache/cocoon/xml/xlink Tag: cocoon_20_branch ExtendedXLinkPipe.java Log: - Fixing Import's Revision Changes Path No revision No revision 1.9.2.12 +14 -23 xml-cocoon2/src/org/apache/cocoon/Cocoon.java Index: Cocoon.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v retrieving revision 1.9.2.11 retrieving revision 1.9.2.12 diff -u -r1.9.2.11 -r1.9.2.12 --- Cocoon.java 2001/07/17 10:10:39 1.9.2.11 +++ Cocoon.java 2001/08/20 14:07:24 1.9.2.12 @@ -7,22 +7,11 @@ *****************************************************************************/ package org.apache.cocoon; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.FileInputStream; -import java.io.BufferedInputStream; -import java.net.URL; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import org.apache.avalon.excalibur.component.DefaultRoleManager; +import org.apache.avalon.excalibur.component.ExcaliburComponentManager; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.SAXConfigurationHandler; @@ -31,36 +20,38 @@ import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Modifiable; import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.components.language.generator.ProgramGenerator; import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.components.pipeline.EventPipeline; import org.apache.cocoon.components.pipeline.StreamPipeline; -import org.apache.cocoon.components.store.Store; -import org.apache.cocoon.components.store.FilesystemStore; import org.apache.cocoon.components.source.SourceHandler; import org.apache.cocoon.components.source.URLSource; +import org.apache.cocoon.components.store.FilesystemStore; +import org.apache.cocoon.components.store.Store; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.Source; -import org.apache.cocoon.serialization.Serializer; -import org.apache.cocoon.sitemap.Manager; import org.apache.cocoon.sitemap.AbstractSitemap; +import org.apache.cocoon.sitemap.Manager; import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.util.NetUtils; -import org.apache.avalon.excalibur.component.ExcaliburComponentManager; -import org.apache.avalon.excalibur.component.DefaultRoleManager; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Enumeration; +import java.util.Map; /** * The Cocoon Object is the main Kernel for the entire Cocoon system. * * @author Pierpaolo Fumagalli (Apache Software Foundation, Exoffice Technologies) * @author Stefano Mazzocchi - * @version CVS $Revision: 1.9.2.11 $ $Date: 2001/07/17 10:10:39 $ + * @version CVS $Revision: 1.9.2.12 $ $Date: 2001/08/20 14:07:24 $ */ public class Cocoon extends AbstractLoggable implements ThreadSafe, Component, Initializable, Disposable, Modifiable, Processor, Contextualizable { /** The application context */ 1.1.1.1.2.1 +1 -2 xml-cocoon2/src/org/apache/cocoon/CodeFactory.java Index: CodeFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/CodeFactory.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- CodeFactory.java 2001/05/09 20:49:28 1.1.1.1 +++ CodeFactory.java 2001/08/20 14:07:24 1.1.1.1.2.1 @@ -9,7 +9,6 @@ package org.apache.cocoon; import org.apache.avalon.framework.configuration.ConfigurationException; - import org.w3c.dom.NodeList; /** @@ -22,7 +21,7 @@ * * @author Stefano Mazzocchi * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:28 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:24 $ */ public interface CodeFactory { 1.4.2.8 +23 -23 xml-cocoon2/src/org/apache/cocoon/Main.java Index: Main.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v retrieving revision 1.4.2.7 retrieving revision 1.4.2.8 diff -u -r1.4.2.7 -r1.4.2.8 --- Main.java 2001/07/22 21:19:31 1.4.2.7 +++ Main.java 2001/08/20 14:07:24 1.4.2.8 @@ -8,49 +8,49 @@ package org.apache.cocoon; +import org.apache.avalon.excalibur.cli.CLArgsParser; +import org.apache.avalon.excalibur.cli.CLOption; +import org.apache.avalon.excalibur.cli.CLOptionDescriptor; +import org.apache.avalon.excalibur.cli.CLUtil; +import org.apache.avalon.framework.context.DefaultContext; +import org.apache.cocoon.environment.Environment; +import org.apache.cocoon.environment.commandline.CommandlineContext; +import org.apache.cocoon.environment.commandline.FileSavingEnvironment; +import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment; +import org.apache.cocoon.util.IOUtils; +import org.apache.cocoon.util.MIMEUtils; +import org.apache.cocoon.util.NetUtils; +import org.apache.log.Hierarchy; +import org.apache.log.LogTarget; +import org.apache.log.Logger; +import org.apache.log.Priority; +import org.apache.log.output.DefaultOutputLogTarget; +import org.apache.log.output.FileOutputLogTarget; + import java.io.BufferedOutputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; -import java.io.BufferedReader; -import java.io.FileReader; import java.net.MalformedURLException; -import java.util.HashSet; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.avalon.framework.context.DefaultContext; -import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.environment.commandline.FileSavingEnvironment; -import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment; -import org.apache.cocoon.environment.commandline.CommandlineContext; -import org.apache.cocoon.util.IOUtils; -import org.apache.cocoon.util.JavaArchiveFilter; -import org.apache.cocoon.util.MIMEUtils; -import org.apache.cocoon.util.NetUtils; -import org.apache.avalon.excalibur.cli.CLArgsParser; -import org.apache.avalon.excalibur.cli.CLOption; -import org.apache.avalon.excalibur.cli.CLOptionDescriptor; -import org.apache.avalon.excalibur.cli.CLUtil; -import org.apache.log.Hierarchy; -import org.apache.log.LogTarget; -import org.apache.log.Logger; -import org.apache.log.Priority; -import org.apache.log.output.DefaultOutputLogTarget; -import org.apache.log.output.FileOutputLogTarget; /** * Command line entry point. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.4.2.7 $ $Date: 2001/07/22 21:19:31 $ + * @version CVS $Revision: 1.4.2.8 $ $Date: 2001/08/20 14:07:24 $ */ public class Main { 1.2.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/Notification.java Index: Notification.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notification.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- Notification.java 2001/08/17 13:19:57 1.2.2.1 +++ Notification.java 2001/08/20 14:07:24 1.2.2.2 @@ -8,11 +8,12 @@ package org.apache.cocoon; +import org.apache.avalon.framework.CascadingThrowable; +import org.xml.sax.SAXException; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.HashMap; -import org.apache.avalon.framework.CascadingThrowable; -import org.xml.sax.SAXException; /** 1.2.2.2 +5 -7 xml-cocoon2/src/org/apache/cocoon/Notifier.java Index: Notifier.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notifier.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- Notifier.java 2001/07/19 12:20:49 1.2.2.1 +++ Notifier.java 2001/08/20 14:07:24 1.2.2.2 @@ -8,23 +8,21 @@ package org.apache.cocoon; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + import java.io.IOException; import java.io.OutputStream; -import java.text.DateFormat; import java.util.HashMap; import java.util.Iterator; -import java.util.Set; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; /** * Generates an XML representation of the current notification. * * @author Nicola Ken Barozzi Aisa * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/19 12:20:49 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:24 $ */ public class Notifier { 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/ProcessingException.java Index: ProcessingException.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/ProcessingException.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ProcessingException.java 2001/08/14 13:59:23 1.1.1.1.2.1 +++ ProcessingException.java 2001/08/20 14:07:24 1.1.1.1.2.2 @@ -7,9 +7,10 @@ *****************************************************************************/ package org.apache.cocoon; +import org.apache.avalon.framework.CascadingException; + import java.io.PrintStream; import java.io.PrintWriter; -import org.apache.avalon.framework.CascadingException; /** * This Exception is thrown every time there is a problem in processing @@ -17,7 +18,7 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/14 13:59:23 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:24 $ */ public class ProcessingException extends CascadingException { 1.6.2.13 +4 -0 xml-cocoon2/src/org/apache/cocoon/cocoon.roles Index: cocoon.roles =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v retrieving revision 1.6.2.12 retrieving revision 1.6.2.13 diff -u -r1.6.2.12 -r1.6.2.13 --- cocoon.roles 2001/08/09 14:36:42 1.6.2.12 +++ cocoon.roles 2001/08/20 14:07:24 1.6.2.13 @@ -45,6 +45,10 @@ shorthand="jsp-engine" default-class="org.apache.cocoon.components.jsp.JSPEngineImpl"/> + + No revision No revision 1.2.2.5 +5 -5 xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java Index: AbstractAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -r1.2.2.4 -r1.2.2.5 --- AbstractAction.java 2001/07/27 18:08:01 1.2.2.4 +++ AbstractAction.java 2001/08/20 14:07:24 1.2.2.5 @@ -7,23 +7,23 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Map; -import java.util.TreeMap; -import java.util.Collections; - import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLoggable; +import java.util.Collections; +import java.util.Map; +import java.util.TreeMap; + /** * AbstractAction gives you the infrastructure for easily deploying more * Actions. In order to get at the Logger, use getLogger(). * * @author Giacomo Pati * @author Christian Haul - * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/07/27 18:08:01 $ + * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class AbstractAction extends AbstractLoggable implements Action, Configurable, Disposable { 1.3.2.5 +5 -11 xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java Index: AbstractComplementaryConfigurableAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -r1.3.2.4 -r1.3.2.5 --- AbstractComplementaryConfigurableAction.java 2001/07/23 16:30:45 1.3.2.4 +++ AbstractComplementaryConfigurableAction.java 2001/08/20 14:07:24 1.3.2.5 @@ -7,22 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.SAXConfigurationHandler; -import org.apache.cocoon.components.source.SourceHandler; -import org.apache.cocoon.Roles; import org.apache.cocoon.Constants; -import org.apache.cocoon.acting.ConfigurationHelper; -import org.apache.cocoon.components.parser.Parser; -import org.apache.cocoon.components.url.URLFactory; +import org.apache.cocoon.components.source.SourceHandler; import org.apache.cocoon.environment.Source; -import org.apache.cocoon.components.source.URLSource; -import org.xml.sax.InputSource; + +import java.util.HashMap; +import java.util.Map; /** * Set up environment for configurable form handling data. This group @@ -32,7 +26,7 @@ * effective. The name of the root configuration element is irrelevant. * * @author Berin Loritsch - * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/07/23 16:30:45 $ + * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class AbstractComplementaryConfigurableAction extends ConfigurableComposerAction { private static Map configurations = new HashMap(); 1.1.2.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java Index: AbstractConfigurableAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractConfigurableAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- AbstractConfigurableAction.java 2001/08/13 11:50:18 1.1.2.2 +++ AbstractConfigurableAction.java 2001/08/20 14:07:24 1.1.2.3 @@ -10,7 +10,6 @@ import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; - import org.apache.cocoon.util.HashMap; /** @@ -18,7 +17,7 @@ * deploying more Actions that take default parameters. * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/13 11:50:18 $ */ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class AbstractConfigurableAction extends AbstractAction implements Configurable { /** 1.7.2.5 +12 -12 xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java Index: AbstractDatabaseAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -r1.7.2.4 -r1.7.2.5 --- AbstractDatabaseAction.java 2001/07/23 16:31:02 1.7.2.4 +++ AbstractDatabaseAction.java 2001/08/20 14:07:24 1.7.2.5 @@ -7,6 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.acting; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; +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.ComponentSelector; +import org.apache.avalon.framework.configuration.Configurable; +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.generation.ImageDirectoryGenerator; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; @@ -26,17 +37,6 @@ import java.util.Collections; import java.util.HashMap; 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.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.generation.ImageDirectoryGenerator; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; /** * Set up environment for configurable form handling data. It is @@ -158,7 +158,7 @@ * * @author Berin Loritsch * @author Donald Ball - * @version CVS $Revision: 1.7.2.4 $ $Date: 2001/07/23 16:31:02 $ + * @version CVS $Revision: 1.7.2.5 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class AbstractDatabaseAction extends AbstractComplementaryConfigurableAction implements Configurable, Disposable { protected Map files = new HashMap(); 1.4.2.4 +4 -10 xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java Index: AbstractValidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- AbstractValidatorAction.java 2001/07/13 13:37:19 1.4.2.3 +++ AbstractValidatorAction.java 2001/08/20 14:07:24 1.4.2.4 @@ -1,20 +1,14 @@ -// $Id: AbstractValidatorAction.java,v 1.4.2.3 2001/07/13 13:37:19 dims Exp $ +// $Id: AbstractValidatorAction.java,v 1.4.2.4 2001/08/20 14:07:24 dims Exp $ package org.apache.cocoon.acting; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.log.Logger; - +import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; import java.util.Map; -import org.apache.cocoon.acting.ValidatorActionResult; -import org.apache.cocoon.acting.ValidatorActionHelper; -import org.apache.avalon.framework.configuration.ConfigurationException; - /** * Abstract implementation of action that needs to perform validation of * parameters (from session, from request, etc.). All `validator' actions @@ -103,7 +97,7 @@ * * @author Martin Man <Martin.Man@seznam.cz> * @author Christian Haul - * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/07/13 13:37:19 $ + * @version CVS $Revision: 1.4.2.4 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class AbstractValidatorAction extends AbstractComplementaryConfigurableAction @@ -624,5 +618,5 @@ } -// $Id: AbstractValidatorAction.java,v 1.4.2.3 2001/07/13 13:37:19 dims Exp $ +// $Id: AbstractValidatorAction.java,v 1.4.2.4 2001/08/20 14:07:24 dims Exp $ // vim: set et ts=4 sw=4: 1.3.2.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/acting/Action.java Index: Action.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/Action.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- Action.java 2001/07/07 19:07:40 1.3.2.1 +++ Action.java 2001/08/20 14:07:24 1.3.2.2 @@ -7,18 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; -import org.xml.sax.SAXException; + +import java.util.Map; /** * * @author Giacomo Pati - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/07 19:07:40 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:24 $ */ public interface Action extends Component, ThreadSafe { 1.1.1.1.2.1 +2 -3 xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java Index: ComposerAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ComposerAction.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- ComposerAction.java 2001/05/09 20:50:05 1.1.1.1 +++ ComposerAction.java 2001/08/20 14:07:24 1.1.1.1.2.1 @@ -7,17 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentException; +import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; -import org.apache.cocoon.Cocoon; /** * The ComposerAction will allow any Action * that extends this to access SitemapComponents. * * @author Giacomo Pati - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:50:05 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class ComposerAction extends AbstractAction implements Composable { 1.1.2.3 +2 -3 xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java Index: ConfigurableComposerAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ConfigurableComposerAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- ConfigurableComposerAction.java 2001/07/28 16:07:02 1.1.2.2 +++ ConfigurableComposerAction.java 2001/08/20 14:07:24 1.1.2.3 @@ -7,10 +7,9 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentException; +import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; -import org.apache.cocoon.Cocoon; /** * The ComposerAction will allow any Action @@ -21,7 +20,7 @@ * * @author Giacomo Pati * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/28 16:07:02 $ */ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:24 $ */ public abstract class ConfigurableComposerAction extends AbstractConfigurableAction implements Composable { /** The component manager instance */ 1.6.2.5 +13 -18 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java Index: DatabaseAddAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -r1.6.2.4 -r1.6.2.5 --- DatabaseAddAction.java 2001/07/13 19:46:05 1.6.2.4 +++ DatabaseAddAction.java 2001/08/20 14:07:24 1.6.2.5 @@ -7,32 +7,27 @@ *****************************************************************************/ package org.apache.cocoon.acting; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.Constants; +import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.SourceResolver; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; -import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.Enumeration; -import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.Redirector; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.generation.ImageDirectoryGenerator; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; /** * Adds record in a database. The action can update one or more tables, @@ -43,7 +38,7 @@ * * @author Berin Loritsch * @author Donald Ball - * @version CVS $Revision: 1.6.2.4 $ $Date: 2001/07/13 19:46:05 $ + * @version CVS $Revision: 1.6.2.5 $ $Date: 2001/08/20 14:07:24 $ */ public class DatabaseAddAction extends AbstractDatabaseAction { protected static final Map addStatements = new HashMap(); 1.3.2.6 +12 -13 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java Index: DatabaseAuthenticatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -r1.3.2.5 -r1.3.2.6 --- DatabaseAuthenticatorAction.java 2001/08/09 21:12:43 1.3.2.5 +++ DatabaseAuthenticatorAction.java 2001/08/20 14:07:25 1.3.2.6 @@ -1,22 +1,21 @@ -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.5 2001/08/09 21:12:43 bloritsch Exp $ +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ package org.apache.cocoon.acting; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; -import org.apache.log.Logger; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * This action is used to authenticate user by comparing several request @@ -51,7 +50,7 @@ * not verified. * * @author Martin Man <Martin.Man@seznam.cz> - * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/08/09 21:12:43 $ + * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/08/20 14:07:25 $ */ public class DatabaseAuthenticatorAction extends AbstractDatabaseAction { @@ -252,5 +251,5 @@ } } -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.5 2001/08/09 21:12:43 bloritsch Exp $ +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ // vim: set et ts=4 sw=4: 1.3.2.6 +9 -16 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java Index: DatabaseDeleteAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -r1.3.2.5 -r1.3.2.6 --- DatabaseDeleteAction.java 2001/07/27 18:08:01 1.3.2.5 +++ DatabaseDeleteAction.java 2001/08/20 14:07:25 1.3.2.6 @@ -7,28 +7,21 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.configuration.Configurable; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.generation.ImageDirectoryGenerator; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; /** * Delete a record from a database. This Action assumes that all @@ -38,7 +31,7 @@ * the keys. * * @author Berin Loritsch - * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/07/27 18:08:01 $ + * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/08/20 14:07:25 $ */ public final class DatabaseDeleteAction extends AbstractDatabaseAction { private static final Map deleteStatements = new HashMap(); 1.3.2.7 +9 -16 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java Index: DatabaseUpdateAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -r1.3.2.6 -r1.3.2.7 --- DatabaseUpdateAction.java 2001/07/27 21:28:58 1.3.2.6 +++ DatabaseUpdateAction.java 2001/08/20 14:07:25 1.3.2.7 @@ -7,35 +7,28 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.configuration.Configurable; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.generation.ImageDirectoryGenerator; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; /** * Update a record in a database. This Action assumes that there is * only one table at a time to update. * * @author Berin Loritsch - * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/07/27 21:28:58 $ + * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/20 14:07:25 $ */ public class DatabaseUpdateAction extends AbstractDatabaseAction { private static final Map updateStatements = new HashMap(); 1.4.2.5 +6 -10 xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java Index: FormValidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v retrieving revision 1.4.2.4 retrieving revision 1.4.2.5 diff -u -r1.4.2.4 -r1.4.2.5 --- FormValidatorAction.java 2001/07/23 16:31:13 1.4.2.4 +++ FormValidatorAction.java 2001/08/20 14:07:25 1.4.2.5 @@ -1,20 +1,16 @@ -// $Id: FormValidatorAction.java,v 1.4.2.4 2001/07/23 16:31:13 haul Exp $ +// $Id: FormValidatorAction.java,v 1.4.2.5 2001/08/20 14:07:25 dims Exp $ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.Tokenizer; -import org.apache.log.Logger; -import org.apache.cocoon.acting.ValidatorActionHelper; +import java.util.HashMap; +import java.util.Map; /** * This is the action used to validate Request parameters. @@ -58,7 +54,7 @@ * * @author Martin Man <Martin.Man@seznam.cz> * @author Christian Haul - * @version CVS $Revision: 1.4.2.4 $ $Date: 2001/07/23 16:31:13 $ + * @version CVS $Revision: 1.4.2.5 $ $Date: 2001/08/20 14:07:25 $ */ public class FormValidatorAction extends AbstractValidatorAction { @@ -208,5 +204,5 @@ } } -// $Id: FormValidatorAction.java,v 1.4.2.4 2001/07/23 16:31:13 haul Exp $ +// $Id: FormValidatorAction.java,v 1.4.2.5 2001/08/20 14:07:25 dims Exp $ // vim: set et ts=4 sw=4: 1.3.2.1 +4 -6 xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java Index: HelloAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- HelloAction.java 2001/06/05 21:36:20 1.3 +++ HelloAction.java 2001/08/20 14:07:25 1.3.2.1 @@ -7,23 +7,21 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Map; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; +import java.util.Map; + /** * A simple Action that tracks if a Session object * has been created or not. * * @author Giacomo Pati - * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:20 $ + * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:25 $ */ public class HelloAction extends ComposerAction { 1.1.2.3 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java Index: HttpHeaderAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- HttpHeaderAction.java 2001/07/23 16:31:19 1.1.2.2 +++ HttpHeaderAction.java 2001/08/20 14:07:25 1.1.2.3 @@ -7,16 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.SourceResolver; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * This action adds HTTP headers to the response. 1.4.2.1 +9 -9 xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java Index: LangSelect.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- LangSelect.java 2001/06/05 21:36:20 1.4 +++ LangSelect.java 2001/08/20 14:07:25 1.4.2.1 @@ -7,25 +7,25 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; -import org.apache.cocoon.acting.Action; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; + +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; /** * LangSelect Action returns two character language code to sitemap. 1.1.2.3 +5 -10 xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java Index: LocaleAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- LocaleAction.java 2001/07/06 21:31:17 1.1.2.2 +++ LocaleAction.java 2001/08/20 14:07:25 1.1.2.3 @@ -7,19 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; -import org.apache.cocoon.acting.Action; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -27,6 +18,10 @@ import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; import org.apache.regexp.RE; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; /** * LocaleAction is a class which obtains the request's locale information 1.3.2.2 +12 -14 xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java Index: OraAddAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- OraAddAction.java 2001/07/13 13:22:14 1.3.2.1 +++ OraAddAction.java 2001/08/20 14:07:25 1.3.2.2 @@ -7,6 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.acting; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.Constants; +import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.SourceResolver; +import org.apache.cocoon.generation.ImageDirectoryGenerator; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -21,26 +32,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import oracle.jdbc.OracleResultSet; -import oracle.sql.BLOB; -import oracle.sql.CLOB; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.Redirector; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.generation.ImageDirectoryGenerator; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; /** * Add a record in a database. This Action assumes that there is * only one table at a time to update. * * @author Berin Loritsch - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/13 13:22:14 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:25 $ */ public class OraAddAction extends DatabaseAddAction { private static final Map selectLOBStatements = new HashMap(); 1.1.2.4 +8 -8 xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java Index: RequestParamAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- RequestParamAction.java 2001/07/13 13:37:42 1.1.2.3 +++ RequestParamAction.java 2001/08/20 14:07:25 1.1.2.4 @@ -14,15 +14,15 @@ /* * Standard imports */ -import java.util.HashMap; -import java.util.Map; -import java.util.Enumeration; -import org.apache.cocoon.acting.ComposerAction; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.environment.Redirector; -import org.apache.cocoon.Constants; -import org.apache.avalon.framework.parameters.Parameters; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * This action makes some request details available to the sitemap via parameter @@ -73,7 +73,7 @@ * * @author Marcus Crafter * @author Torsten Curdt - * @version CVS $Revision: 1.1.2.3 $ + * @version CVS $Revision: 1.1.2.4 $ */ public class RequestParamAction extends ComposerAction { 1.5.2.3 +5 -17 xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java Index: ResourceExistsAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- ResourceExistsAction.java 2001/07/07 19:07:42 1.5.2.2 +++ ResourceExistsAction.java 2001/08/20 14:07:25 1.5.2.3 @@ -7,25 +7,13 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.io.InputStream; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -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.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Redirector; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; -import org.xml.sax.InputSource; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * This action simply checks to see if a given resource exists. It takes a @@ -33,7 +21,7 @@ * null otherwise. It has only been tested with context urls. * * @author Donald Ball - * @version CVS $Revision: 1.5.2.2 $ $Date: 2001/07/07 19:07:42 $ + * @version CVS $Revision: 1.5.2.3 $ $Date: 2001/08/20 14:07:25 $ */ public class ResourceExistsAction extends ComposerAction { 1.3.2.1 +6 -14 xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java Index: SendmailAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- SendmailAction.java 2001/06/05 21:36:21 1.3 +++ SendmailAction.java 2001/08/20 14:07:25 1.3.2.1 @@ -7,19 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import javax.mail.Message; -import javax.mail.Transport; -import javax.mail.Session; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.AddressException; -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; @@ -27,7 +14,12 @@ import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.SourceResolver; -import org.apache.log.Logger; + +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; /** * The SendmailAction class sends email. The action needs four parameters: 1.3.2.1 +7 -8 xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java Index: SessionInvalidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- SessionInvalidatorAction.java 2001/06/05 21:36:21 1.3 +++ SessionInvalidatorAction.java 2001/08/20 14:07:25 1.3.2.1 @@ -1,24 +1,23 @@ -// $Id: SessionInvalidatorAction.java,v 1.3 2001/06/05 21:36:21 dims Exp $ +// $Id: SessionInvalidatorAction.java,v 1.3.2.1 2001/08/20 14:07:25 dims Exp $ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; -import org.apache.log.Logger; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * This is the action used to invalidate an HTTP session. The action returns * empty map if everything is ok, null otherwise. * * @author Martin Man <Martin.Man@seznam.cz> - * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:21 $ + * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:25 $ */ public class SessionInvalidatorAction extends AbstractAction { @@ -50,5 +49,5 @@ } } -// $Id: SessionInvalidatorAction.java,v 1.3 2001/06/05 21:36:21 dims Exp $ +// $Id: SessionInvalidatorAction.java,v 1.3.2.1 2001/08/20 14:07:25 dims Exp $ // vim: set et ts=4 sw=4: 1.1.2.2 +4 -9 xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java Index: SessionIsValidAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- SessionIsValidAction.java 2001/07/13 13:37:45 1.1.2.1 +++ SessionIsValidAction.java 2001/08/20 14:07:25 1.1.2.2 @@ -7,20 +7,15 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.acting.ValidatorActionHelper; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.util.Tokenizer; -import org.apache.log.Logger; + +import java.util.HashMap; +import java.util.Map; /** @@ -28,7 +23,7 @@ * seesion is still valid. * * @author Christian Haul - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/13 13:37:45 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:25 $ */ public class SessionIsValidAction extends AbstractValidatorAction 1.3.2.2 +8 -10 xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java Index: SessionPropagatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- SessionPropagatorAction.java 2001/07/23 16:31:25 1.3.2.1 +++ SessionPropagatorAction.java 2001/08/20 14:07:25 1.3.2.2 @@ -1,20 +1,18 @@ -// $Id: SessionPropagatorAction.java,v 1.3.2.1 2001/07/23 16:31:25 haul Exp $ +// $Id: SessionPropagatorAction.java,v 1.3.2.2 2001/08/20 14:07:25 dims Exp $ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; -import org.apache.log.Logger; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * This is the action used to propagate parameters into session. It @@ -30,7 +28,7 @@ * * * @author Martin Man <Martin.Man@seznam.cz> - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/23 16:31:25 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:25 $ */ public class SessionPropagatorAction extends AbstractConfigurableAction { @@ -116,6 +114,6 @@ } } -// $Id: SessionPropagatorAction.java,v 1.3.2.1 2001/07/23 16:31:25 haul Exp $ +// $Id: SessionPropagatorAction.java,v 1.3.2.2 2001/08/20 14:07:25 dims Exp $ // vim: set et ts=4 sw=4: 1.1.2.3 +6 -7 xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java Index: SessionStateAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SessionStateAction.java 2001/07/23 16:31:29 1.1.2.2 +++ SessionStateAction.java 2001/08/20 14:07:25 1.1.2.3 @@ -7,19 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.acting; -import java.util.Map; -import java.util.HashMap; - -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; - +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; +import java.util.HashMap; +import java.util.Map; + /** * Store the session's current state in a session attribute. * @@ -69,7 +68,7 @@ * @see org.apache.cocoon.selection.SessionStateSelectorFactory * * @author Christian Haul - * @version CVS $Id: SessionStateAction.java,v 1.1.2.2 2001/07/23 16:31:29 haul Exp $ */ + * @version CVS $Id: SessionStateAction.java,v 1.1.2.3 2001/08/20 14:07:25 dims Exp $ */ public class SessionStateAction extends AbstractConfigurableAction { private static String componentName = "REZEPTE SessionStateAction"; 1.3.2.6 +7 -9 xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java Index: SessionValidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -r1.3.2.5 -r1.3.2.6 --- SessionValidatorAction.java 2001/08/15 12:32:49 1.3.2.5 +++ SessionValidatorAction.java 2001/08/20 14:07:25 1.3.2.6 @@ -1,20 +1,18 @@ -// $Id: SessionValidatorAction.java,v 1.3.2.5 2001/08/15 12:32:49 dims Exp $ +// $Id: SessionValidatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ package org.apache.cocoon.acting; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.acting.ValidatorActionHelper; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.Tokenizer; -import org.apache.log.Logger; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** @@ -53,7 +51,7 @@ * all validated parameters to the sitemap via {name} expression. * * @author Martin Man <Martin.Man@seznam.cz> - * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/08/15 12:32:49 $ + * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/08/20 14:07:25 $ */ public class SessionValidatorAction extends AbstractValidatorAction { @@ -198,5 +196,5 @@ } } -// $Id: SessionValidatorAction.java,v 1.3.2.5 2001/08/15 12:32:49 dims Exp $ +// $Id: SessionValidatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ // vim: set et ts=4 sw=4: 1.1.2.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/acting/ValidatorActionHelper.java Index: ValidatorActionHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ValidatorActionHelper.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- ValidatorActionHelper.java 2001/07/13 13:37:53 1.1.2.2 +++ ValidatorActionHelper.java 2001/08/20 14:07:25 1.1.2.3 @@ -1,13 +1,13 @@ package org.apache.cocoon.acting; -import org.apache.cocoon.acting.ValidatorActionResult; + /** * Helper class to pass a the result of a validation back along with * the validated object itself. * * @author Christian Haul <haul@informatik.tu-darmstadt.de> - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/13 13:37:53 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:25 $ */ public class ValidatorActionHelper No revision No revision 1.1.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/AggregatedCacheValidity.java Index: AggregatedCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/AggregatedCacheValidity.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- AggregatedCacheValidity.java 2001/05/25 16:13:38 1.1 +++ AggregatedCacheValidity.java 2001/08/20 14:07:26 1.1.2.1 @@ -7,15 +7,15 @@ *****************************************************************************/ package org.apache.cocoon.caching; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; /** * A validation object using a List. * * @author Davanum Srinivas - * @version CVS $Revision: 1.1 $ $Date: 2001/05/25 16:13:38 $ + * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public final class AggregatedCacheValidity implements CacheValidity { 1.1.1.1.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java Index: CompositeCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CompositeCacheValidity.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- CompositeCacheValidity.java 2001/05/09 20:50:03 1.1.1.1 +++ CompositeCacheValidity.java 2001/08/20 14:07:26 1.1.1.1.2.1 @@ -7,13 +7,13 @@ *****************************************************************************/ package org.apache.cocoon.caching; -import java.util.HashMap; + /** * A validation object using a Hashmap. * * @author Davanum Srinivas - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:50:03 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public final class CompositeCacheValidity implements CacheValidity { 1.2.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java Index: PipelineCacheKey.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- PipelineCacheKey.java 2001/05/31 17:37:43 1.2 +++ PipelineCacheKey.java 2001/08/20 14:07:26 1.2.2.1 @@ -7,15 +7,15 @@ *****************************************************************************/ package org.apache.cocoon.caching; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * This is the cache key for one pipeline. It consists of one * or more ComponentCacheKey objects. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:43 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public final class PipelineCacheKey { No revision No revision 1.2.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java Index: Browser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- Browser.java 2001/07/07 19:07:44 1.2.2.1 +++ Browser.java 2001/08/20 14:07:26 1.2.2.2 @@ -8,13 +8,14 @@ package org.apache.cocoon.components.browser; import org.apache.avalon.framework.component.Component; -import java.util.HashMap; import org.w3c.dom.Document; +import java.util.HashMap; + /** * * @author Davanum Srinivas - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/07 19:07:44 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public interface Browser extends Component { No revision No revision 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java Index: ClassLoaderManager.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManager.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ClassLoaderManager.java 2001/07/07 19:07:47 1.1.1.1.2.1 +++ ClassLoaderManager.java 2001/08/20 14:07:26 1.1.1.1.2.2 @@ -7,9 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.components.classloader; +import org.apache.avalon.framework.component.Component; + import java.io.File; import java.io.IOException; -import org.apache.avalon.framework.component.Component; /** * A class loader manager acting as a proxy for a single @@ -18,7 +19,7 @@ * that it can be safely reinstantiated for dynamic class reloading * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/07 19:07:47 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public interface ClassLoaderManager extends Component { 1.2.2.2 +5 -7 xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java Index: ClassLoaderManagerImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- ClassLoaderManagerImpl.java 2001/08/09 21:12:43 1.2.2.1 +++ ClassLoaderManagerImpl.java 2001/08/20 14:07:26 1.2.2.2 @@ -7,22 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.classloader; +import org.apache.avalon.framework.thread.ThreadSafe; + import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Set; -import java.util.HashSet; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import java.util.Vector; -import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.util.ClassUtils; /** * A singleton-like implementation of ClassLoaderManager * * @author Ricardo Rocha - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/09 21:12:43 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe { /** 1.1.1.1.2.1 +5 -6 xml-cocoon2/src/org/apache/cocoon/components/classloader/RepositoryClassLoader.java Index: RepositoryClassLoader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/RepositoryClassLoader.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- RepositoryClassLoader.java 2001/05/09 20:49:49 1.1.1.1 +++ RepositoryClassLoader.java 2001/08/20 14:07:26 1.1.1.1.2.1 @@ -7,6 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.components.classloader; +import org.apache.avalon.framework.logger.Loggable; +import org.apache.cocoon.util.ClassUtils; +import org.apache.log.Logger; + import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -14,11 +18,6 @@ import java.net.URLClassLoader; import java.util.Iterator; import java.util.Vector; -import org.apache.avalon.framework.logger.Loggable; -import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.util.IOUtils; -import org.apache.cocoon.util.NetUtils; -import org.apache.log.Logger; /** * A class loader with a growable list of path search directories. @@ -28,7 +27,7 @@ * * @author Ricardo Rocha * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:49 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public class RepositoryClassLoader extends URLClassLoader implements Loggable { No revision No revision 1.1.2.2 +5 -4 xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngine.java Index: JSPEngine.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngine.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- JSPEngine.java 2001/07/16 13:23:34 1.1.2.1 +++ JSPEngine.java 2001/08/20 14:07:26 1.1.2.2 @@ -7,19 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.jsp; -import java.io.IOException; +import org.apache.avalon.framework.component.Component; +import org.xml.sax.SAXException; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.avalon.framework.component.Component; -import org.xml.sax.SAXException; +import java.io.IOException; /** * A component for loading and running JSP. * * @author Davanum Srinivas - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/16 13:23:34 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public interface JSPEngine extends Component { 1.1.2.2 +21 -30 xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java Index: JSPEngineImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- JSPEngineImpl.java 2001/07/16 13:23:34 1.1.2.1 +++ JSPEngineImpl.java 2001/08/20 14:07:26 1.1.2.2 @@ -7,29 +7,7 @@ *****************************************************************************/ package org.apache.cocoon.components.jsp; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.OutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.PrintWriter; -import java.security.Principal; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; 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; @@ -42,22 +20,35 @@ import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.parser.Parser; -import org.apache.cocoon.environment.http.HttpEnvironment; -import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.XMLProducer; -import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.log.Logger; -import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; + /** * Allows JSP to be used as a generator. Builds upon the JSP servlet * functionality - overrides the output method and returns the byte(s). * * @author Davanum Srinivas - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/16 13:23:34 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public class JSPEngineImpl extends AbstractLoggable implements JSPEngine, Contextualizable, Composable, Configurable, ThreadSafe, Disposable { No revision No revision 1.1.1.1.2.8 +9 -10 xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java Index: GeneratorSelector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v retrieving revision 1.1.1.1.2.7 retrieving revision 1.1.1.1.2.8 diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8 --- GeneratorSelector.java 2001/08/16 01:27:23 1.1.1.1.2.7 +++ GeneratorSelector.java 2001/08/20 14:07:26 1.1.1.1.2.8 @@ -7,32 +7,31 @@ *****************************************************************************/ package org.apache.cocoon.components.language.generator; -import java.io.File; +import org.apache.avalon.excalibur.component.ComponentHandler; +import org.apache.avalon.excalibur.component.ExcaliburComponentSelector; +import org.apache.avalon.excalibur.component.RoleManager; import org.apache.avalon.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.context.Context; import org.apache.avalon.framework.configuration.DefaultConfiguration; +import org.apache.avalon.framework.context.Context; import org.apache.cocoon.Constants; import org.apache.cocoon.components.classloader.ClassLoaderManager; -import org.apache.cocoon.util.ClassUtils; -import org.apache.avalon.excalibur.component.ExcaliburComponentSelector; -import org.apache.avalon.excalibur.component.ComponentHandler; -import org.apache.avalon.excalibur.component.RoleManager; -import java.util.Map; -import java.util.HashMap; -import java.util.List; +import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * This interface is the common base of all Compiled Components. This * includes Sitemaps and XSP Pages * * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1.2.7 $ $Date: 2001/08/16 01:27:23 $ + * @version CVS $Revision: 1.1.1.1.2.8 $ $Date: 2001/08/20 14:07:26 $ */ public class GeneratorSelector extends ExcaliburComponentSelector implements Disposable { 1.3.2.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java Index: ProgramGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGenerator.java,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- ProgramGenerator.java 2001/07/07 19:07:48 1.3.2.2 +++ ProgramGenerator.java 2001/08/20 14:07:26 1.3.2.3 @@ -7,7 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.language.generator; -import java.io.File; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; import org.apache.cocoon.environment.SourceResolver; @@ -17,7 +16,7 @@ * documents writeen in a MarkupLanguage * * @author Ricardo Rocha - * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/07/07 19:07:48 $ + * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/08/20 14:07:26 $ */ public interface ProgramGenerator extends Component { 1.5.2.13 +5 -12 xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java Index: ProgramGeneratorImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v retrieving revision 1.5.2.12 retrieving revision 1.5.2.13 diff -u -r1.5.2.12 -r1.5.2.13 --- ProgramGeneratorImpl.java 2001/08/11 16:45:21 1.5.2.12 +++ ProgramGeneratorImpl.java 2001/08/20 14:07:26 1.5.2.13 @@ -8,11 +8,6 @@ package org.apache.cocoon.components.language.generator; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.net.MalformedURLException; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; @@ -37,20 +32,18 @@ import org.apache.cocoon.components.language.programming.CodeFormatter; import org.apache.cocoon.components.language.programming.ProgrammingLanguage; import org.apache.cocoon.components.store.Store; -import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.environment.Source; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.IOUtils; -import org.apache.log.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; + +import java.io.File; +import java.net.MalformedURLException; /** * The default implementation of ProgramGenerator * @author Ricardo Rocha - * @version CVS $Revision: 1.5.2.12 $ $Date: 2001/08/11 16:45:21 $ + * @version CVS $Revision: 1.5.2.13 $ $Date: 2001/08/20 14:07:26 $ */ public class ProgramGeneratorImpl extends AbstractLoggable implements ProgramGenerator, Contextualizable, Composable, Configurable, ThreadSafe, Disposable { No revision No revision 1.4.2.3 +16 -17 xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java Index: AbstractMarkupLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- AbstractMarkupLanguage.java 2001/07/23 13:50:19 1.4.2.2 +++ AbstractMarkupLanguage.java 2001/08/20 14:07:26 1.4.2.3 @@ -8,20 +8,6 @@ package org.apache.cocoon.components.language.markup; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Vector; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; @@ -31,13 +17,13 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.language.programming.ProgrammingLanguage; import org.apache.cocoon.components.store.Store; import org.apache.cocoon.components.url.URLFactory; -import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.environment.Source; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.IOUtils; -import org.apache.cocoon.ProcessingException; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -46,12 +32,25 @@ import org.xml.sax.helpers.XMLFilterImpl; import org.xml.sax.helpers.XMLReaderFactory; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Date; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; + /** * Base implementation of MarkupLanguage. This class uses * logicsheets as the only means of code generation. Code generation should be decoupled from this context!!! * @author Ricardo Rocha * @author Davanum Srinivas - * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/07/23 13:50:19 $ + * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/08/20 14:07:26 $ */ public abstract class AbstractMarkupLanguage extends AbstractLoggable implements MarkupLanguage, Composable, Configurable { /** The supported language table */ 1.3.2.1 +10 -22 xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java Index: Logicsheet.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- Logicsheet.java 2001/05/31 17:37:53 1.3 +++ Logicsheet.java 2001/08/20 14:07:26 1.3.2.1 @@ -8,35 +8,23 @@ package org.apache.cocoon.components.language.markup; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.HashMap; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import javax.xml.transform.Templates; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.cocoon.util.TraxErrorHandler; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.DTDHandler; -import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLFilter; import org.xml.sax.XMLReader; -import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; -import org.xml.sax.helpers.XMLReaderFactory; + +import javax.xml.transform.Templates; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /** * A code-generation logicsheet. This class is actually a wrapper for @@ -46,7 +34,7 @@ * transformed into an equivalent XSLT stylesheet anyway... This class should probably be based on an interface... * @author Ricardo Rocha * @author Davanum Srinivas - * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:37:53 $ + * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public class Logicsheet extends AbstractLoggable { /** The trax TransformerFactory */ 1.2.2.1 +9 -13 xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java Index: LogicsheetCodeGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- LogicsheetCodeGenerator.java 2001/05/31 17:37:54 1.2 +++ LogicsheetCodeGenerator.java 2001/08/20 14:07:26 1.2.2.1 @@ -7,32 +7,28 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup; -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; +import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.cocoon.util.TraxErrorHandler; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + import javax.xml.transform.OutputKeys; import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXResult; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.util.TraxErrorHandler; -import org.apache.log.Logger; -import org.xml.sax.ContentHandler; -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; +import java.io.StringWriter; +import java.util.Properties; /** * A logicsheet-based implementation of MarkupCodeGenerator * * @author Ricardo Rocha * @author Davanum Srinivas - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:54 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public class LogicsheetCodeGenerator extends AbstractLoggable implements MarkupCodeGenerator { 1.1.1.1.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java Index: MarkupCodeGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- MarkupCodeGenerator.java 2001/05/09 20:49:50 1.1.1.1 +++ MarkupCodeGenerator.java 2001/08/20 14:07:26 1.1.1.1.2.1 @@ -7,14 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup; -import org.xml.sax.XMLReader; import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; /** * This interfaces defines the functionality of a source code generator * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:50 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public interface MarkupCodeGenerator { /** 1.2.2.2 +1 -2 xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java Index: MarkupLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/MarkupLanguage.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- MarkupLanguage.java 2001/07/07 19:07:50 1.2.2.1 +++ MarkupLanguage.java 2001/08/20 14:07:26 1.2.2.2 @@ -11,7 +11,6 @@ import org.apache.cocoon.components.language.programming.ProgrammingLanguage; import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; /** * This interface defines a markup language whose SAX producer's instance are to @@ -19,7 +18,7 @@ * document augmenting it with dynamic content * * @author Ricardo Rocha - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/07 19:07:50 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:26 $ */ public interface MarkupLanguage extends Component { 1.1.1.1.2.1 +2 -4 xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java Index: NamedLogicsheet.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- NamedLogicsheet.java 2001/05/09 20:49:50 1.1.1.1 +++ NamedLogicsheet.java 2001/08/20 14:07:26 1.1.1.1.2.1 @@ -7,10 +7,8 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup; -import java.io.IOException; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; + /** * An extension to Logicsheet that is associated with a namespace. * Named logicsheets are implicitly declared (and automagically applied) when @@ -18,7 +16,7 @@ * namespace * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:50 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:26 $ */ public class NamedLogicsheet extends Logicsheet { /** No revision No revision 1.2.2.2 +11 -12 xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java Index: SitemapMarkupLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- SitemapMarkupLanguage.java 2001/07/23 13:50:19 1.2.2.1 +++ SitemapMarkupLanguage.java 2001/08/20 14:07:27 1.2.2.2 @@ -7,22 +7,12 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.sitemap; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.logger.Loggable; +import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage; import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator; import org.apache.cocoon.components.language.programming.ProgrammingLanguage; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.ProcessingException; import org.apache.log.Logger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -31,12 +21,21 @@ import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** * This class implements MarkupLanguage for Cocoon's * Sitemap. * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/23 13:50:19 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:27 $ */ public class SitemapMarkupLanguage extends AbstractMarkupLanguage { No revision No revision 1.2.2.5 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java Index: XSPCookieHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -r1.2.2.4 -r1.2.2.5 --- XSPCookieHelper.java 2001/08/17 14:28:56 1.2.2.4 +++ XSPCookieHelper.java 2001/08/20 14:07:27 1.2.2.5 @@ -39,16 +39,16 @@ package org.apache.cocoon.components.language.markup.xsp; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Map; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Response; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; + +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Map; public class XSPCookieHelper extends XSPObjectHelper { /** 1.1.2.8 +10 -20 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java Index: XSPFormValidatorHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- XSPFormValidatorHelper.java 2001/07/18 11:45:37 1.1.2.7 +++ XSPFormValidatorHelper.java 2001/08/20 14:07:27 1.1.2.8 @@ -7,37 +7,27 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import java.util.Map; -import java.util.HashMap; -import java.net.URL; - +import org.apache.avalon.framework.component.Component; +import org.apache.avalon.framework.component.ComponentManager; +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.configuration.SAXConfigurationHandler; import org.apache.cocoon.Constants; -import org.apache.cocoon.acting.ValidatorActionResult; import org.apache.cocoon.acting.ConfigurationHelper; -import org.apache.cocoon.components.language.markup.xsp.XSPObjectHelper; +import org.apache.cocoon.acting.ValidatorActionResult; import org.apache.cocoon.components.source.SourceHandler; -import org.apache.cocoon.components.source.URLSource; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Source; - -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.InputSource; -import org.xml.sax.helpers.AttributesImpl; - -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.configuration.SAXConfigurationHandler; -import org.apache.avalon.framework.component.ComponentManager; - import org.apache.log.Logger; +import java.util.HashMap; +import java.util.Map; + /** * The ValidatorActionResult object helper * * @author Christian Haul - * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/07/18 11:45:37 $ + * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/08/20 14:07:27 $ */ public class XSPFormValidatorHelper { /** 1.2.2.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java Index: XSPGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -r1.2.2.3 -r1.2.2.4 --- XSPGenerator.java 2001/07/07 19:07:52 1.2.2.3 +++ XSPGenerator.java 2001/08/20 14:07:27 1.2.2.4 @@ -7,20 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import org.apache.avalon.framework.component.ComponentManager; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.ComponentException; +import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.generation.AbstractServerPage; -import org.apache.avalon.excalibur.pool.Recyclable; /** * Base class for XSP-generated ServerPagesGenerator classes * * @author Ricardo Rocha - * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/07/07 19:07:52 $ + * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/08/20 14:07:27 $ */ public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable { protected Context avalonContext = null; 1.2.2.2 +12 -12 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java Index: XSPMarkupLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- XSPMarkupLanguage.java 2001/07/23 13:50:19 1.2.2.1 +++ XSPMarkupLanguage.java 2001/08/20 14:07:27 1.2.2.2 @@ -7,37 +7,37 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.Stack; import org.apache.avalon.framework.logger.Loggable; import org.apache.cocoon.Constants; +import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage; import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator; import org.apache.cocoon.components.language.programming.ProgrammingLanguage; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.ProcessingException; import org.apache.log.Logger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.XMLFilter; -import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.Stack; + /** * This class implements MarkupLanguage for Cocoon's * XSP. * * @author Ricardo Rocha * @author Sebastien Sahuc - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/23 13:50:19 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:27 $ */ public class XSPMarkupLanguage extends AbstractMarkupLanguage { 1.1.1.1.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java Index: XSPObjectHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- XSPObjectHelper.java 2001/06/14 15:11:34 1.1.1.1.2.1 +++ XSPObjectHelper.java 2001/08/20 14:07:27 1.1.1.1.2.2 @@ -7,8 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import java.util.Collection; -import java.util.Iterator; import org.apache.cocoon.xml.XMLFragment; import org.apache.cocoon.xml.dom.DOMStreamer; import org.w3c.dom.Node; @@ -16,13 +14,16 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.util.Collection; +import java.util.Iterator; + /** * Base class for XSP's object model manipulation logicsheets * * @author Ricardo Rocha * @author Sylvain Wallez * (Cocoon1 xspExpr() methods port) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/14 15:11:34 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:27 $ */ public class XSPObjectHelper { /** 1.5.2.3 +6 -5 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java Index: XSPRequestHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -r1.5.2.2 -r1.5.2.3 --- XSPRequestHelper.java 2001/06/14 15:16:58 1.5.2.2 +++ XSPRequestHelper.java 2001/08/20 14:07:27 1.5.2.3 @@ -7,10 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import java.util.Enumeration; -import java.util.Map; -import java.util.ArrayList; -import java.util.List; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; @@ -18,11 +14,16 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; + /** * The Request object helper * * @author Ricardo Rocha - * @version CVS $Revision: 1.5.2.2 $ $Date: 2001/06/14 15:16:58 $ + * @version CVS $Revision: 1.5.2.3 $ $Date: 2001/08/20 14:07:27 $ */ public class XSPRequestHelper { /** 1.1.1.1.2.2 +3 -7 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java Index: XSPResponseHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- XSPResponseHelper.java 2001/06/14 15:11:35 1.1.1.1.2.1 +++ XSPResponseHelper.java 2001/08/20 14:07:27 1.1.1.1.2.2 @@ -7,20 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; -import java.io.IOException; -import java.util.Enumeration; -import java.util.Map; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Response; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; + +import java.util.Map; /** * The XSP Response object helper * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/14 15:11:35 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:27 $ */ public class XSPResponseHelper { /** 1.2.2.3 +13 -18 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java Index: XSPUtil.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- XSPUtil.java 2001/07/18 17:35:47 1.2.2.2 +++ XSPUtil.java 2001/08/20 14:07:27 1.2.2.3 @@ -7,6 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.components.language.markup.xsp; +import org.apache.cocoon.Constants; +import org.apache.cocoon.components.parser.Parser; +import org.apache.cocoon.components.url.URLFactory; +import org.apache.cocoon.environment.Context; +import org.apache.cocoon.environment.Session; +import org.apache.cocoon.util.NetUtils; +import org.apache.cocoon.util.Tokenizer; +import org.apache.cocoon.xml.IncludeXMLConsumer; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.File; @@ -16,32 +28,15 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.components.parser.Parser; -import org.apache.cocoon.components.url.URLFactory; -import org.apache.cocoon.environment.Context; -import org.apache.cocoon.environment.Session; -import org.apache.cocoon.util.IOUtils; -import org.apache.cocoon.util.NetUtils; -import org.apache.cocoon.util.Tokenizer; -import org.apache.cocoon.xml.AbstractXMLConsumer; -import org.apache.cocoon.xml.IncludeXMLConsumer; -import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.dom.DOMBuilder; -import org.xml.sax.ContentHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * The XSP Utility object helper * @author Ricardo Rocha * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:56 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:27 $ */ public abstract class AbstractProgrammingLanguage extends AbstractLoggable implements ProgrammingLanguage, Configurable 1.1.1.1.2.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java Index: CompiledProgrammingLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- CompiledProgrammingLanguage.java 2001/07/16 08:21:44 1.1.1.1.2.3 +++ CompiledProgrammingLanguage.java 2001/08/20 14:07:27 1.1.1.1.2.4 @@ -7,8 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.language.programming; -import java.io.File; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; @@ -18,11 +16,13 @@ import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.IOUtils; +import java.io.File; + /** * A compiled programming language. This class extends AbstractProgrammingLanguage adding support for compilation * and object program files * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/07/16 08:21:44 $ + * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/08/20 14:07:27 $ */ public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Contextualizable { /** The compiler */ 1.1.1.1.2.1 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java Index: LanguageCompiler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/LanguageCompiler.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- LanguageCompiler.java 2001/05/09 20:49:56 1.1.1.1 +++ LanguageCompiler.java 2001/08/20 14:07:27 1.1.1.1.2.1 @@ -8,15 +8,16 @@ package org.apache.cocoon.components.language.programming; +import org.apache.avalon.framework.component.Component; + import java.io.IOException; import java.util.List; -import org.apache.avalon.framework.component.Component; /** * This interface defines a compiler's functionality for all * (Java-based) compiled languages * @author Stefano Mazzocchi - * @version $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:56 $ + * @version $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:27 $ * @since 2.0 */ public interface LanguageCompiler extends Component { 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java Index: ProgrammingLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ProgrammingLanguage.java 2001/07/07 19:07:58 1.1.1.1.2.1 +++ ProgrammingLanguage.java 2001/08/20 14:07:27 1.1.1.1.2.2 @@ -7,16 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.components.language.programming; -import java.io.File; import org.apache.avalon.framework.component.Component; import org.apache.cocoon.components.language.LanguageException; import org.apache.cocoon.components.language.generator.CompiledComponent; +import java.io.File; + /** * This interface states the functionality of a programming language processor * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/07 19:07:58 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:27 $ */ public interface ProgrammingLanguage extends Component { No revision No revision 1.1.1.1.2.1 +5 -4 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java Index: AbstractJavaCompiler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- AbstractJavaCompiler.java 2001/05/09 20:49:56 1.1.1.1 +++ AbstractJavaCompiler.java 2001/08/20 14:07:27 1.1.1.1.2.1 @@ -8,19 +8,20 @@ package org.apache.cocoon.components.language.programming.java; +import org.apache.avalon.excalibur.pool.Recyclable; +import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.cocoon.components.language.programming.LanguageCompiler; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.components.language.programming.LanguageCompiler; -import org.apache.avalon.excalibur.pool.Recyclable; /** * This class implements the functionality common to all Java compilers. * @author Stefano Mazzocchi - * @version $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:56 $ + * @version $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:27 $ * @since 2.0 */ public abstract class AbstractJavaCompiler extends AbstractLoggable implements LanguageCompiler, Recyclable { 1.2.2.3 +5 -8 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java Index: JavaLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- JavaLanguage.java 2001/07/07 19:07:59 1.2.2.2 +++ JavaLanguage.java 2001/08/20 14:07:27 1.2.2.3 @@ -8,15 +8,10 @@ package org.apache.cocoon.components.language.programming.java; -import java.io.File; -import java.io.IOException; -import java.util.List; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.classloader.ClassLoaderManager; @@ -24,16 +19,18 @@ import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage; import org.apache.cocoon.components.language.programming.CompilerError; -import org.apache.cocoon.components.language.programming.LanguageCompiler; import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.JavaArchiveFilter; -import org.apache.log.Logger; + +import java.io.File; +import java.io.IOException; +import java.util.List; /** * The Java programming language processor * * @author Ricardo Rocha - * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/07/07 19:07:59 $ + * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/08/20 14:07:27 $ */ public class JavaLanguage extends CompiledProgrammingLanguage implements ThreadSafe, Composable, Disposable { 1.2.2.3 +5 -6 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java Index: Javac.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- Javac.java 2001/07/12 15:02:55 1.2.2.2 +++ Javac.java 2001/08/20 14:07:27 1.2.2.3 @@ -8,6 +8,10 @@ package org.apache.cocoon.components.language.programming.java; +import org.apache.cocoon.components.language.programming.CompilerError; +import org.apache.cocoon.util.ClassUtils; +import org.apache.log.Hierarchy; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,17 +20,12 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.apache.cocoon.components.language.programming.CompilerError; -import org.apache.cocoon.util.ClassUtils; -import org.apache.log.Hierarchy; -import org.apache.log.Logger; -import sun.tools.javac.Main; /** * This class wraps the Sun's Javac Compiler. * * @author Stefano Mazzocchi - * @version $Revision: 1.2.2.2 $ $Date: 2001/07/12 15:02:55 $ + * @version $Revision: 1.2.2.3 $ $Date: 2001/08/20 14:07:27 $ * @since 2.0 */ 1.1.1.1.2.5 +3 -4 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java Index: Jikes.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v retrieving revision 1.1.1.1.2.4 retrieving revision 1.1.1.1.2.5 diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 --- Jikes.java 2001/07/05 21:01:37 1.1.1.1.2.4 +++ Jikes.java 2001/08/20 14:07:27 1.1.1.1.2.5 @@ -8,6 +8,8 @@ package org.apache.cocoon.components.language.programming.java; +import org.apache.cocoon.components.language.programming.CompilerError; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -17,15 +19,12 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.components.language.programming.CompilerError; -import org.apache.log.Logger; /** * This class wraps IBM's Jikes Java compiler * NOTE: inspired by the Apache Jasper implementation. * @author Stefano Mazzocchi - * @version $Revision: 1.1.1.1.2.4 $ $Date: 2001/07/05 21:01:37 $ + * @version $Revision: 1.1.1.1.2.5 $ $Date: 2001/08/20 14:07:27 $ * @since 2.0 */ 1.1.1.1.2.1 +6 -6 xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java Index: JstyleFormatter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- JstyleFormatter.java 2001/05/09 20:49:57 1.1.1.1 +++ JstyleFormatter.java 2001/08/20 14:07:27 1.1.1.1.2.1 @@ -7,16 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.components.language.programming.java; +import jstyle.JSBeautifier; +import jstyle.JSFormatter; +import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.cocoon.components.language.programming.CodeFormatter; + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.io.StringReader; import java.io.UnsupportedEncodingException; -import jstyle.JSBeautifier; -import jstyle.JSFormatter; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.components.language.programming.CodeFormatter; -import org.apache.log.Logger; /** * This class implements CodeFormatter based on @@ -24,7 +24,7 @@ * beautifier. This implementation is very improvised... * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:57 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:27 $ */ public class JstyleFormatter extends AbstractLoggable implements CodeFormatter { /** No revision No revision 1.1.1.1.2.1 +3 -5 xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java Index: JavascriptLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/javascript/JavascriptLanguage.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- JavascriptLanguage.java 2001/05/09 20:49:57 1.1.1.1 +++ JavascriptLanguage.java 2001/08/20 14:07:28 1.1.1.1.2.1 @@ -7,19 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.components.language.programming.javascript; -import java.io.File; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.cocoon.components.language.LanguageException; -import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage; import org.apache.cocoon.components.language.programming.java.JavaLanguage; -import org.apache.log.Logger; import org.mozilla.javascript.tools.jsc.Main; +import java.io.File; + /** * The compiled Javascript (Rhino) programming language processor * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:57 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:28 $ */ public class JavascriptLanguage extends JavaLanguage { No revision No revision 1.3.2.2 +9 -9 xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java Index: JaxpParser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/JaxpParser.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- JaxpParser.java 2001/07/30 10:50:37 1.3.2.1 +++ JaxpParser.java 2001/08/20 14:07:28 1.3.2.2 @@ -7,15 +7,9 @@ *****************************************************************************/ package org.apache.cocoon.components.parser; -import java.io.IOException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; +import org.apache.avalon.framework.thread.SingleThreaded; import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.dom.DOMFactory; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; @@ -23,14 +17,20 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; -import org.apache.avalon.framework.thread.SingleThreaded; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.IOException; /** * An XMLParser that is only dependant on JAXP 1.1 compliant parsers. * If only we can get rid of the need for the Document... * * @author Berin Loritsch - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/30 10:50:37 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:28 $ */ public class JaxpParser extends AbstractXMLProducer implements Parser, ErrorHandler, SingleThreaded { 1.2.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java Index: Parser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/Parser.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- Parser.java 2001/07/07 19:08:00 1.2.2.1 +++ Parser.java 2001/08/20 14:07:28 1.2.2.2 @@ -7,21 +7,22 @@ *****************************************************************************/ package org.apache.cocoon.components.parser; -import java.io.IOException; import org.apache.avalon.framework.component.Component; import org.apache.cocoon.xml.XMLProducer; import org.apache.cocoon.xml.dom.DOMFactory; import org.w3c.dom.Document; +import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.xml.sax.ContentHandler; import org.xml.sax.ext.LexicalHandler; +import java.io.IOException; + /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/07 19:08:00 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:28 $ */ public interface Parser extends Component, XMLProducer, DOMFactory { 1.1.2.1 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/parser/XercesParser.java Index: XercesParser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/parser/XercesParser.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- XercesParser.java 2001/05/11 13:45:09 1.1 +++ XercesParser.java 2001/08/20 14:07:28 1.1.2.1 @@ -7,25 +7,25 @@ *****************************************************************************/ package org.apache.cocoon.components.parser; -import java.io.IOException; import org.apache.avalon.framework.thread.SingleThreaded; import org.apache.cocoon.xml.AbstractXMLProducer; import org.apache.xerces.dom.DocumentImpl; import org.apache.xerces.dom.DocumentTypeImpl; import org.apache.xerces.parsers.DOMParser; import org.apache.xerces.parsers.SAXParser; +import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; -import org.w3c.dom.Document; + +import java.io.IOException; /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1 $ $Date: 2001/05/11 13:45:09 $ + * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/20 14:07:28 $ */ public class XercesParser extends AbstractXMLProducer implements Parser, ErrorHandler, SingleThreaded { No revision No revision 1.5.2.9 +5 -5 xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java Index: AbstractEventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v retrieving revision 1.5.2.8 retrieving revision 1.5.2.9 diff -u -r1.5.2.8 -r1.5.2.9 --- AbstractEventPipeline.java 2001/07/19 14:56:20 1.5.2.8 +++ AbstractEventPipeline.java 2001/08/20 14:07:28 1.5.2.9 @@ -7,15 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; 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.cocoon.ProcessingException; import org.apache.cocoon.components.saxconnector.SAXConnector; @@ -28,10 +24,14 @@ import org.apache.cocoon.xml.XMLProducer; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; + /** * @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Revision: 1.5.2.8 $ $Date: 2001/07/19 14:56:20 $ + * @version CVS $Revision: 1.5.2.9 $ $Date: 2001/08/20 14:07:28 $ */ public abstract class AbstractEventPipeline extends AbstractXMLProducer 1.3.2.8 +3 -8 xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java Index: AbstractStreamPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -u -r1.3.2.7 -r1.3.2.8 --- AbstractStreamPipeline.java 2001/08/05 16:34:47 1.3.2.7 +++ AbstractStreamPipeline.java 2001/08/20 14:07:28 1.3.2.8 @@ -7,15 +7,9 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; 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.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; @@ -23,9 +17,10 @@ import org.apache.cocoon.reading.Reader; import org.apache.cocoon.serialization.Serializer; import org.apache.cocoon.sitemap.SitemapComponentSelector; -import org.apache.cocoon.xml.XMLConsumer; import org.apache.cocoon.xml.XMLProducer; +import java.io.ByteArrayOutputStream; + /** A ResourcePipeline either *
    *
  • collects a Reader and let it process
    • @@ -35,7 +30,7 @@ *
* @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/05 16:34:47 $ + * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/08/20 14:07:28 $ */ public abstract class AbstractStreamPipeline extends AbstractLoggable implements StreamPipeline, Disposable { protected EventPipeline eventPipeline; 1.2.2.1 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/pipeline/CacheableEventPipeline.java Index: CacheableEventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CacheableEventPipeline.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- CacheableEventPipeline.java 2001/05/15 07:51:23 1.2 +++ CacheableEventPipeline.java 2001/08/20 14:07:28 1.2.2.1 @@ -7,16 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.util.Map; import org.apache.cocoon.caching.PipelineCacheKey; import org.apache.cocoon.environment.Environment; +import java.util.Map; + /** * This marker interface declares an EventPipeline as cacheable. * * * @author Carsten Ziegeler - * @version CVS $Revision: 1.2 $ $Date: 2001/05/15 07:51:23 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:28 $ */ public interface CacheableEventPipeline { 1.7.2.11 +8 -13 xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java Index: CachingEventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v retrieving revision 1.7.2.10 retrieving revision 1.7.2.11 diff -u -r1.7.2.10 -r1.7.2.11 --- CachingEventPipeline.java 2001/08/05 16:34:48 1.7.2.10 +++ CachingEventPipeline.java 2001/08/20 14:07:28 1.7.2.11 @@ -7,18 +7,12 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; @@ -31,16 +25,17 @@ import org.apache.cocoon.components.saxconnector.SAXConnector; import org.apache.cocoon.components.store.Store; import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.generation.Generator; -import org.apache.cocoon.sitemap.ErrorNotifier; import org.apache.cocoon.transformation.Transformer; -import org.apache.cocoon.xml.AbstractXMLProducer; import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.XMLMulticaster; -import org.apache.cocoon.xml.XMLPipe; import org.apache.cocoon.xml.XMLProducer; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * The CachingEventPipeline * @@ -50,7 +45,7 @@ * does not cache! (If it would cache, the response would be cached twice!) * * @author Carsten Ziegeler - * @version CVS $Revision: 1.7.2.10 $ $Date: 2001/08/05 16:34:48 $ + * @version CVS $Revision: 1.7.2.11 $ $Date: 2001/08/20 14:07:28 $ */ public class CachingEventPipeline extends AbstractEventPipeline 1.3.2.10 +10 -9 xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java Index: CachingStreamPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v retrieving revision 1.3.2.9 retrieving revision 1.3.2.10 diff -u -r1.3.2.9 -r1.3.2.10 --- CachingStreamPipeline.java 2001/08/07 10:56:25 1.3.2.9 +++ CachingStreamPipeline.java 2001/08/20 14:07:28 1.3.2.10 @@ -7,19 +7,12 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.SocketException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ConnectionResetException; +import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CachedStreamObject; @@ -30,6 +23,14 @@ import org.apache.cocoon.environment.Environment; import org.xml.sax.SAXException; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.SocketException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** A StreamPipeline either *
    *
  • collects a Reader and let it process
    • @@ -45,7 +46,7 @@ *
* * @author Carsten Ziegeler - * @version CVS $Revision: 1.3.2.9 $ $Date: 2001/08/07 10:56:25 $ + * @version CVS $Revision: 1.3.2.10 $ $Date: 2001/08/20 14:07:28 $ */ public class CachingStreamPipeline extends AbstractStreamPipeline { 1.2.2.6 +2 -3 xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java Index: EventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -u -r1.2.2.5 -r1.2.2.6 --- EventPipeline.java 2001/07/09 13:22:23 1.2.2.5 +++ EventPipeline.java 2001/08/20 14:07:28 1.2.2.6 @@ -7,17 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.generation.Generator; -import org.apache.cocoon.sitemap.Sitemap; -import org.apache.avalon.excalibur.pool.Recyclable; /** * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/07/09 13:22:23 $ + * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/08/20 14:07:28 $ */ public interface EventPipeline extends Component, Composable, Recyclable { 1.4.2.3 +1 -18 xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java Index: NonCachingEventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- NonCachingEventPipeline.java 2001/07/09 13:22:23 1.4.2.2 +++ NonCachingEventPipeline.java 2001/08/20 14:07:28 1.4.2.3 @@ -7,28 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.generation.Generator; -import org.apache.cocoon.sitemap.ErrorNotifier; -import org.apache.cocoon.transformation.Transformer; -import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.XMLProducer; -import org.xml.sax.SAXException; /** * @author Giacomo Pati - * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/07/09 13:22:23 $ + * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/08/20 14:07:28 $ */ public class NonCachingEventPipeline extends AbstractEventPipeline implements Recyclable { 1.1.1.1.2.1 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingStreamPipeline.java Index: NonCachingStreamPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingStreamPipeline.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- NonCachingStreamPipeline.java 2001/05/09 20:49:48 1.1.1.1 +++ NonCachingStreamPipeline.java 2001/08/20 14:07:28 1.1.1.1.2.1 @@ -7,10 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; -import java.io.IOException; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Environment; +import java.io.IOException; + /** A ResourcePipeline either *
    *
  • collects a Reader and let it process
    • @@ -19,7 +20,7 @@ * resource *
* @author Giacomo Pati - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:48 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:28 $ */ public final class NonCachingStreamPipeline extends AbstractStreamPipeline { 1.2.2.5 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java Index: StreamPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -r1.2.2.4 -r1.2.2.5 --- StreamPipeline.java 2001/07/09 13:22:23 1.2.2.4 +++ StreamPipeline.java 2001/08/20 14:07:28 1.2.2.5 @@ -7,10 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.components.pipeline; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.environment.Environment; /** A StreamPipeline either @@ -20,7 +20,7 @@ * Serializer and let them produce the character stream * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/07/09 13:22:23 $ + * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/08/20 14:07:28 $ */ public interface StreamPipeline extends Component, Composable, Recyclable { No revision No revision 1.1.1.1.2.2 +4 -6 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java Index: XMLByteStreamCompiler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- XMLByteStreamCompiler.java 2001/07/02 14:22:50 1.1.1.1.2.1 +++ XMLByteStreamCompiler.java 2001/08/20 14:07:29 1.1.1.1.2.2 @@ -7,22 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.sax; -import java.util.HashMap; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.excalibur.pool.Recyclable; +import org.apache.avalon.framework.component.Component; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.XMLReader; + +import java.util.HashMap; /** * This a simple xml compiler which outputs a byte array. * * @author Stefano Mazzocchi * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/02 14:22:50 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:29 $ */ public final class XMLByteStreamCompiler 1.4.2.1 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java Index: XMLByteStreamInterpreter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- XMLByteStreamInterpreter.java 2001/05/31 15:06:56 1.4 +++ XMLByteStreamInterpreter.java 2001/08/20 14:07:29 1.4.2.1 @@ -7,20 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.sax; -import java.util.ArrayList; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.Component; import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.avalon.excalibur.pool.Recyclable; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.util.ArrayList; + /** * This a simple xml compiler which takes a byte array as input. * * @author Stefano Mazzocchi * @author Carsten Ziegeler - * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 15:06:56 $ + * @version CVS $Revision: 1.4.2.1 $ $Date: 2001/08/20 14:07:29 $ */ public final class XMLByteStreamInterpreter 1.2.2.1 +1 -4 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLTeePipe.java Index: XMLTeePipe.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLTeePipe.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- XMLTeePipe.java 2001/05/29 06:13:46 1.2 +++ XMLTeePipe.java 2001/08/20 14:07:29 1.2.2.1 @@ -10,12 +10,9 @@ import org.apache.cocoon.xml.XMLConsumer; import org.apache.cocoon.xml.XMLPipe; import org.apache.cocoon.xml.XMLProducer; -import org.apache.avalon.excalibur.pool.Recyclable; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; /** @@ -23,7 +20,7 @@ * The incoming events are forwarded to two other components. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.2 $ $Date: 2001/05/29 06:13:46 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:29 $ */ public final class XMLTeePipe No revision No revision 1.1.2.3 +10 -12 xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java Index: LoggingSAXConnector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- LoggingSAXConnector.java 2001/06/21 06:54:27 1.1.2.2 +++ LoggingSAXConnector.java 2001/08/20 14:07:29 1.1.2.3 @@ -7,29 +7,27 @@ *****************************************************************************/ package org.apache.cocoon.components.saxconnector; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Map; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; -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.ProcessingException; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.xml.AbstractXMLPipe; -import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.stream.StreamResult; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Map; + /** * This SAX connector logs all intermediate sax streams to the log. * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/06/21 06:54:27 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:29 $ */ public class LoggingSAXConnector extends AbstractXMLPipe No revision No revision 1.1.2.4 +5 -4 xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java Index: CocoonSourceFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- CocoonSourceFactory.java 2001/08/16 11:25:21 1.1.2.3 +++ CocoonSourceFactory.java 2001/08/20 14:07:29 1.1.2.4 @@ -8,9 +8,6 @@ package org.apache.cocoon.components.source; -import java.io.IOException; -import java.net.URL; -import java.net.MalformedURLException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.cocoon.ProcessingException; @@ -18,13 +15,17 @@ import org.apache.cocoon.environment.Source; import org.apache.cocoon.sitemap.Sitemap; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + /** * This class implements the cocoon: protocol. * It cannot be configured like the other source factories * as it needs the current Sitemap as input. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/16 11:25:21 $ + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/08/20 14:07:29 $ */ public final class CocoonSourceFactory 1.1.2.14 +9 -15 xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java Index: SitemapSource.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -r1.1.2.13 -r1.1.2.14 --- SitemapSource.java 2001/08/16 11:25:21 1.1.2.13 +++ SitemapSource.java 2001/08/20 14:07:29 1.1.2.14 @@ -8,28 +8,15 @@ package org.apache.cocoon.components.source; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.Reader; -import java.net.URL; -import java.net.URLConnection; -import java.util.Map; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.cocoon.Constants; -import org.apache.cocoon.Processor; import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.Processor; import org.apache.cocoon.caching.PipelineCacheKey; import org.apache.cocoon.components.pipeline.CacheableEventPipeline; import org.apache.cocoon.components.pipeline.EventPipeline; import org.apache.cocoon.components.pipeline.StreamPipeline; -import org.apache.cocoon.components.source.SourceHandler; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Source; @@ -47,11 +34,18 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + /** * Description of a source which is defined by a pipeline. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/08/16 11:25:21 $ + * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/08/20 14:07:29 $ */ public final class SitemapSource 1.1.2.3 +5 -4 xml-cocoon2/src/org/apache/cocoon/components/source/SourceFactory.java Index: SourceFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SourceFactory.java 2001/07/04 10:10:56 1.1.2.2 +++ SourceFactory.java 2001/08/20 14:07:29 1.1.2.3 @@ -7,17 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.components.source; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Source; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + /** * @author Carsten Ziegeler - * @version $Id: SourceFactory.java,v 1.1.2.2 2001/07/04 10:10:56 cziegeler Exp $ + * @version $Id: SourceFactory.java,v 1.1.2.3 2001/08/20 14:07:29 dims Exp $ */ public interface SourceFactory extends ThreadSafe { 1.1.2.4 +5 -4 xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java Index: SourceHandler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandler.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- SourceHandler.java 2001/07/07 19:08:07 1.1.2.3 +++ SourceHandler.java 2001/08/20 14:07:29 1.1.2.4 @@ -7,17 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.components.source; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import org.apache.avalon.framework.component.Component; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Source; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + /** * @author Carsten Ziegeler - * @version $Id: SourceHandler.java,v 1.1.2.3 2001/07/07 19:08:07 giacomo Exp $ + * @version $Id: SourceHandler.java,v 1.1.2.4 2001/08/20 14:07:29 dims Exp $ */ public interface SourceHandler extends Component { 1.1.2.3 +8 -9 xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java Index: SourceHandlerImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SourceHandlerImpl.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SourceHandlerImpl.java 2001/07/07 19:08:07 1.1.2.2 +++ SourceHandlerImpl.java 2001/08/20 14:07:29 1.1.2.3 @@ -7,12 +7,6 @@ *****************************************************************************/ 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; @@ -26,17 +20,22 @@ 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.source.URLSource; 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 Carsten Ziegeler - * @version $Id: SourceHandlerImpl.java,v 1.1.2.2 2001/07/07 19:08:07 giacomo Exp $ + * @version $Id: SourceHandlerImpl.java,v 1.1.2.3 2001/08/20 14:07:29 dims Exp $ */ public final class SourceHandlerImpl extends AbstractLoggable 1.1.2.7 +9 -11 xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java Index: URLSource.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- URLSource.java 2001/07/16 07:43:05 1.1.2.6 +++ URLSource.java 2001/08/20 14:07:29 1.1.2.7 @@ -8,16 +8,6 @@ package org.apache.cocoon.components.source; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.Reader; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLConnection; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.cocoon.ProcessingException; @@ -28,11 +18,19 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLConnection; + /** * Description of a source which is described by an URL. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/07/16 07:43:05 $ + * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/08/20 14:07:29 $ */ public final class URLSource No revision No revision 1.1.1.1.2.3 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java Index: FilesystemStore.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- FilesystemStore.java 2001/07/13 20:49:09 1.1.1.1.2.2 +++ FilesystemStore.java 2001/08/20 14:07:29 1.1.1.1.2.3 @@ -7,9 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.store; -import java.io.File; -import java.io.IOException; -import java.util.Enumeration; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; @@ -17,6 +14,10 @@ import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.util.IOUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Enumeration; public class FilesystemStore extends AbstractLoggable implements Contextualizable, Store, ThreadSafe { /** The directory repository */ 1.2.2.8 +10 -15 xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java Index: MRUMemoryStore.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java,v retrieving revision 1.2.2.7 retrieving revision 1.2.2.8 diff -u -r1.2.2.7 -r1.2.2.8 --- MRUMemoryStore.java 2001/08/18 17:55:27 1.2.2.7 +++ MRUMemoryStore.java 2001/08/20 14:07:29 1.2.2.8 @@ -7,21 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.components.store; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.io.File; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Stack; -import java.util.StringTokenizer; -import java.util.Vector; - -import org.apache.cocoon.Constants; -import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.util.IOUtils; - -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; @@ -34,6 +19,16 @@ 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.Constants; +import org.apache.cocoon.util.ClassUtils; +import org.apache.cocoon.util.IOUtils; + +import java.io.File; +import java.net.URLEncoder; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Stack; /** * This class provides a cache algorithm for the requested documents. 1.1.1.1.2.1 +3 -3 xml-cocoon2/src/org/apache/cocoon/components/store/MemoryStore.java Index: MemoryStore.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/MemoryStore.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- MemoryStore.java 2001/05/09 20:50:01 1.1.1.1 +++ MemoryStore.java 2001/08/20 14:07:29 1.1.1.1.2.1 @@ -7,10 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.components.store; +import org.apache.avalon.framework.thread.ThreadSafe; + import java.util.Enumeration; import java.util.Hashtable; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.thread.ThreadSafe; /** * @@ -20,7 +20,7 @@ * (Apache Software Foundation) * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:50:01 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:29 $ */ public class MemoryStore implements Store, ThreadSafe { /* WARNING: Hashtable is threadsafe, whereas HashMap is not. 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/store/Store.java Index: Store.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/Store.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- Store.java 2001/07/07 19:08:10 1.1.1.1.2.1 +++ Store.java 2001/08/20 14:07:29 1.1.1.1.2.2 @@ -7,9 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.components.store; +import org.apache.avalon.framework.component.Component; + import java.io.IOException; import java.util.Enumeration; -import org.apache.avalon.framework.component.Component; /** * @@ -19,7 +20,7 @@ * (Apache Software Foundation) * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/07 19:08:10 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:29 $ */ public interface Store extends Component { No revision No revision 1.1.1.1.2.1 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java Index: ExtendableTranscoderFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- ExtendableTranscoderFactory.java 2001/05/09 20:50:01 1.1.1.1 +++ ExtendableTranscoderFactory.java 2001/08/20 14:07:30 1.1.1.1.2.1 @@ -7,19 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.components.transcoder; -import java.util.HashMap; -import java.util.Map; import org.apache.batik.transcoder.Transcoder; import org.apache.batik.transcoder.image.JPEGTranscoder; import org.apache.batik.transcoder.image.PNGTranscoder; +import java.util.HashMap; +import java.util.Map; + /** * An extendable Batik Transcoder factory. * When given a MIME type, find a Transcoder which supports that MIME * type. This factory is extendable as new Transcoders can * be added at runtime. * @author Ross Burton - * @version $Revision: 1.1.1.1 $, $Date: 2001/05/09 20:50:01 $ + * @version $Revision: 1.1.1.1.2.1 $, $Date: 2001/08/20 14:07:30 $ */ public class ExtendableTranscoderFactory implements TranscoderFactory { No revision No revision 1.1.1.1.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java Index: ContextURLFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ContextURLFactory.java 2001/06/21 19:35:06 1.1.1.1.2.1 +++ ContextURLFactory.java 2001/08/20 14:07:30 1.1.1.1.2.2 @@ -7,17 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.components.url; -import java.net.MalformedURLException; -import java.net.URL; 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.Constants; import org.apache.cocoon.environment.Context; +import java.net.MalformedURLException; +import java.net.URL; + /** * @author Giacomo Pati - * @version $Id: ContextURLFactory.java,v 1.1.1.1.2.1 2001/06/21 19:35:06 giacomo Exp $ + * @version $Id: ContextURLFactory.java,v 1.1.1.1.2.2 2001/08/20 14:07:30 dims Exp $ */ public class ContextURLFactory extends AbstractLoggable implements URLFactory, Contextualizable { 1.1.1.1.2.1 +4 -3 xml-cocoon2/src/org/apache/cocoon/components/url/ResourceURLFactory.java Index: ResourceURLFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ResourceURLFactory.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- ResourceURLFactory.java 2001/05/09 20:50:02 1.1.1.1 +++ ResourceURLFactory.java 2001/08/20 14:07:30 1.1.1.1.2.1 @@ -7,17 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.components.url; -import java.net.MalformedURLException; -import java.net.URL; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.cocoon.util.ClassUtils; +import java.net.MalformedURLException; +import java.net.URL; + /** * @author Giacomo Pati - * @version $Id: ResourceURLFactory.java,v 1.1.1.1 2001/05/09 20:50:02 giacomo Exp $ + * @version $Id: ResourceURLFactory.java,v 1.1.1.1.2.1 2001/08/20 14:07:30 dims Exp $ */ public class ResourceURLFactory extends AbstractLoggable implements URLFactory, Contextualizable { 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java Index: URLFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactory.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- URLFactory.java 2001/07/07 19:08:12 1.1.1.1.2.1 +++ URLFactory.java 2001/08/20 14:07:30 1.1.1.1.2.2 @@ -7,13 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.components.url; +import org.apache.avalon.framework.thread.ThreadSafe; + import java.net.MalformedURLException; import java.net.URL; -import org.apache.avalon.framework.thread.ThreadSafe; /** * @author Giacomo Pati - * @version $Id: URLFactory.java,v 1.1.1.1.2.1 2001/07/07 19:08:12 giacomo Exp $ + * @version $Id: URLFactory.java,v 1.1.1.1.2.2 2001/08/20 14:07:30 dims Exp $ */ public interface URLFactory extends ThreadSafe { 1.2.2.7 +8 -7 xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java Index: URLFactoryImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -u -r1.2.2.6 -r1.2.2.7 --- URLFactoryImpl.java 2001/08/05 16:56:36 1.2.2.6 +++ URLFactoryImpl.java 2001/08/20 14:07:30 1.2.2.7 @@ -7,12 +7,6 @@ *****************************************************************************/ 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.component.Component; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; @@ -26,10 +20,17 @@ import org.apache.cocoon.environment.http.HttpContext; 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; + /** * @author Giacomo Pati - * @version $Id: URLFactoryImpl.java,v 1.2.2.6 2001/08/05 16:56:36 vgritsenko Exp $ + * @version $Id: URLFactoryImpl.java,v 1.2.2.7 2001/08/20 14:07:30 dims Exp $ */ public class URLFactoryImpl extends AbstractLoggable implements URLFactory, Component, Configurable, Contextualizable { No revision No revision 1.6.2.10 +6 -7 xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java Index: AbstractEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -u -r1.6.2.9 -r1.6.2.10 --- AbstractEnvironment.java 2001/08/17 14:09:56 1.6.2.9 +++ AbstractEnvironment.java 2001/08/20 14:07:30 1.6.2.10 @@ -7,25 +7,24 @@ *****************************************************************************/ package org.apache.cocoon.environment; +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; import java.net.URL; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.components.source.SourceHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * Base class for any environment * * @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Revision: 1.6.2.9 $ $Date: 2001/08/17 14:09:56 $ + * @version CVS $Revision: 1.6.2.10 $ $Date: 2001/08/20 14:07:30 $ */ public abstract class AbstractEnvironment extends AbstractLoggable implements Environment { 1.2.2.7 +3 -4 xml-cocoon2/src/org/apache/cocoon/environment/Environment.java Index: Environment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Environment.java,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -u -r1.2.2.6 -r1.2.2.7 --- Environment.java 2001/08/17 14:09:56 1.2.2.6 +++ Environment.java 2001/08/20 14:07:30 1.2.2.7 @@ -8,20 +8,19 @@ package org.apache.cocoon.environment; +import org.apache.cocoon.components.source.SourceHandler; + import java.io.IOException; import java.io.OutputStream; -import java.net.MalformedURLException; import java.net.URL; import java.util.Map; -import org.apache.cocoon.components.source.SourceHandler; -import org.xml.sax.SAXException; /** * Base interface for an environment abstraction * * @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/08/17 14:09:56 $ + * @version CVS $Revision: 1.2.2.7 $ $Date: 2001/08/20 14:07:30 $ */ public interface Environment extends SourceResolver { 1.1.1.1.2.4 +2 -5 xml-cocoon2/src/org/apache/cocoon/environment/Request.java Index: Request.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Request.java,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- Request.java 2001/07/13 13:38:34 1.1.1.1.2.3 +++ Request.java 2001/08/20 14:07:30 1.1.1.1.2.4 @@ -7,13 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.environment; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; +import java.security.Principal; import java.util.Enumeration; import java.util.Locale; import java.util.Map; -import java.security.Principal; /** * Defines an interface to provide client request information . @@ -21,7 +18,7 @@ * @author Davanum Srinivas * @author Carsten Ziegeler * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/07/13 13:38:34 $ + * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/08/20 14:07:30 $ * */ 1.1.1.1.2.1 +1 -2 xml-cocoon2/src/org/apache/cocoon/environment/Response.java Index: Response.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Response.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- Response.java 2001/05/09 20:49:43 1.1.1.1 +++ Response.java 2001/08/20 14:07:30 1.1.1.1.2.1 @@ -7,7 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.environment; -import java.io.IOException; import java.util.Locale; /** @@ -15,7 +14,7 @@ * * @author Davanum Srinivas * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:43 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:30 $ * */ 1.6.2.3 +5 -10 xml-cocoon2/src/org/apache/cocoon/environment/Source.java Index: Source.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Source.java,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- Source.java 2001/07/06 09:58:37 1.6.2.2 +++ Source.java 2001/08/20 14:07:30 1.6.2.3 @@ -8,27 +8,22 @@ package org.apache.cocoon.environment; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.Reader; -import java.net.URL; -import java.net.URLConnection; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + /** * Description of a source. This interface provides a simple interface * for accessing any resource (URL, local file etc). * * @author Carsten Ziegeler - * @version CVS $Revision: 1.6.2.2 $ $Date: 2001/07/06 09:58:37 $ + * @version CVS $Revision: 1.6.2.3 $ $Date: 2001/08/20 14:07:30 $ */ public interface Source { 1.2.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/environment/SourceResolver.java Index: SourceResolver.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/SourceResolver.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- SourceResolver.java 2001/06/28 09:58:17 1.2.2.1 +++ SourceResolver.java 2001/08/20 14:07:30 1.2.2.2 @@ -8,15 +8,16 @@ package org.apache.cocoon.environment; -import java.io.IOException; import org.apache.cocoon.ProcessingException; import org.xml.sax.SAXException; +import java.io.IOException; + /** * Base interface for resolving a source by system identifiers. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/06/28 09:58:17 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:30 $ */ public interface SourceResolver { No revision No revision 1.1.1.1.2.4 +5 -4 xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java Index: AbstractCommandLineEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- AbstractCommandLineEnvironment.java 2001/08/14 15:54:53 1.1.1.1.2.3 +++ AbstractCommandLineEnvironment.java 2001/08/20 14:07:30 1.1.1.1.2.4 @@ -8,19 +8,20 @@ package org.apache.cocoon.environment.commandline; +import org.apache.cocoon.environment.AbstractEnvironment; +import org.apache.cocoon.environment.Redirector; +import org.apache.log.Logger; + import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; -import org.apache.cocoon.environment.AbstractEnvironment; -import org.apache.cocoon.environment.Redirector; -import org.apache.log.Logger; /** * This environment is used to save the requested file to disk. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/14 15:54:53 $ + * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/08/20 14:07:30 $ */ public abstract class AbstractCommandLineEnvironment 1.2.2.3 +8 -10 xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java Index: CommandLineRequest.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- CommandLineRequest.java 2001/07/13 13:38:46 1.2.2.2 +++ CommandLineRequest.java 2001/08/20 14:07:30 1.2.2.3 @@ -8,26 +8,24 @@ package org.apache.cocoon.environment.commandline; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; + /** * Creates a specific servlet request simulation from command line usage. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/07/13 13:38:46 $ + * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/08/20 14:07:30 $ */ /* 1.1.1.1.2.1 +3 -5 xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineResponse.java Index: CommandLineResponse.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineResponse.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- CommandLineResponse.java 2001/05/09 20:49:44 1.1.1.1 +++ CommandLineResponse.java 2001/08/20 14:07:30 1.1.1.1.2.1 @@ -8,18 +8,16 @@ package org.apache.cocoon.environment.commandline; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.util.Locale; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Response; +import java.util.Locale; + /** * Creates a specific servlet response simulation from command line usage. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:44 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:30 $ */ public class CommandLineResponse implements Response { 1.1.2.2 +1 -3 xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java Index: CommandlineContext.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandlineContext.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- CommandlineContext.java 2001/06/22 14:11:48 1.1.2.1 +++ CommandlineContext.java 2001/08/20 14:07:30 1.1.2.2 @@ -8,12 +8,10 @@ package org.apache.cocoon.environment.commandline; import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.cocoon.environment.Context; -import java.lang.String; import java.net.MalformedURLException; import java.net.URL; -//import javax.servlet.ServletContext; -import org.apache.cocoon.environment.Context; /** * 1.2.2.2 +4 -6 xml-cocoon2/src/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java Index: FileSavingEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- FileSavingEnvironment.java 2001/07/04 07:27:02 1.2.2.1 +++ FileSavingEnvironment.java 2001/08/20 14:07:30 1.2.2.2 @@ -8,21 +8,19 @@ package org.apache.cocoon.environment.commandline; +import org.apache.cocoon.Constants; +import org.apache.log.Logger; + import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; import java.util.Map; -import org.apache.log.Logger; -import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.AbstractEnvironment; /** * This environment is used to save the requested file to disk. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/04 07:27:02 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:30 $ */ public class FileSavingEnvironment extends AbstractCommandLineEnvironment { 1.2.2.2 +4 -9 xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java Index: LinkSamplingEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- LinkSamplingEnvironment.java 2001/07/04 07:27:03 1.2.2.1 +++ LinkSamplingEnvironment.java 2001/08/20 14:07:30 1.2.2.2 @@ -7,30 +7,25 @@ *****************************************************************************/ package org.apache.cocoon.environment.commandline; +import org.apache.cocoon.Constants; +import org.apache.log.Logger; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; import java.util.Map; -import org.apache.cocoon.Constants; -import org.apache.cocoon.Main; -import org.apache.cocoon.environment.AbstractEnvironment; -import org.apache.log.Logger; /** * This environment is sample the links of the resource. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/04 07:27:03 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:30 $ */ public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment { No revision No revision 1.1.1.1.2.3 +3 -3 xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java Index: HttpContext.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpContext.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- HttpContext.java 2001/07/04 10:11:10 1.1.1.1.2.2 +++ HttpContext.java 2001/08/20 14:07:30 1.1.1.1.2.3 @@ -7,11 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; -import java.lang.String; +import org.apache.cocoon.environment.Context; + +import javax.servlet.ServletContext; import java.net.MalformedURLException; import java.net.URL; -import javax.servlet.ServletContext; -import org.apache.cocoon.environment.Context; /** * 1.4.2.3 +8 -11 xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java Index: HttpEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- HttpEnvironment.java 2001/08/14 15:54:54 1.4.2.2 +++ HttpEnvironment.java 2001/08/20 14:07:30 1.4.2.3 @@ -8,21 +8,18 @@ package org.apache.cocoon.environment.http; -import java.io.File; +import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.AbstractEnvironment; +import org.apache.cocoon.environment.Redirector; +import org.apache.cocoon.environment.Session; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; -import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.AbstractEnvironment; -import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Redirector; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; public class HttpEnvironment extends AbstractEnvironment implements Redirector { 1.1.1.1.2.5 +10 -11 xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java Index: HttpRequest.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java,v retrieving revision 1.1.1.1.2.4 retrieving revision 1.1.1.1.2.5 diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 --- HttpRequest.java 2001/07/20 09:01:45 1.1.1.1.2.4 +++ HttpRequest.java 2001/08/20 14:07:30 1.1.1.1.2.5 @@ -7,28 +7,27 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import org.apache.cocoon.environment.Cookie; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.Session; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; -import java.io.UnsupportedEncodingException; +import java.util.Collections; import java.util.Enumeration; +import java.util.HashMap; import java.util.Locale; -import java.util.Vector; import java.util.Map; -import java.util.HashMap; -import java.util.Collections; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import org.apache.cocoon.environment.Cookie; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.Session; /** * Implements the {@link javax.servlet.http.HttpServletRequest} interface * to provide request information for HTTP servlets. * * @author Giacomo Pati - * @version CVS $Id: HttpRequest.java,v 1.1.1.1.2.4 2001/07/20 09:01:45 cziegeler Exp $ + * @version CVS $Id: HttpRequest.java,v 1.1.1.1.2.5 2001/08/20 14:07:30 dims Exp $ */ public class HttpRequest implements Request { 1.1.1.1.2.2 +5 -6 xml-cocoon2/src/org/apache/cocoon/environment/http/HttpResponse.java Index: HttpResponse.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpResponse.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- HttpResponse.java 2001/07/04 09:06:56 1.1.1.1.2.1 +++ HttpResponse.java 2001/08/20 14:07:30 1.1.1.1.2.2 @@ -7,15 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import org.apache.cocoon.environment.Cookie; +import org.apache.cocoon.environment.Response; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.util.Locale; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import org.apache.cocoon.environment.Cookie; -import org.apache.cocoon.environment.Response; /** * 1.1.1.1.2.1 +3 -2 xml-cocoon2/src/org/apache/cocoon/environment/http/HttpSession.java Index: HttpSession.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpSession.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- HttpSession.java 2001/05/09 20:49:45 1.1.1.1 +++ HttpSession.java 2001/08/20 14:07:30 1.1.1.1.2.1 @@ -8,9 +8,10 @@ package org.apache.cocoon.environment.http; -import java.util.Enumeration; import org.apache.cocoon.environment.Session; +import java.util.Enumeration; + /** * * Provides a way to identify a user across more than one page @@ -36,7 +37,7 @@ * will not be directly visible in another. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:45 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:30 $ * */ 1.1.1.1.2.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java Index: RequestWrapper22.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- RequestWrapper22.java 2001/07/20 09:01:45 1.1.1.1.2.2 +++ RequestWrapper22.java 2001/08/20 14:07:31 1.1.1.1.2.3 @@ -7,9 +7,9 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; /** * @@ -17,7 +17,7 @@ * to provide request information for HTTP servlets. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/20 09:01:45 $ + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/20 14:07:31 $ */ public final class RequestWrapper { 1.1.1.1.2.3 +2 -2 xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java Index: RequestWrapper23.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- RequestWrapper23.java 2001/07/20 09:01:45 1.1.1.1.2.2 +++ RequestWrapper23.java 2001/08/20 14:07:31 1.1.1.1.2.3 @@ -7,9 +7,9 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; /** * @@ -17,7 +17,7 @@ * to provide request information for HTTP servlets. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/20 09:01:45 $ + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/20 14:07:31 $ */ public final class RequestWrapper { 1.1.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload22.java Index: RequestWrapperMaybeUpload22.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload22.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- RequestWrapperMaybeUpload22.java 2001/07/20 09:02:31 1.1.2.1 +++ RequestWrapperMaybeUpload22.java 2001/08/20 14:07:31 1.1.2.2 @@ -7,10 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper; + +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper; /** * @@ -18,7 +19,7 @@ * to provide request information for HTTP servlets. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/20 09:02:31 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public final class RequestWrapper extends MaybeUploadRequestWrapper { 1.1.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload23.java Index: RequestWrapperMaybeUpload23.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapperMaybeUpload23.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- RequestWrapperMaybeUpload23.java 2001/07/20 09:02:31 1.1.2.1 +++ RequestWrapperMaybeUpload23.java 2001/08/20 14:07:31 1.1.2.2 @@ -7,11 +7,12 @@ *****************************************************************************/ package org.apache.cocoon.environment.http; +import uk.co.weft.maybeupload.MaybeUploadRequestWrapper; + +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.Map; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper; /** * @@ -19,7 +20,7 @@ * to provide request information for HTTP servlets. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/20 09:02:31 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public final class RequestWrapper extends MaybeUploadRequestWrapper implements HttpServletRequest { No revision No revision 1.1.2.6 +8 -17 xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java Index: EnvironmentWrapper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- EnvironmentWrapper.java 2001/08/17 14:09:57 1.1.2.5 +++ EnvironmentWrapper.java 2001/08/20 14:07:31 1.1.2.6 @@ -8,29 +8,20 @@ package org.apache.cocoon.environment.wrapper; -import java.io.IOException; -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Locale; - -import org.xml.sax.SAXException; - import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.components.source.SourceHandler; import org.apache.cocoon.environment.AbstractEnvironment; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Source; import org.apache.log.Logger; +import java.io.IOException; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * This is a wrapper class for the Environment object. @@ -38,7 +29,7 @@ * contains a RequestWrapper object. * * @author Carsten Ziegeler - * @version $Id: EnvironmentWrapper.java,v 1.1.2.5 2001/08/17 14:09:57 vgritsenko Exp $ + * @version $Id: EnvironmentWrapper.java,v 1.1.2.6 2001/08/20 14:07:31 dims Exp $ */ public final class EnvironmentWrapper extends AbstractEnvironment 1.1.2.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java Index: RequestParameters.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- RequestParameters.java 2001/08/14 14:43:06 1.1.2.2 +++ RequestParameters.java 2001/08/20 14:07:31 1.1.2.3 @@ -8,7 +8,6 @@ package org.apache.cocoon.environment.wrapper; import java.io.Serializable; - import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -22,7 +21,7 @@ * for the Request object. * * @author Carsten Ziegeler - * @version $Id: RequestParameters.java,v 1.1.2.2 2001/08/14 14:43:06 cziegeler Exp $ + * @version $Id: RequestParameters.java,v 1.1.2.3 2001/08/20 14:07:31 dims Exp $ */ public final class RequestParameters implements Serializable { 1.1.2.7 +9 -5 xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java Index: RequestWrapper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- RequestWrapper.java 2001/08/16 11:25:22 1.1.2.6 +++ RequestWrapper.java 2001/08/20 14:07:31 1.1.2.7 @@ -8,15 +8,19 @@ package org.apache.cocoon.environment.wrapper; -import java.io.IOException; -import java.security.Principal; -import java.util.*; - import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; +import java.security.Principal; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + /** * This is a wrapper class for the Request object. @@ -24,7 +28,7 @@ * are different. * * @author Carsten Ziegeler - * @version $Id: RequestWrapper.java,v 1.1.2.6 2001/08/16 11:25:22 cziegeler Exp $ + * @version $Id: RequestWrapper.java,v 1.1.2.7 2001/08/20 14:07:31 dims Exp $ */ public final class RequestWrapper implements Request { No revision No revision 1.2.2.1 +4 -3 xml-cocoon2/src/org/apache/cocoon/generation/AbstractGenerator.java Index: AbstractGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/AbstractGenerator.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- AbstractGenerator.java 2001/05/22 14:40:23 1.2 +++ AbstractGenerator.java 2001/08/20 14:07:31 1.2.2.1 @@ -7,19 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; -import java.util.Map; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.xml.AbstractXMLProducer; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:40:23 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:31 $ */ public abstract class AbstractGenerator extends AbstractXMLProducer implements Generator { 1.1.1.1.2.1 +4 -3 xml-cocoon2/src/org/apache/cocoon/generation/AbstractServerPage.java Index: AbstractServerPage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/AbstractServerPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- AbstractServerPage.java 2001/05/09 20:49:40 1.1.1.1 +++ AbstractServerPage.java 2001/08/20 14:07:31 1.1.1.1.2.1 @@ -7,21 +7,22 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.File; -import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.cocoon.components.language.generator.CompiledComponent; import org.apache.cocoon.environment.Request; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.io.File; + /** * Base implementation of ServerPagesGenerator. This class * declares variables that must be explicitly initialized by code generators. * * @author Ricardo Rocha - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:40 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:31 $ */ public abstract class AbstractServerPage extends ServletGenerator implements CompiledComponent, Cacheable 1.1.1.1.2.2 +2 -4 xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java Index: ComposerGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ComposerGenerator.java 2001/06/12 20:03:44 1.1.1.1.2.1 +++ ComposerGenerator.java 2001/08/20 14:07:31 1.1.1.1.2.2 @@ -7,17 +7,15 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; - -import org.apache.cocoon.Cocoon; +import org.apache.avalon.framework.component.Composable; /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/12 20:03:44 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public abstract class ComposerGenerator extends AbstractGenerator implements Composable { 1.6.2.4 +9 -10 xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java Index: DirectoryGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -r1.6.2.3 -r1.6.2.4 --- DirectoryGenerator.java 2001/08/15 03:21:01 1.6.2.3 +++ DirectoryGenerator.java 2001/08/20 14:07:31 1.6.2.4 @@ -8,25 +8,24 @@ package org.apache.cocoon.generation; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; -import java.util.Stack; -import org.apache.avalon.framework.component.Component; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; +import java.util.Stack; + /** * Generates an XML directory listing. *

@@ -62,7 +61,7 @@ * (Apache Software Foundation, Exoffice Technologies) * @author Conny Krappatsch * (SMB GmbH) for Virbus AG - * @version CVS $Revision: 1.6.2.3 $ $Date: 2001/08/15 03:21:01 $ */ + * @version CVS $Revision: 1.6.2.4 $ $Date: 2001/08/20 14:07:31 $ */ public class DirectoryGenerator extends ComposerGenerator implements Recyclable { 1.9.2.9 +6 -8 xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java Index: FileGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v retrieving revision 1.9.2.8 retrieving revision 1.9.2.9 diff -u -r1.9.2.8 -r1.9.2.9 --- FileGenerator.java 2001/08/15 03:21:01 1.9.2.8 +++ FileGenerator.java 2001/08/20 14:07:31 1.9.2.9 @@ -7,15 +7,10 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.File; -import java.io.IOException; -import java.io.FileNotFoundException; -import java.util.Map; -import org.apache.avalon.framework.component.Component; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.caching.CacheValidity; @@ -24,9 +19,12 @@ import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; -import org.apache.avalon.excalibur.pool.Recyclable; import org.xml.sax.SAXException; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Map; + /** * * @@ -37,7 +35,7 @@ * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) * @author Carsten Ziegeler - * @version CVS $Revision: 1.9.2.8 $ $Date: 2001/08/15 03:21:01 $ + * @version CVS $Revision: 1.9.2.9 $ $Date: 2001/08/20 14:07:31 $ */ public class FileGenerator extends ComposerGenerator implements Cacheable, Recyclable { 1.3.2.2 +7 -8 xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java Index: FragmentExtractorGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- FragmentExtractorGenerator.java 2001/07/13 04:19:31 1.3.2.1 +++ FragmentExtractorGenerator.java 2001/08/20 14:07:31 1.3.2.2 @@ -7,11 +7,7 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; -import java.rmi.server.UID; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; @@ -20,13 +16,16 @@ import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.cocoon.environment.AbstractEnvironment; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.generation.AbstractGenerator; import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.xml.dom.DOMStreamer; -import org.apache.avalon.excalibur.pool.Recyclable; import org.w3c.dom.Document; import org.xml.sax.SAXException; +import java.io.IOException; +import java.rmi.server.UID; +import java.util.HashMap; +import java.util.Map; + /** The generation half of FragmentExtractor. * FragmentExtractor is a transformer-generator pair which is designed to allow * sitemap managers to extract certain nodes from a SAX stream and move them @@ -37,7 +36,7 @@ * This is by no means complete yet, but it should prove useful, particularly * for offline generation. * @author Paul Russell - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/13 04:19:31 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public class FragmentExtractorGenerator extends AbstractGenerator implements Recyclable, Cacheable { 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/generation/Generator.java Index: Generator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/Generator.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- Generator.java 2001/07/07 19:08:15 1.1.1.1.2.1 +++ Generator.java 2001/08/20 14:07:31 1.1.1.1.2.2 @@ -7,17 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.sitemap.SitemapModelComponent; import org.apache.cocoon.xml.XMLProducer; import org.xml.sax.SAXException; +import java.io.IOException; + /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/07 19:08:15 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public interface Generator extends XMLProducer, SitemapModelComponent { 1.4.2.6 +12 -19 xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java Index: HTMLGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -r1.4.2.5 -r1.4.2.6 --- HTMLGenerator.java 2001/08/11 19:02:21 1.4.2.5 +++ HTMLGenerator.java 2001/08/20 14:07:31 1.4.2.6 @@ -7,45 +7,38 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Map; import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.environment.Request; -import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; -import org.apache.cocoon.Constants; -import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.TimeStampCacheValidity; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.xml.dom.DOMStreamer; +import org.apache.xpath.XPathAPI; +import org.w3c.dom.Node; +import org.w3c.dom.traversal.NodeIterator; import org.w3c.tidy.Tidy; import org.xml.sax.SAXException; + +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.sax.SAXResult; -import org.apache.xpath.XPathAPI; -import org.w3c.dom.Node; -import org.w3c.dom.traversal.NodeIterator; -import org.xml.sax.InputSource; -import javax.xml.transform.OutputKeys; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.util.Map; /** * @author Davanum Srinivas * @author Carsten Ziegeler - * @version CVS $Revision: 1.4.2.5 $ $Date: 2001/08/11 19:02:21 $ + * @version CVS $Revision: 1.4.2.6 $ $Date: 2001/08/20 14:07:31 $ */ public class HTMLGenerator extends ComposerGenerator implements Cacheable, Recyclable { 1.4.2.4 +5 -10 xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java Index: ImageDirectoryGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- ImageDirectoryGenerator.java 2001/08/11 19:02:21 1.4.2.3 +++ ImageDirectoryGenerator.java 2001/08/20 14:07:31 1.4.2.4 @@ -7,26 +7,21 @@ *****************************************************************************/ package org.apache.cocoon.generation; +import org.apache.log.Hierarchy; +import org.xml.sax.SAXException; + import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.FileInputStream; -import java.io.InputStreamReader; +import java.io.FileNotFoundException; import java.io.IOException; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.log.Hierarchy; -import org.apache.log.Logger; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; /** * An extension of DirectoryGenerators that adds extra attributes for image * files. * * @author Donald A. Ball Jr. - * @version $Revision: 1.4.2.3 $ $Date: 2001/08/11 19:02:21 $ + * @version $Revision: 1.4.2.4 $ $Date: 2001/08/20 14:07:31 $ */ public class ImageDirectoryGenerator extends DirectoryGenerator { 1.6.2.9 +8 -13 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java Index: JspGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v retrieving revision 1.6.2.8 retrieving revision 1.6.2.9 diff -u -r1.6.2.8 -r1.6.2.9 --- JspGenerator.java 2001/08/05 16:41:35 1.6.2.8 +++ JspGenerator.java 2001/08/20 14:07:31 1.6.2.9 @@ -7,36 +7,31 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.jsp.JSPEngine; import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.environment.http.HttpEnvironment; -import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.XMLProducer; -import org.apache.log.Logger; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.IOException; + /** * Allows JSP to be used as a generator. Builds upon the JSP servlet * functionality - overrides the output method in order to pipe the * results into SAX events. * * @author Davanum Srinivas - * @version CVS $Revision: 1.6.2.8 $ $Date: 2001/08/05 16:41:35 $ + * @version CVS $Revision: 1.6.2.9 $ $Date: 2001/08/20 14:07:31 $ */ public class JspGenerator extends ServletGenerator implements Recyclable, Configurable { 1.6.2.2 +14 -21 xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java Index: PhpGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- PhpGenerator.java 2001/07/07 19:08:17 1.6.2.1 +++ PhpGenerator.java 2001/08/20 14:07:31 1.6.2.2 @@ -7,39 +7,32 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.util.Enumeration; -import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import net.php.servlet; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.logger.AbstractLoggable; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.parser.Parser; -import org.apache.cocoon.environment.http.HttpEnvironment; import org.apache.cocoon.environment.Source; -import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.XMLProducer; -import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.log.Logger; +import org.apache.cocoon.environment.http.HttpEnvironment; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.util.Enumeration; + /** * Allows PHP to be used as a generator. Builds upon the PHP servlet * functionallity - overrides the output method in order to pipe the * results into SAX events. * * @author Sam Ruby - * @version CVS $Revision: 1.6.2.1 $ $Date: 2001/07/07 19:08:17 $ + * @version CVS $Revision: 1.6.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public class PhpGenerator extends ServletGenerator implements Recyclable { 1.3.2.2 +5 -4 xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java Index: RequestGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/RequestGenerator.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- RequestGenerator.java 2001/07/16 13:14:26 1.3.2.1 +++ RequestGenerator.java 2001/08/20 14:07:31 1.3.2.2 @@ -7,20 +7,21 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.util.Enumeration; -import java.util.Iterator; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Request; -import org.apache.avalon.excalibur.pool.Recyclable; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.util.Enumeration; +import java.util.Iterator; + /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) * @author Giacomo Pati - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/16 13:14:26 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public class RequestGenerator extends ServletGenerator implements Recyclable { 1.7.2.3 +6 -9 xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java Index: ScriptGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- ScriptGenerator.java 2001/08/11 19:02:21 1.7.2.2 +++ ScriptGenerator.java 2001/08/20 14:07:31 1.7.2.3 @@ -11,22 +11,19 @@ import com.ibm.bsf.BSFException; import com.ibm.bsf.BSFManager; import com.ibm.bsf.util.IOUtils; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; -import java.io.StringReader; -import org.apache.avalon.framework.component.Component; +import org.apache.avalon.excalibur.pool.Recyclable; 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.excalibur.pool.Recyclable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.environment.Source; -import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; + +import java.io.FileNotFoundException; +import java.io.Reader; +import java.io.StringReader; /** * The Scriptgenerator executes arbitraty scripts using the BSF framework @@ -48,7 +45,7 @@ * * * @author Jason Foster - * @version CVS $Revision: 1.7.2.2 $ $Date: 2001/08/11 19:02:21 $ + * @version CVS $Revision: 1.7.2.3 $ $Date: 2001/08/20 14:07:31 $ */ public class ScriptGenerator extends ComposerGenerator implements Configurable, Recyclable { 1.7.2.7 +11 -19 xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java Index: ServerPagesGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -u -r1.7.2.6 -r1.7.2.7 --- ServerPagesGenerator.java 2001/08/11 19:02:21 1.7.2.6 +++ ServerPagesGenerator.java 2001/08/20 14:07:31 1.7.2.7 @@ -7,47 +7,39 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.LinkedList; -import java.util.HashMap; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; -import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CacheValidity; -import org.apache.cocoon.caching.ParametersCacheValidity; +import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CompositeCacheValidity; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.environment.Source; -import org.apache.cocoon.components.language.generator.CompiledComponent; +import org.apache.cocoon.caching.ParametersCacheValidity; import org.apache.cocoon.components.language.generator.ProgramGenerator; import org.apache.cocoon.components.language.markup.xsp.XSPGenerator; +import org.apache.cocoon.environment.Source; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.xml.XMLConsumer; -import org.apache.avalon.excalibur.pool.Recyclable; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; + +import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; /** * This class acts as a proxy to a dynamically loadedGenerator * delegating actual SAX event generation. * * @author Ricardo Rocha - * @version CVS $Revision: 1.7.2.6 $ $Date: 2001/08/11 19:02:21 $ + * @version CVS $Revision: 1.7.2.7 $ $Date: 2001/08/20 14:07:31 $ */ public class ServerPagesGenerator extends ServletGenerator 1.2.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/generation/ServletGenerator.java Index: ServletGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServletGenerator.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- ServletGenerator.java 2001/08/16 01:15:16 1.2.2.1 +++ ServletGenerator.java 2001/08/20 14:07:31 1.2.2.2 @@ -7,8 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; -import java.util.Map; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; @@ -19,10 +17,13 @@ import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/16 01:15:16 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:31 $ */ public abstract class ServletGenerator extends ComposerGenerator implements Composable { 1.4.2.1 +7 -8 xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java Index: StatusGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- StatusGenerator.java 2001/05/31 17:38:23 1.4 +++ StatusGenerator.java 2001/08/20 14:07:31 1.4.2.1 @@ -7,20 +7,19 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.File; +import org.apache.avalon.excalibur.pool.Recyclable; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + import java.net.InetAddress; import java.net.UnknownHostException; import java.text.DateFormat; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.StringTokenizer; -import org.apache.avalon.excalibur.pool.Recyclable; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; /** Generates an XML representation of the current status of Cocoon. * Potted DTD: @@ -48,7 +47,7 @@ * * @author Paul Russell (Luminas Limited) * @author Stefano Mazzocchi - * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:23 $ + * @version CVS $Revision: 1.4.2.1 $ $Date: 2001/08/20 14:07:31 $ */ public class StatusGenerator extends ComposerGenerator implements Recyclable { 1.1.2.5 +5 -11 xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java Index: StreamGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StreamGenerator.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- StreamGenerator.java 2001/07/07 19:08:18 1.1.2.4 +++ StreamGenerator.java 2001/08/20 14:07:31 1.1.2.5 @@ -8,25 +8,19 @@ package org.apache.cocoon.generation; -import java.io.StringReader; -import java.io.IOException; -import java.util.Map; +import org.apache.avalon.framework.component.Component; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.environment.http.HttpRequest; -import org.apache.cocoon.environment.Source; -import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.PostInputStream; -import org.apache.avalon.excalibur.pool.Poolable; -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.parameters.Parameters; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.StringReader; + /** * * The StreamGenerator is a class that reads XML from a @@ -48,7 +42,7 @@ * number of bytes read is equal to the getContentLength() value. * * @author Kinga Dziembowski - * @version $Revision: 1.1.2.4 $ $Date: 2001/07/07 19:08:18 $ + * @version $Revision: 1.1.2.5 $ $Date: 2001/08/20 14:07:31 $ */ public class StreamGenerator extends ComposerGenerator { public static final String CLASS = StreamGenerator.class.getName(); 1.4.2.3 +6 -8 xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java Index: VelocityGenerator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- VelocityGenerator.java 2001/08/05 16:41:35 1.4.2.2 +++ VelocityGenerator.java 2001/08/20 14:07:31 1.4.2.3 @@ -7,25 +7,23 @@ *****************************************************************************/ package org.apache.cocoon.generation; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; -import java.util.Properties; -import org.apache.avalon.framework.component.Component; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.ComponentException; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.components.parser.Parser; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; + /** * @author Davanum Srinivas - * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/08/05 16:41:35 $ + * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/08/20 14:07:31 $ */ public class VelocityGenerator extends ServletGenerator implements Recyclable { No revision No revision 1.1.1.1.2.2 +2 -4 xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java Index: BrowserMatcherFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/BrowserMatcherFactory.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- BrowserMatcherFactory.java 2001/07/28 01:57:35 1.1.1.1.2.1 +++ BrowserMatcherFactory.java 2001/08/20 14:07:32 1.1.1.1.2.2 @@ -7,13 +7,11 @@ *****************************************************************************/ package org.apache.cocoon.matching; -import java.util.Stack; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.xerces.dom.TreeWalkerImpl; +import org.apache.cocoon.CodeFactory; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.cocoon.CodeFactory; /** * This class generates source code which matches a specific browser pattern @@ -21,7 +19,7 @@ * * @author Giacomo Pati * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/28 01:57:35 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:32 $ */ public class BrowserMatcherFactory implements CodeFactory { 1.2.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java Index: Matcher.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/Matcher.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- Matcher.java 2001/07/07 19:08:22 1.2.2.1 +++ Matcher.java 2001/08/20 14:07:32 1.2.2.2 @@ -7,14 +7,15 @@ *****************************************************************************/ package org.apache.cocoon.matching; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; +import java.util.Map; + /** * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/07 19:08:22 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:32 $ */ public interface Matcher extends Component { 1.3.2.2 +5 -5 xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java Index: RequestParamMatcher.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- RequestParamMatcher.java 2001/07/13 13:39:10 1.3.2.1 +++ RequestParamMatcher.java 2001/08/20 14:07:32 1.3.2.2 @@ -14,12 +14,12 @@ /* * Standard imports */ +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Request; + import java.util.HashMap; import java.util.Map; -import org.apache.cocoon.matching.Matcher; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.Constants; -import org.apache.avalon.framework.parameters.Parameters; /** * This class allows for matching based on a request parameter. @@ -34,7 +34,7 @@ * * * @author Marcus Crafter - * @version CVS $Revision: 1.3.2.1 $ + * @version CVS $Revision: 1.3.2.2 $ */ public class RequestParamMatcher implements Matcher { /** 1.1.2.3 +2 -5 xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java Index: WildcardHeaderMatcherFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardHeaderMatcherFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- WildcardHeaderMatcherFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ WildcardHeaderMatcherFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,11 +8,8 @@ package org.apache.cocoon.matching; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.CodeFactory; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * This class generates source code which represents a specific pattern matcher @@ -25,7 +22,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class WildcardHeaderMatcherFactory extends WildcardURIMatcherFactory { 1.1.2.3 +2 -5 xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java Index: WildcardParameterValueMatcherFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardParameterValueMatcherFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- WildcardParameterValueMatcherFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ WildcardParameterValueMatcherFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,11 +8,8 @@ package org.apache.cocoon.matching; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.CodeFactory; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * This class generates source code which represents a specific pattern matcher @@ -29,7 +26,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ */ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class WildcardParameterValueMatcherFactory extends WildcardURIMatcherFactory { 1.1.2.3 +2 -5 xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionStateMatcherFactory.java Index: WildcardSessionStateMatcherFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionStateMatcherFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- WildcardSessionStateMatcherFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ WildcardSessionStateMatcherFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,12 +8,9 @@ package org.apache.cocoon.matching; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.cocoon.CodeFactory; import org.apache.cocoon.Constants; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * This class generates source code which represents a specific pattern matcher @@ -26,7 +23,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class WildcardSessionStateMatcherFactory extends WildcardURIMatcherFactory { No revision No revision 1.2.2.2 +6 -5 xml-cocoon2/src/org/apache/cocoon/reading/AbstractReader.java Index: AbstractReader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/AbstractReader.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- AbstractReader.java 2001/07/12 10:29:43 1.2.2.1 +++ AbstractReader.java 2001/08/20 14:07:32 1.2.2.2 @@ -7,10 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.reading; -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; @@ -18,10 +14,15 @@ import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.SAXException; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; + /** * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/12 10:29:43 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:32 $ */ public abstract class AbstractReader extends AbstractLoggable implements Reader, Recyclable { /** The current SourceResolver. */ 1.2.2.4 +18 -17 xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java Index: DatabaseReader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -r1.2.2.3 -r1.2.2.4 --- DatabaseReader.java 2001/08/09 21:12:43 1.2.2.3 +++ DatabaseReader.java 2001/08/20 14:07:32 1.2.2.4 @@ -7,17 +7,8 @@ *****************************************************************************/ 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.Date; -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.Component; import org.apache.avalon.framework.component.ComponentException; @@ -28,20 +19,30 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; -import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.ResourceNotFoundException; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.Response; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.cocoon.caching.TimeStampCacheValidity; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.Response; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; import org.xml.sax.SAXException; + +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.Date; +import java.util.Map; /** * This Reader pulls a resource from a database. It is configured with 1.1.1.1.2.3 +3 -2 xml-cocoon2/src/org/apache/cocoon/reading/Reader.java Index: Reader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/Reader.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- Reader.java 2001/07/12 10:29:45 1.1.1.1.2.2 +++ Reader.java 2001/08/20 14:07:32 1.1.1.1.2.3 @@ -7,16 +7,17 @@ *****************************************************************************/ package org.apache.cocoon.reading; -import java.io.IOException; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.sitemap.SitemapModelComponent; import org.apache.cocoon.sitemap.SitemapOutputComponent; import org.xml.sax.SAXException; +import java.io.IOException; + /** * * @author Giacomo Pati - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/12 10:29:45 $ + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public interface Reader extends SitemapModelComponent, SitemapOutputComponent { 1.3.2.4 +7 -17 xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java Index: ResourceReader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 --- ResourceReader.java 2001/07/13 04:19:26 1.3.2.3 +++ ResourceReader.java 2001/08/20 14:07:32 1.3.2.4 @@ -7,41 +7,31 @@ *****************************************************************************/ package org.apache.cocoon.reading; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.util.Date; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Map; -import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentException; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.TimeStampCacheValidity; import org.apache.cocoon.environment.Context; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.InputStream; +import java.util.Date; +import java.util.Map; + /** * * @author Giacomo Pati - * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/07/13 04:19:26 $ + * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/08/20 14:07:32 $ * * The ResourceReader component is used to serve binary data * in a sitemap pipeline. It makes use of HTTP Headers to determine if No revision No revision 1.1.1.1.2.1 +1 -4 xml-cocoon2/src/org/apache/cocoon/selection/BrowserSelectorFactory.java Index: BrowserSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/BrowserSelectorFactory.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- BrowserSelectorFactory.java 2001/05/09 20:49:29 1.1.1.1 +++ BrowserSelectorFactory.java 2001/08/20 14:07:32 1.1.1.1.2.1 @@ -9,12 +9,9 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.cocoon.CodeFactory; -import org.apache.xerces.dom.TreeWalkerImpl; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code which tests a specific browser pattern @@ -23,7 +20,7 @@ * @author Carsten Ziegeler * @author Giacomo Pati * @author Berin Loritsch - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:29 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:32 $ */ 1.1.2.3 +1 -6 xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java Index: HeaderSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/HeaderSelectorFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- HeaderSelectorFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ HeaderSelectorFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,13 +8,8 @@ package org.apache.cocoon.selection; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.cocoon.CodeFactory; -import org.apache.xerces.dom.TreeWalkerImpl; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code to implement a selector that @@ -27,7 +22,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class HeaderSelectorFactory extends ParameterSelectorFactory { 1.1.1.1.2.2 +1 -4 xml-cocoon2/src/org/apache/cocoon/selection/HostSelectorFactory.java Index: HostSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/HostSelectorFactory.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- HostSelectorFactory.java 2001/06/21 11:26:33 1.1.1.1.2.1 +++ HostSelectorFactory.java 2001/08/20 14:07:32 1.1.1.1.2.2 @@ -9,12 +9,9 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.cocoon.CodeFactory; -import org.apache.xerces.dom.TreeWalkerImpl; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code to implement a selector that @@ -35,7 +32,7 @@ * * * @author Colin Britton - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/06/21 11:26:33 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:32 $ */ 1.1.1.1.2.2 +1 -6 xml-cocoon2/src/org/apache/cocoon/selection/ParameterSelectorFactory.java Index: ParameterSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/ParameterSelectorFactory.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- ParameterSelectorFactory.java 2001/07/13 13:39:33 1.1.1.1.2.1 +++ ParameterSelectorFactory.java 2001/08/20 14:07:32 1.1.1.1.2.2 @@ -9,12 +9,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.cocoon.CodeFactory; -import org.apache.xerces.dom.TreeWalkerImpl; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code to implement a selector that @@ -40,7 +35,7 @@ * depending on those parameters. * * @author Leo Sutic - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/13 13:39:33 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:32 $ */ public class ParameterSelectorFactory implements CodeFactory { 1.1.2.3 +1 -6 xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java Index: RequestSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/RequestSelectorFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- RequestSelectorFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ RequestSelectorFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,13 +8,8 @@ package org.apache.cocoon.selection; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.cocoon.CodeFactory; -import org.apache.xerces.dom.TreeWalkerImpl; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code to implement a selector that @@ -27,7 +22,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class RequestSelectorFactory extends ParameterSelectorFactory { 1.1.1.1.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/selection/Selector.java Index: Selector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/Selector.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- Selector.java 2001/07/07 19:08:26 1.1.1.1.2.1 +++ Selector.java 2001/08/20 14:07:32 1.1.1.1.2.2 @@ -7,15 +7,16 @@ *****************************************************************************/ package org.apache.cocoon.selection; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; +import java.util.Map; + /** * * @author Giacomo Pati * @author Leo Sutic - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/07 19:08:26 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:32 $ */ public interface Selector extends Component { 1.1.2.3 +1 -6 xml-cocoon2/src/org/apache/cocoon/selection/SessionStateSelectorFactory.java Index: SessionStateSelectorFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/SessionStateSelectorFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SessionStateSelectorFactory.java 2001/07/20 08:42:24 1.1.2.2 +++ SessionStateSelectorFactory.java 2001/08/20 14:07:32 1.1.2.3 @@ -8,14 +8,9 @@ package org.apache.cocoon.selection; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.cocoon.CodeFactory; import org.apache.cocoon.Constants; -import org.apache.xerces.dom.TreeWalkerImpl; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.traversal.NodeFilter; -import org.w3c.dom.traversal.TreeWalker; /** * This class generates source code to implement a selector that @@ -28,7 +23,7 @@ * * * @author Christian Haul - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/20 08:42:24 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:32 $ */ public class SessionStateSelectorFactory extends ParameterSelectorFactory { No revision No revision 1.1.1.1.2.1 +3 -2 xml-cocoon2/src/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java Index: CodedSelectorHelper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- CodedSelectorHelper.java 2001/05/09 20:49:29 1.1.1.1 +++ CodedSelectorHelper.java 2001/08/20 14:07:33 1.1.1.1.2.1 @@ -7,13 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.selection.helpers; -import java.util.Map; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Context; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.Session; +import java.util.Map; + /** * This abstract class provides the basis for testing the environment with * developer specified java code via the CodedSelectorFactory. This class also @@ -21,7 +22,7 @@ * variables for developer ease. * * @author Marcus Crafter - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:29 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public abstract class CodedSelectorHelper { No revision No revision 1.2.2.2 +4 -8 xml-cocoon2/src/org/apache/cocoon/serialization/AbstractSerializer.java Index: AbstractSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractSerializer.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- AbstractSerializer.java 2001/07/12 10:29:54 1.2.2.1 +++ AbstractSerializer.java 2001/08/20 14:07:33 1.2.2.2 @@ -8,21 +8,17 @@ package org.apache.cocoon.serialization; -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.xml.AbstractXMLPipe; -import org.apache.cocoon.ProcessingException; -import org.xml.sax.SAXException; + +import java.io.BufferedOutputStream; +import java.io.OutputStream; /** * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/12 10:29:54 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:33 $ */ public abstract class AbstractSerializer extends AbstractXMLPipe implements Serializer, Recyclable { 1.2.2.1 +10 -9 xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java Index: AbstractTextSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- AbstractTextSerializer.java 2001/05/31 17:38:41 1.2 +++ AbstractTextSerializer.java 2001/08/20 14:07:33 1.2.2.1 @@ -8,31 +8,32 @@ package org.apache.cocoon.serialization; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXTransformerFactory; +import org.apache.avalon.excalibur.pool.Poolable; 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.excalibur.pool.Poolable; import org.apache.cocoon.Constants; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.cocoon.util.TraxErrorHandler; import org.xml.sax.Attributes; -import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + +import javax.xml.transform.OutputKeys; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXTransformerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; /** * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) * @author Stefano Mazzocchi * @author Sylvain Wallez - * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:41 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public abstract class AbstractTextSerializer extends AbstractSerializer implements Configurable, Cacheable, Poolable { 1.1.1.1.2.2 +8 -11 xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java Index: FOPSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- FOPSerializer.java 2001/07/12 10:29:55 1.1.1.1.2.1 +++ FOPSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.2 @@ -8,28 +8,25 @@ package org.apache.cocoon.serialization; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import org.apache.cocoon.caching.CacheValidity; -import org.apache.cocoon.caching.Cacheable; -import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; +import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.fop.apps.Driver; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.Options; -import org.apache.fop.apps.Version; import org.apache.fop.messaging.MessageEvent; import org.apache.fop.messaging.MessageHandler; import org.apache.fop.messaging.MessageListener; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; + /** * FOP serializer. * @@ -37,7 +34,7 @@ * (PWR Organisation & Entwicklung) * @author Stefano Mazzocchi * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/12 10:29:55 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:33 $ * * The use of a config file for FOP is enabled by adding a configuration * element to the serializer in the sitemap. 1.1.1.1.2.1 +4 -5 xml-cocoon2/src/org/apache/cocoon/serialization/HTMLSerializer.java Index: HTMLSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/HTMLSerializer.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- HTMLSerializer.java 2001/05/09 20:49:38 1.1.1.1 +++ HTMLSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.1 @@ -8,17 +8,16 @@ package org.apache.cocoon.serialization; -import java.io.OutputStream; +import org.apache.avalon.excalibur.pool.Poolable; + import javax.xml.transform.OutputKeys; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.excalibur.pool.Poolable; +import java.io.OutputStream; /** * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:38 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public class HTMLSerializer extends AbstractTextSerializer implements Poolable { 1.1.1.1.2.2 +6 -9 xml-cocoon2/src/org/apache/cocoon/serialization/LinkSerializer.java Index: LinkSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/LinkSerializer.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- LinkSerializer.java 2001/07/12 10:29:56 1.1.1.1.2.1 +++ LinkSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.2 @@ -8,22 +8,19 @@ package org.apache.cocoon.serialization; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.Constants; -import org.apache.cocoon.ProcessingException; import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe; -import org.apache.avalon.excalibur.pool.Poolable; -import org.apache.avalon.framework.parameters.Parameters; import org.xml.sax.Attributes; -import org.xml.sax.EntityResolver; import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; + /** * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/12 10:29:56 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:33 $ */ public class LinkSerializer extends ExtendedXLinkPipe implements Serializer, Poolable { 1.1.2.2 +8 -11 xml-cocoon2/src/org/apache/cocoon/serialization/Attic/PCLSerializer.java Index: PCLSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/Attic/PCLSerializer.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- PCLSerializer.java 2001/08/13 10:38:22 1.1.2.1 +++ PCLSerializer.java 2001/08/20 14:07:33 1.1.2.2 @@ -8,28 +8,25 @@ package org.apache.cocoon.serialization; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import org.apache.cocoon.caching.CacheValidity; -import org.apache.cocoon.caching.Cacheable; -import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; +import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.fop.apps.Driver; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.Options; -import org.apache.fop.apps.Version; import org.apache.fop.messaging.MessageEvent; import org.apache.fop.messaging.MessageHandler; import org.apache.fop.messaging.MessageListener; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; + /** * FOP PCL serializer. * @@ -38,7 +35,7 @@ * @author Stefano Mazzocchi * @author Carsten Ziegeler * @author John Morrison - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/13 10:38:22 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:33 $ * * The use of a config file for FOP is enabled by adding a configuration * element to the serializer in the sitemap. 1.1.2.2 +8 -11 xml-cocoon2/src/org/apache/cocoon/serialization/Attic/PSSerializer.java Index: PSSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/Attic/PSSerializer.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- PSSerializer.java 2001/08/13 10:38:22 1.1.2.1 +++ PSSerializer.java 2001/08/20 14:07:33 1.1.2.2 @@ -8,28 +8,25 @@ package org.apache.cocoon.serialization; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import org.apache.cocoon.caching.CacheValidity; -import org.apache.cocoon.caching.Cacheable; -import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.cocoon.caching.CacheValidity; +import org.apache.cocoon.caching.Cacheable; +import org.apache.cocoon.caching.NOPCacheValidity; import org.apache.fop.apps.Driver; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.Options; -import org.apache.fop.apps.Version; import org.apache.fop.messaging.MessageEvent; import org.apache.fop.messaging.MessageHandler; import org.apache.fop.messaging.MessageListener; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; + /** * FOP PS serializer. * @@ -38,7 +35,7 @@ * @author Stefano Mazzocchi * @author Carsten Ziegeler * @author John Morrison - * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/08/13 10:38:22 $ + * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:33 $ * * The use of a config file for FOP is enabled by adding a configuration * element to the serializer in the sitemap. 1.1.1.1.2.2 +6 -7 xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java Index: SVGSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/SVGSerializer.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- SVGSerializer.java 2001/07/12 10:29:57 1.1.1.1.2.1 +++ SVGSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.2 @@ -8,10 +8,7 @@ package org.apache.cocoon.serialization; -import java.awt.Color; -import java.io.BufferedOutputStream; -import java.io.OutputStream; -import java.lang.reflect.Field; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.configuration.Configurable; @@ -30,19 +27,21 @@ import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.xml.XMLConsumer; import org.apache.cocoon.xml.dom.SVGBuilder; -import org.apache.avalon.excalibur.pool.Poolable; -import org.apache.log.Logger; import org.w3c.dom.Document; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; +import java.awt.*; +import java.io.BufferedOutputStream; +import java.io.OutputStream; + /** * A Batik based Serializer for generating PNG/JPEG images * * @author Davanum Srinivas * @author Ross Burton - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/12 10:29:57 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:33 $ */ public class SVGSerializer extends SVGBuilder implements Composable, Serializer, Configurable, Poolable, Cacheable { 1.1.1.1.2.1 +4 -5 xml-cocoon2/src/org/apache/cocoon/serialization/TextSerializer.java Index: TextSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/TextSerializer.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- TextSerializer.java 2001/05/09 20:49:38 1.1.1.1 +++ TextSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.1 @@ -8,17 +8,16 @@ package org.apache.cocoon.serialization; -import java.io.OutputStream; +import org.apache.avalon.excalibur.pool.Poolable; + import javax.xml.transform.OutputKeys; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.excalibur.pool.Poolable; +import java.io.OutputStream; /** * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:38 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public class TextSerializer extends AbstractTextSerializer implements Poolable { 1.1.1.1.2.1 +4 -5 xml-cocoon2/src/org/apache/cocoon/serialization/XMLSerializer.java Index: XMLSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/XMLSerializer.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- XMLSerializer.java 2001/05/09 20:49:38 1.1.1.1 +++ XMLSerializer.java 2001/08/20 14:07:33 1.1.1.1.2.1 @@ -8,17 +8,16 @@ package org.apache.cocoon.serialization; -import java.io.OutputStream; +import org.apache.avalon.excalibur.pool.Poolable; + import javax.xml.transform.OutputKeys; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.excalibur.pool.Poolable; +import java.io.OutputStream; /** * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:38 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public class XMLSerializer extends AbstractTextSerializer implements Poolable { No revision No revision 1.13.2.18 +18 -25 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java Index: CocoonServlet.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v retrieving revision 1.13.2.17 retrieving revision 1.13.2.18 diff -u -r1.13.2.17 -r1.13.2.18 --- CocoonServlet.java 2001/08/18 18:19:07 1.13.2.17 +++ CocoonServlet.java 2001/08/20 14:07:33 1.13.2.18 @@ -7,25 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.servlet; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.Date; -import java.util.Enumeration; -import java.util.StringTokenizer; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.context.DefaultContext; import org.apache.cocoon.Cocoon; import org.apache.cocoon.ConnectionResetException; @@ -34,26 +15,38 @@ import org.apache.cocoon.Notifier; import org.apache.cocoon.ResourceNotFoundException; import org.apache.cocoon.components.classloader.RepositoryClassLoader; -import org.apache.cocoon.environment.Context; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.http.HttpContext; import org.apache.cocoon.environment.http.HttpEnvironment; import org.apache.cocoon.environment.http.RequestWrapper; import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.IOUtils; -import org.apache.cocoon.util.NetUtils; import org.apache.cocoon.util.log.CocoonLogFormatter; import org.apache.cocoon.util.log.XMLCocoonLogFormatter; import org.apache.log.ContextMap; -import org.apache.log.format.Formatter; import org.apache.log.Hierarchy; import org.apache.log.LogTarget; import org.apache.log.Logger; import org.apache.log.Priority; import org.apache.log.filter.PriorityFilter; -import org.apache.log.output.io.FileTarget; +import org.apache.log.format.Formatter; import org.apache.log.output.ServletOutputLogTarget; -import org.xml.sax.SAXException; +import org.apache.log.output.io.FileTarget; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URL; +import java.util.Arrays; +import java.util.Date; +import java.util.StringTokenizer; /** * This is the entry point for Cocoon execution as an HTTP Servlet. @@ -64,7 +57,7 @@ * @author Nicola Ken Barozzi Aisa * @author Berin Loritsch * @author Carsten Ziegeler - * @version CVS $Revision: 1.13.2.17 $ $Date: 2001/08/18 18:19:07 $ + * @version CVS $Revision: 1.13.2.18 $ $Date: 2001/08/20 14:07:33 $ */ public class CocoonServlet extends HttpServlet { 1.2.2.1 +2 -3 xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidClassLoader.java Index: ParanoidClassLoader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidClassLoader.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- ParanoidClassLoader.java 2001/05/23 16:29:08 1.2 +++ ParanoidClassLoader.java 2001/08/20 14:07:33 1.2.2.1 @@ -7,9 +7,8 @@ *****************************************************************************/ package org.apache.cocoon.servlet; -import java.io.IOException; import java.io.File; - +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -20,7 +19,7 @@ * classes. It checks this classloader before it checks its parent. * * @author Berin Loritsch - * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 16:29:08 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:33 $ */ public class ParanoidClassLoader extends URLClassLoader { 1.2.2.2 +4 -10 xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidCocoonServlet.java Index: ParanoidCocoonServlet.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/ParanoidCocoonServlet.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- ParanoidCocoonServlet.java 2001/07/12 13:33:50 1.2.2.1 +++ ParanoidCocoonServlet.java 2001/08/20 14:07:33 1.2.2.2 @@ -8,17 +8,11 @@ package org.apache.cocoon.servlet; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Date; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import org.apache.avalon.framework.context.ContextException; -import org.apache.cocoon.Constants; import org.apache.cocoon.util.IOUtils; +import javax.servlet.ServletException; +import java.io.File; + /** * This is the entry point for Cocoon execution as an HTTP Servlet. * It also creates a buffer by loading the whole servlet inside a ClassLoader. @@ -28,7 +22,7 @@ * of it. * * @author Berin Loritsch - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/12 13:33:50 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:33 $ */ public class ParanoidCocoonServlet extends CocoonServlet { No revision No revision 1.4.2.18 +10 -15 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java Index: AbstractSitemap.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v retrieving revision 1.4.2.17 retrieving revision 1.4.2.18 diff -u -r1.4.2.17 -r1.4.2.18 --- AbstractSitemap.java 2001/07/18 12:46:10 1.4.2.17 +++ AbstractSitemap.java 2001/08/20 14:07:34 1.4.2.18 @@ -8,24 +8,15 @@ package org.apache.cocoon.sitemap; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import org.apache.avalon.excalibur.component.ExcaliburComponentManager; +import org.apache.avalon.excalibur.component.RoleManager; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; -import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; @@ -43,15 +34,19 @@ import org.apache.cocoon.serialization.Serializer; import org.apache.cocoon.transformation.Transformer; import org.apache.cocoon.util.ClassUtils; -import org.apache.avalon.excalibur.component.ExcaliburComponentManager; -import org.apache.avalon.excalibur.component.RoleManager; -import org.apache.avalon.excalibur.component.DefaultRoleManager; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * Base class for generated Sitemap classes * * @author Giacomo Pati - * @version CVS $Revision: 1.4.2.17 $ $Date: 2001/07/18 12:46:10 $ + * @version CVS $Revision: 1.4.2.18 $ $Date: 2001/08/20 14:07:34 $ */ public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap, Disposable, ThreadSafe { private Context context; 1.5.2.10 +7 -10 xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java Index: ContentAggregator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v retrieving revision 1.5.2.9 retrieving revision 1.5.2.10 diff -u -r1.5.2.9 -r1.5.2.10 --- ContentAggregator.java 2001/07/12 06:24:31 1.5.2.9 +++ ContentAggregator.java 2001/08/20 14:07:34 1.5.2.10 @@ -8,38 +8,35 @@ package org.apache.cocoon.sitemap; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Map; -import java.util.Iterator; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.AggregatedCacheValidity; +import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.TimeStampCacheValidity; -import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.generation.Generator; +import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.xml.ContentHandlerWrapper; import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.XMLProducer; -import org.apache.cocoon.util.HashUtil; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Map; + /** * @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Id: ContentAggregator.java,v 1.5.2.9 2001/07/12 06:24:31 cziegeler Exp $ + * @version CVS $Id: ContentAggregator.java,v 1.5.2.10 2001/08/20 14:07:34 dims Exp $ */ public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable, Composable { 1.9.2.11 +5 -5 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java Index: Handler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v retrieving revision 1.9.2.10 retrieving revision 1.9.2.11 diff -u -r1.9.2.10 -r1.9.2.11 --- Handler.java 2001/08/14 16:02:52 1.9.2.10 +++ Handler.java 2001/08/20 14:07:34 1.9.2.11 @@ -8,9 +8,6 @@ package org.apache.cocoon.sitemap; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URL; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; @@ -20,7 +17,6 @@ import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.avalon.excalibur.component.RoleManager; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.Processor; import org.apache.cocoon.components.language.generator.CompiledComponent; @@ -34,13 +30,17 @@ import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.SAXException; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URL; + /** * Handles the manageing and stating of one Sitemap * * @author Carsten Ziegeler * @author Giacomo Pati * @author Stefano Mazzocchi - * @version CVS $Revision: 1.9.2.10 $ $Date: 2001/08/14 16:02:52 $ + * @version CVS $Revision: 1.9.2.11 $ $Date: 2001/08/20 14:07:34 $ */ public class Handler extends AbstractLoggable implements Runnable, Contextualizable, Composable, Processor, Disposable, SourceResolver { 1.2.2.3 +4 -3 xml-cocoon2/src/org/apache/cocoon/sitemap/LinkTranslator.java Index: LinkTranslator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/LinkTranslator.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- LinkTranslator.java 2001/06/08 14:42:03 1.2.2.2 +++ LinkTranslator.java 2001/08/20 14:07:34 1.2.2.3 @@ -8,8 +8,6 @@ package org.apache.cocoon.sitemap; -import java.io.IOException; -import java.util.Map; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; @@ -19,9 +17,12 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/06/08 14:42:03 $ + * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/08/20 14:07:34 $ */ public class LinkTranslator extends ExtendedXLinkPipe implements Transformer { private Map links; 1.2.2.11 +5 -6 xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java Index: Manager.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java,v retrieving revision 1.2.2.10 retrieving revision 1.2.2.11 diff -u -r1.2.2.10 -r1.2.2.11 --- Manager.java 2001/08/20 13:02:18 1.2.2.10 +++ Manager.java 2001/08/20 14:07:34 1.2.2.11 @@ -8,9 +8,7 @@ package org.apache.cocoon.sitemap; -import java.io.File; -import java.util.HashMap; -import java.util.Iterator; +import org.apache.avalon.excalibur.component.RoleManager; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -21,12 +19,13 @@ import org.apache.avalon.framework.context.Contextualizable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.avalon.excalibur.component.RoleManager; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.pipeline.EventPipeline; import org.apache.cocoon.components.pipeline.StreamPipeline; import org.apache.cocoon.environment.Environment; -import org.apache.cocoon.sitemap.Handler; + +import java.util.HashMap; +import java.util.Iterator; /** * This class manages all sub Sitemaps of a Sitemap @@ -34,7 +33,7 @@ * checking regeneration of the sub Sitemap * * @author Giacomo Pati - * @version CVS $Revision: 1.2.2.10 $ $Date: 2001/08/20 13:02:18 $ + * @version CVS $Revision: 1.2.2.11 $ $Date: 2001/08/20 14:07:34 $ */ public class Manager extends AbstractLoggable implements Component, Configurable, Composable, Contextualizable, ThreadSafe { private Context context; 1.2.2.9 +6 -8 xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java Index: SitemapComponentSelector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapComponentSelector.java,v retrieving revision 1.2.2.8 retrieving revision 1.2.2.9 diff -u -r1.2.2.8 -r1.2.2.9 --- SitemapComponentSelector.java 2001/08/16 01:36:27 1.2.2.8 +++ SitemapComponentSelector.java 2001/08/20 14:07:34 1.2.2.9 @@ -8,22 +8,20 @@ package org.apache.cocoon.sitemap; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.apache.avalon.excalibur.component.ExcaliburComponentSelector; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.ComponentSelector; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.excalibur.component.ExcaliburComponentSelector; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** Default component manager for Cocoon's sitemap components. * @author Berin Loritsch * @author Giacomo Pati - * @version CVS $Id: SitemapComponentSelector.java,v 1.2.2.8 2001/08/16 01:36:27 vgritsenko Exp $ + * @version CVS $Id: SitemapComponentSelector.java,v 1.2.2.9 2001/08/20 14:07:34 dims Exp $ */ public class SitemapComponentSelector extends ExcaliburComponentSelector { private Map mime_types; 1.2.2.2 +4 -3 xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapModelComponent.java Index: SitemapModelComponent.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapModelComponent.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- SitemapModelComponent.java 2001/06/08 14:42:09 1.2.2.1 +++ SitemapModelComponent.java 2001/08/20 14:07:34 1.2.2.2 @@ -8,19 +8,20 @@ package org.apache.cocoon.sitemap; -import java.io.IOException; -import java.util.Map; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/06/08 14:42:09 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:34 $ */ public interface SitemapModelComponent extends Component { /** 1.1.1.1.2.3 +3 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapOutputComponent.java Index: SitemapOutputComponent.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapOutputComponent.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- SitemapOutputComponent.java 2001/07/12 10:30:04 1.1.1.1.2.2 +++ SitemapOutputComponent.java 2001/08/20 14:07:34 1.1.1.1.2.3 @@ -8,15 +8,16 @@ package org.apache.cocoon.sitemap; +import org.apache.avalon.framework.component.Component; + import java.io.IOException; import java.io.OutputStream; -import org.apache.avalon.framework.component.Component; /** * * @author Giacomo Pati * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/12 10:30:04 $ + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/20 14:07:34 $ */ public interface SitemapOutputComponent extends Component { /** 1.1.2.3 +2 -1 xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapRedirector.java Index: SitemapRedirector.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/SitemapRedirector.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SitemapRedirector.java 2001/06/08 14:42:12 1.1.2.2 +++ SitemapRedirector.java 2001/08/20 14:07:34 1.1.2.3 @@ -10,13 +10,14 @@ import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.Redirector; + import java.io.IOException; /** * Wrapper for sitemap redirection * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/06/08 14:42:12 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:34 $ */ public class SitemapRedirector implements Redirector { private boolean hasRedirected = false; 1.2.2.3 +3 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java Index: XSLTFactoryLoader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/XSLTFactoryLoader.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- XSLTFactoryLoader.java 2001/06/08 14:42:13 1.2.2.2 +++ XSLTFactoryLoader.java 2001/08/20 14:07:34 1.2.2.3 @@ -8,13 +8,14 @@ package org.apache.cocoon.sitemap; -import java.util.HashMap; import org.apache.avalon.framework.logger.Loggable; import org.apache.cocoon.CodeFactory; import org.apache.cocoon.util.ClassUtils; import org.apache.log.Logger; import org.w3c.dom.NodeList; +import java.util.HashMap; + /** * This class is used as a XSLT extension class. It is used by the sitemap * generation stylesheet to load MatcherFactorys or @@ -25,7 +26,7 @@ * * @author Giacomo Pati * @author Berin Loritsch - * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/06/08 14:42:13 $ + * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/08/20 14:07:34 $ */ public class XSLTFactoryLoader { protected static Logger log; No revision No revision 1.3.2.2 +4 -5 xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java Index: AbstractDOMTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- AbstractDOMTransformer.java 2001/07/07 19:08:30 1.3.2.1 +++ AbstractDOMTransformer.java 2001/08/20 14:07:34 1.3.2.2 @@ -7,26 +7,25 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.IOException; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.transformation.Transformer; import org.apache.cocoon.xml.XMLConsumer; import org.apache.cocoon.xml.dom.DOMBuilder; -import org.apache.cocoon.xml.dom.DOMFactory; import org.apache.cocoon.xml.dom.DOMStreamer; import org.w3c.dom.Document; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; + +import java.io.IOException; +import java.util.Map; /** * An Abstract DOM Transformer, for use when a transformer needs a DOM-based 1.1.2.4 +4 -3 xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java Index: CIncludeTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CIncludeTransformer.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- CIncludeTransformer.java 2001/07/07 19:08:31 1.1.2.3 +++ CIncludeTransformer.java 2001/08/20 14:07:34 1.1.2.4 @@ -7,8 +7,6 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.IOException; -import java.util.Map; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -20,6 +18,9 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.io.IOException; +import java.util.Map; + /** * This transformer triggers for the element include in the * namespace "http://apache.org/cocoon/include/1.0". @@ -30,7 +31,7 @@ * which surrounds the included content. * * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/07/07 19:08:31 $ $Author: giacomo $ + * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class CIncludeTransformer extends AbstractTransformer implements Recyclable, Composable { 1.1.2.3 +6 -6 xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java Index: FilterTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FilterTransformer.java 2001/07/10 19:50:04 1.1.2.2 +++ FilterTransformer.java 2001/08/20 14:07:34 1.1.2.3 @@ -1,16 +1,16 @@ package org.apache.cocoon.transformation; -import java.util.Map; -import java.io.IOException; +import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.transformation.AbstractTransformer; import org.apache.cocoon.environment.SourceResolver; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.io.IOException; +import java.util.Map; + /** * The filter transformer can be used to let only an amount of elements through in * a given block. @@ -25,7 +25,7 @@ * Only the 3th block will be shown, containing only 5 row elements. * * @author Sven Beauprez - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/10 19:50:04 $ $Author: bloritsch $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class FilterTransformer extends AbstractTransformer implements Poolable { 1.3.2.2 +8 -9 xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java Index: FragmentExtractorTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- FragmentExtractorTransformer.java 2001/07/07 19:08:31 1.3.2.1 +++ FragmentExtractorTransformer.java 2001/08/20 14:07:34 1.3.2.2 @@ -7,26 +7,20 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; import org.apache.cocoon.caching.NOPCacheValidity; +import org.apache.cocoon.components.parser.Parser; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.generation.FragmentExtractorGenerator; -import org.apache.cocoon.transformation.AbstractTransformer; -import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.xml.dom.DOMBuilder; import org.apache.cocoon.xml.dom.DOMFactory; import org.w3c.dom.Document; @@ -34,6 +28,11 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** The transformation half of the FragmentExtractor. * This transformer sieves an incoming stream of xml with embedded SVG images @@ -43,7 +42,7 @@ * you aren't gonna need it, * so I've just used very simple extraction based on a URI and local name. * @author Paul Russell - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/07 19:08:31 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:34 $ */ public class FragmentExtractorTransformer extends AbstractTransformer implements Composable, Disposable, Cacheable, Poolable { 1.8.2.6 +14 -25 xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java Index: I18nTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v retrieving revision 1.8.2.5 retrieving revision 1.8.2.6 diff -u -r1.8.2.5 -r1.8.2.6 --- I18nTransformer.java 2001/07/07 19:08:31 1.8.2.5 +++ I18nTransformer.java 2001/08/20 14:07:34 1.8.2.6 @@ -9,44 +9,33 @@ */ package org.apache.cocoon.transformation; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.acting.LangSelect; -import org.apache.cocoon.environment.Source; -import org.apache.cocoon.environment.SourceResolver; - import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.framework.logger.Loggable; - +import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.acting.LangSelect; +import org.apache.cocoon.environment.Source; +import org.apache.cocoon.environment.SourceResolver; import org.xml.sax.Attributes; -import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.DefaultHandler; import java.io.IOException; - -import java.util.Map; -import java.util.HashMap; -import java.util.StringTokenizer; -import java.util.ArrayList; -import java.util.Locale; -import java.util.Date; - -import java.text.Format; -import java.text.MessageFormat; +import java.net.MalformedURLException; import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.text.NumberFormat; import java.text.DecimalFormat; +import java.text.MessageFormat; +import java.text.NumberFormat; import java.text.ParseException; - -import java.net.URL; -import java.net.MalformedURLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; /** * I18nTransformer. Cocoon2 port of Infozone groups I18nProcessor. 1.1.2.5 +15 -21 xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java Index: LDAPTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- LDAPTransformer.java 2001/07/07 19:08:32 1.1.2.4 +++ LDAPTransformer.java 2001/08/20 14:07:34 1.1.2.5 @@ -7,7 +7,21 @@ *****************************************************************************/ package org.apache.cocoon.transformation; +import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.avalon.framework.parameters.Parameters; +import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.environment.SourceResolver; +import org.apache.cocoon.xml.XMLConsumer; +import org.apache.log.Logger; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.ext.LexicalHandler; +import org.xml.sax.helpers.AttributesImpl; + import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.BasicAttribute; import javax.naming.directory.DirContext; @@ -15,33 +29,13 @@ import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; - import java.io.IOException; -import java.lang.Integer; -import java.lang.Long; import java.util.Enumeration; +import java.util.LinkedList; import java.util.List; -import java.util.LinkedList ; import java.util.Map; import java.util.Properties; import java.util.Vector; -import org.apache.avalon.excalibur.pool.Poolable; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.XMLProducer; -import org.apache.log.Logger; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.EntityResolver; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; -import org.xml.sax.helpers.AttributesImpl; /***************************************************************************** 1.2.2.2 +7 -6 xml-cocoon2/src/org/apache/cocoon/transformation/LogTransformer.java Index: LogTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LogTransformer.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- LogTransformer.java 2001/08/07 10:44:20 1.2.2.1 +++ LogTransformer.java 2001/08/20 14:07:34 1.2.2.2 @@ -7,18 +7,19 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Date; -import java.util.Map; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.SourceResolver; -import org.apache.avalon.excalibur.pool.Poolable; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Date; +import java.util.Map; + /** * * The LogTransformer is a class that can be plugged into a pipeline @@ -43,7 +44,7 @@ * * @author Giacomo Pati * (PWR Organisation & Entwicklung) - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/07 10:44:20 $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:34 $ * */ public class LogTransformer extends AbstractTransformer implements Poolable { 1.1.2.3 +9 -9 xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java Index: ReadDOMSessionTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- ReadDOMSessionTransformer.java 2001/08/10 11:59:20 1.1.2.2 +++ ReadDOMSessionTransformer.java 2001/08/20 14:07:34 1.1.2.3 @@ -1,21 +1,21 @@ package org.apache.cocoon.transformation; -import java.util.Map; -import java.io.IOException; +import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.Session; +import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.Session; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.transformation.AbstractTransformer; -import org.apache.cocoon.xml.dom.DOMStreamer; import org.apache.cocoon.xml.EmbeddedXMLPipe; -import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.cocoon.xml.dom.DOMStreamer; import org.w3c.dom.Node; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * With this transformer, a DOM-object that is stored in the session, can be inserted @@ -35,7 +35,7 @@ * the trigger-element * * @author Sven Beauprez - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/10 11:59:20 $ $Author: dims $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class ReadDOMSessionTransformer extends AbstractTransformer implements Poolable { 1.5.2.9 +21 -27 xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java Index: SQLTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v retrieving revision 1.5.2.8 retrieving revision 1.5.2.9 diff -u -r1.5.2.8 -r1.5.2.9 --- SQLTransformer.java 2001/08/14 16:42:18 1.5.2.8 +++ SQLTransformer.java 2001/08/20 14:07:34 1.5.2.9 @@ -7,49 +7,43 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.IOException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.PreparedStatement; -import java.sql.CallableStatement; -import java.util.Enumeration; -import java.util.Map; -import java.util.HashMap; -import java.util.TreeMap; -import java.util.Iterator; -import java.util.Properties; -import java.util.Vector; -import java.lang.reflect.Field; +import org.apache.avalon.excalibur.datasource.DataSourceComponent; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentSelector; import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.excalibur.datasource.DataSourceComponent; -import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.cocoon.environment.SourceResolver; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.xml.XMLConsumer; -import org.apache.cocoon.xml.XMLProducer; +import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.Tokenizer; import org.apache.log.Logger; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; -import org.apache.cocoon.transformation.AbstractTransformer; +import java.io.IOException; +import java.lang.reflect.Field; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.TreeMap; +import java.util.Vector; /** * @@ -57,7 +51,7 @@ * @author Giacomo Pati * (PWR Organisation & Entwicklung) * @author Sven Beauprez - * @version CVS $Revision: 1.5.2.8 $ $Date: 2001/08/14 16:42:18 $ $Author: dims $ + * @version CVS $Revision: 1.5.2.9 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class SQLTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable, Configurable { 1.15.2.13 +20 -27 xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java Index: TraxTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v retrieving revision 1.15.2.12 retrieving revision 1.15.2.13 diff -u -r1.15.2.12 -r1.15.2.13 --- TraxTransformer.java 2001/08/16 07:59:48 1.15.2.12 +++ TraxTransformer.java 2001/08/20 14:07:34 1.15.2.13 @@ -7,24 +7,7 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.text.StringCharacterIterator; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import javax.xml.transform.Templates; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; -import javax.xml.transform.URIResolver; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; @@ -34,29 +17,39 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; -import org.apache.cocoon.caching.CompositeCacheValidity; -import org.apache.cocoon.caching.ParametersCacheValidity; import org.apache.cocoon.caching.TimeStampCacheValidity; import org.apache.cocoon.components.browser.Browser; import org.apache.cocoon.components.store.Store; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Cookie; +import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.util.HashUtil; import org.apache.cocoon.util.TraxErrorHandler; -import org.apache.cocoon.xml.ContentHandlerWrapper; 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 javax.xml.transform.Templates; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import java.io.File; +import java.io.IOException; +import java.text.StringCharacterIterator; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * This Transformer is used to transform this incomming SAX stream using @@ -100,7 +93,7 @@ * @author Davanum Srinivas * @author Carsten Ziegeler * @author Giacomo Pati - * @version CVS $Id: TraxTransformer.java,v 1.15.2.12 2001/08/16 07:59:48 cziegeler Exp $ + * @version CVS $Id: TraxTransformer.java,v 1.15.2.13 2001/08/20 14:07:34 dims Exp $ */ public class TraxTransformer extends AbstractTransformer implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable, URIResolver { 1.2.2.2 +13 -14 xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java Index: WriteDOMSessionTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- WriteDOMSessionTransformer.java 2001/07/10 14:05:03 1.2.2.1 +++ WriteDOMSessionTransformer.java 2001/08/20 14:07:34 1.2.2.2 @@ -8,26 +8,25 @@ package org.apache.cocoon.transformation; -import java.util.Map; -import java.io.IOException; -import javax.xml.parsers.ParserConfigurationException; -import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.Session; -import org.apache.cocoon.environment.Request; -import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.ProcessingException; -import org.apache.cocoon.transformation.AbstractTransformer; -import org.apache.cocoon.xml.dom.DOMBuilder; -import org.apache.cocoon.components.parser.Parser; +import org.apache.avalon.excalibur.pool.Poolable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; -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.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Poolable; +import org.apache.cocoon.Constants; +import org.apache.cocoon.ProcessingException; +import org.apache.cocoon.components.parser.Parser; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.environment.Session; +import org.apache.cocoon.environment.SourceResolver; +import org.apache.cocoon.xml.dom.DOMBuilder; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Map; + /** * Make a DOM object from SAX events and write it to the session. @@ -43,7 +42,7 @@ * dom-root-element is the trigger that will be the root element of the DOM * * @author Sven Beauprez - * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/10 14:05:03 $ $Author: dims $ + * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class WriteDOMSessionTransformer extends AbstractTransformer implements 1.6.2.6 +14 -18 xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java Index: XIncludeTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -u -r1.6.2.5 -r1.6.2.6 --- XIncludeTransformer.java 2001/07/11 18:03:54 1.6.2.5 +++ XIncludeTransformer.java 2001/08/20 14:07:34 1.6.2.6 @@ -7,23 +7,12 @@ *****************************************************************************/ package org.apache.cocoon.transformation; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Map; -import java.util.Stack; -import javax.xml.transform.TransformerException; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; @@ -31,19 +20,26 @@ import org.apache.cocoon.components.url.URLFactory; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.xml.IncludeXMLConsumer; -import org.apache.cocoon.xml.dom.DOMBuilder; import org.apache.cocoon.xml.dom.DOMStreamer; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.xpath.XPathAPI; import org.w3c.dom.Document; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; + +import javax.xml.transform.TransformerException; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Map; +import java.util.Stack; /** * My first pass at an XInclude transformation. Currently it should set the base URI @@ -53,7 +49,7 @@ * by the SAX event FSM yet. * * @author Donald Ball - * @version CVS $Revision: 1.6.2.5 $ $Date: 2001/07/11 18:03:54 $ $Author: bloritsch $ + * @version CVS $Revision: 1.6.2.6 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $ */ public class XIncludeTransformer extends AbstractTransformer implements Composable, Recyclable, Disposable { 1.4.2.2 +11 -13 xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java Index: XTTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- XTTransformer.java 2001/07/07 19:08:33 1.4.2.1 +++ XTTransformer.java 2001/08/20 14:07:34 1.4.2.2 @@ -21,38 +21,27 @@ import com.jclark.xsl.tr.EngineImpl; import com.jclark.xsl.tr.ParameterSet; import com.jclark.xsl.tr.Sheet; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; +import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.Constants; import org.apache.cocoon.Modifiable; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.store.Store; import org.apache.cocoon.components.url.URLFactory; import org.apache.cocoon.environment.SourceResolver; -import org.apache.cocoon.transformation.Transformer; import org.apache.cocoon.xml.DocumentHandlerAdapter; import org.apache.cocoon.xml.DocumentHandlerWrapper; import org.apache.cocoon.xml.XMLConsumer; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.log.Logger; import org.xml.sax.AttributeList; import org.xml.sax.ContentHandler; import org.xml.sax.DTDHandler; import org.xml.sax.DocumentHandler; import org.xml.sax.ErrorHandler; -import org.xml.sax.HandlerBase; import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.Parser; @@ -60,11 +49,20 @@ import org.xml.sax.SAXParseException; import org.xml.sax.ext.LexicalHandler; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + /** * This Transformer use the XT processor. * * @author Sahuc Sebastien - * @version CVS $Revision: 1.4.2.1 $ $Date: 2001/07/07 19:08:33 $ + * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/08/20 14:07:34 $ */ public class XTTransformer extends DocumentHandlerWrapper implements Transformer, Composable, Loggable, Recyclable, Disposable { No revision No revision 1.7.2.4 +2 -2 xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java Index: ClassUtils.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -r1.7.2.3 -r1.7.2.4 --- ClassUtils.java 2001/07/30 10:50:37 1.7.2.3 +++ ClassUtils.java 2001/08/20 14:07:35 1.7.2.4 @@ -10,15 +10,15 @@ import java.io.File; import java.io.IOException; -import java.net.URL; import java.net.MalformedURLException; +import java.net.URL; /** * A collection of class management utility methods. * * @author Ricardo Rocha * @author Stefano Mazzocchi - * @version CVS $Revision: 1.7.2.3 $ $Date: 2001/07/30 10:50:37 $ + * @version CVS $Revision: 1.7.2.4 $ $Date: 2001/08/20 14:07:35 $ */ public class ClassUtils { 1.2.2.5 +3 -2 xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java Index: IOUtils.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -r1.2.2.4 -r1.2.2.5 --- IOUtils.java 2001/08/08 19:56:03 1.2.2.4 +++ IOUtils.java 2001/08/20 14:07:35 1.2.2.5 @@ -7,6 +7,8 @@ *****************************************************************************/ package org.apache.cocoon.util; +import org.apache.log.Hierarchy; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -20,7 +22,6 @@ import java.text.Collator; import java.util.Arrays; import java.util.Locale; -import org.apache.log.Hierarchy; /** * A collection of File, URL and filename @@ -28,7 +29,7 @@ * * @author Ricardo Rocha * @author Stefano Mazzocchi - * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/08/08 19:56:03 $ + * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/08/20 14:07:35 $ */ public class IOUtils { 1.1.1.1.2.3 +1 -4 xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java Index: NetUtils.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- NetUtils.java 2001/07/18 17:35:47 1.1.1.1.2.2 +++ NetUtils.java 2001/08/20 14:07:35 1.1.1.1.2.3 @@ -8,9 +8,6 @@ package org.apache.cocoon.util; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; import java.util.Map; /** @@ -18,7 +15,7 @@ * utility methods * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/18 17:35:47 $ + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/20 14:07:35 $ */ public class NetUtils { 1.1.2.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java Index: PostInputStream.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- PostInputStream.java 2001/06/12 15:00:16 1.1.2.1 +++ PostInputStream.java 2001/08/20 14:07:35 1.1.2.2 @@ -7,14 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * The class PostInputStream is a wrapper for InputStream associated with POST message. * It allows to control read operation, restricting the number of bytes read to the value returned by getContentLen() method. * * @author Kinga Dziembowski - * @version $Id: PostInputStream.java,v 1.1.2.1 2001/06/12 15:00:16 giacomo Exp $ + * @version $Id: PostInputStream.java,v 1.1.2.2 2001/08/20 14:07:35 dims Exp $ */ public class PostInputStream extends InputStream { 1.1.1.1.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/util/StringUtils.java Index: StringUtils.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/StringUtils.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- StringUtils.java 2001/05/09 20:49:33 1.1.1.1 +++ StringUtils.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -7,14 +7,14 @@ *****************************************************************************/ package org.apache.cocoon.util; -import java.util.StringTokenizer; + /** * A collection of String handling utility methods. * * @author Ricardo Rocha * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:33 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public class StringUtils { 1.1.1.1.2.1 +2 -1 xml-cocoon2/src/org/apache/cocoon/util/TraxErrorHandler.java Index: TraxErrorHandler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/TraxErrorHandler.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- TraxErrorHandler.java 2001/05/09 20:49:34 1.1.1.1 +++ TraxErrorHandler.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,10 +8,11 @@ package org.apache.cocoon.util; +import org.apache.log.Logger; + import javax.xml.transform.ErrorListener; import javax.xml.transform.SourceLocator; import javax.xml.transform.TransformerException; -import org.apache.log.Logger; public class TraxErrorHandler implements ErrorListener { No revision No revision 1.3.2.4 +5 -7 xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java Index: CocoonLogFormatter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/CocoonLogFormatter.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 --- CocoonLogFormatter.java 2001/08/13 08:41:05 1.3.2.3 +++ CocoonLogFormatter.java 2001/08/20 14:07:35 1.3.2.4 @@ -8,18 +8,16 @@ package org.apache.cocoon.util.log; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - import org.apache.avalon.framework.CascadingThrowable; - import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Request; - import org.apache.log.ContextMap; import org.apache.log.LogEvent; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; + /** * An extended pattern formatter. New patterns are defined by this class are : *

    @@ -34,7 +32,7 @@ *
* * @author Sylvain Wallez - * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/08/13 08:41:05 $ + * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/08/20 14:07:35 $ */ public class CocoonLogFormatter extends ExtensiblePatternFormatter 1.3.2.4 +4 -3 xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java Index: ExtensiblePatternFormatter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 --- ExtensiblePatternFormatter.java 2001/08/16 14:02:11 1.3.2.3 +++ ExtensiblePatternFormatter.java 2001/08/20 14:07:35 1.3.2.4 @@ -8,13 +8,14 @@ package org.apache.cocoon.util.log; -import java.io.StringWriter; -import java.util.Stack; import org.apache.log.Hierarchy; import org.apache.log.LogEvent; import org.apache.log.Priority; import org.apache.log.format.Formatter; +import java.io.StringWriter; +import java.util.Stack; + /** * A refactoring of org.apache.log.format.PatternFormatter that * can be extended. @@ -31,7 +32,7 @@ * * @author Peter Donald * @author Sylvain Wallez - * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/08/16 14:02:11 $ + * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/08/20 14:07:35 $ */ public class ExtensiblePatternFormatter implements Formatter 1.1.2.6 +8 -9 xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java Index: XMLCocoonLogFormatter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- XMLCocoonLogFormatter.java 2001/08/16 14:02:11 1.1.2.5 +++ XMLCocoonLogFormatter.java 2001/08/20 14:07:35 1.1.2.6 @@ -7,19 +7,18 @@ *****************************************************************************/ package org.apache.cocoon.util.log; +import org.apache.avalon.framework.CascadingThrowable; +import org.apache.cocoon.Constants; +import org.apache.cocoon.environment.Request; +import org.apache.log.ContextMap; +import org.apache.log.LogEvent; +import org.apache.log.format.Formatter; + import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import java.util.Stack; import java.util.StringTokenizer; -import org.apache.log.ContextMap; -import org.apache.log.LogEvent; -import org.apache.log.Priority; -import org.apache.log.format.Formatter; -import org.apache.avalon.framework.CascadingThrowable; -import org.apache.cocoon.Constants; -import org.apache.cocoon.environment.Request; /** * A refactoring of org.apache.log.format.PatternFormatter @@ -51,7 +50,7 @@ * @author Peter Donald * @author Sylvain Wallez * @author Carsten Ziegeler - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/08/16 14:02:11 $ + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/08/20 14:07:35 $ */ public class XMLCocoonLogFormatter implements Formatter { No revision No revision 1.1.1.1.2.1 +6 -8 xml-cocoon2/src/org/apache/cocoon/xml/AbstractDOMFragment.java Index: AbstractDOMFragment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractDOMFragment.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- AbstractDOMFragment.java 2001/05/09 20:49:29 1.1.1.1 +++ AbstractDOMFragment.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,17 +8,15 @@ package org.apache.cocoon.xml; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - import org.apache.cocoon.xml.dom.DOMStreamer; - +import org.w3c.dom.Document; +import org.w3c.dom.Node; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import org.w3c.dom.Document; -import org.w3c.dom.Node; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; /** * Abstract implementation of {@link XMLFragment} for objects that are more easily represented @@ -28,7 +26,7 @@ * the results of toDOM() that must be implemented by concrete subclasses. * * @author Sylvain Wallez - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:29 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public abstract class AbstractDOMFragment implements XMLFragment { 1.1.1.1.2.1 +1 -2 xml-cocoon2/src/org/apache/cocoon/xml/AbstractSAXFragment.java Index: AbstractSAXFragment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractSAXFragment.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- AbstractSAXFragment.java 2001/05/09 20:49:31 1.1.1.1 +++ AbstractSAXFragment.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -9,7 +9,6 @@ package org.apache.cocoon.xml; import org.apache.cocoon.xml.dom.DOMBuilder; - import org.w3c.dom.Node; /** @@ -20,7 +19,7 @@ * of toSAX() that must be implemented by concrete subclasses. * * @author Sylvain Wallez - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:31 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public abstract class AbstractSAXFragment implements XMLFragment { 1.1.1.1.2.1 +1 -4 xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLConsumer.java Index: AbstractXMLConsumer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLConsumer.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- AbstractXMLConsumer.java 2001/05/09 20:49:31 1.1.1.1 +++ AbstractXMLConsumer.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,12 +8,9 @@ package org.apache.cocoon.xml; import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.log.Logger; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; /** * This abstract class provides default implementation of the methods specified @@ -21,7 +18,7 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:31 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public abstract class AbstractXMLConsumer extends AbstractLoggable implements XMLConsumer { 1.3.2.1 +1 -4 xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java Index: AbstractXMLPipe.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLPipe.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- AbstractXMLPipe.java 2001/05/30 13:32:29 1.3 +++ AbstractXMLPipe.java 2001/08/20 14:07:35 1.3.2.1 @@ -9,19 +9,16 @@ package org.apache.cocoon.xml; import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.cocoon.xml.AbstractXMLProducer; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.ext.LexicalHandler; /** * This class provides a bridge class to connect to existing content * handlers and lexical handlers. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.3 $ $Date: 2001/05/30 13:32:29 $ + * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe, Recyclable { 1.1.1.1.2.1 +1 -4 xml-cocoon2/src/org/apache/cocoon/xml/ContentHandlerWrapper.java Index: ContentHandlerWrapper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/ContentHandlerWrapper.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- ContentHandlerWrapper.java 2001/05/09 20:49:30 1.1.1.1 +++ ContentHandlerWrapper.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,14 +8,11 @@ package org.apache.cocoon.xml; -import java.util.Vector; -import org.apache.cocoon.xml.AbstractXMLConsumer; import org.apache.avalon.excalibur.pool.Recyclable; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributeListImpl; /** * This class is an utility class "wrapping" around a SAX version 2.0 @@ -25,7 +22,7 @@ * * @author Davanum Srinivas * (Apache Software Foundation, Computer Associates) - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:30 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public class ContentHandlerWrapper extends AbstractXMLConsumer implements Recyclable { 1.1.1.1.2.1 +5 -7 xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java Index: DocumentHandlerAdapter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- DocumentHandlerAdapter.java 2001/05/09 20:49:30 1.1.1.1 +++ DocumentHandlerAdapter.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,12 +8,6 @@ package org.apache.cocoon.xml; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; -import org.apache.cocoon.xml.AbstractXMLProducer; -import org.apache.cocoon.xml.NamespacesTable; -import org.apache.cocoon.xml.XMLConsumer; import org.xml.sax.AttributeList; import org.xml.sax.ContentHandler; import org.xml.sax.DocumentHandler; @@ -21,6 +15,10 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + /** * This class is an utility class "adapting" a SAX version 1.0 * DocumentHandler, to SAX version 2 ContentHandler. @@ -32,7 +30,7 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:30 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public class DocumentHandlerAdapter extends AbstractXMLProducer implements DocumentHandler { 1.1.1.1.2.1 +3 -5 xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerWrapper.java Index: DocumentHandlerWrapper.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerWrapper.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- DocumentHandlerWrapper.java 2001/05/09 20:49:30 1.1.1.1 +++ DocumentHandlerWrapper.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -8,11 +8,7 @@ package org.apache.cocoon.xml; -import java.util.Vector; import org.apache.avalon.framework.logger.Loggable; -import org.apache.cocoon.xml.AbstractXMLConsumer; -import org.apache.cocoon.xml.NamespacesTable; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.log.Logger; import org.xml.sax.Attributes; import org.xml.sax.DocumentHandler; @@ -20,6 +16,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributeListImpl; +import java.util.Vector; + /** * This class is an utility class "wrapping" around a SAX version 1.0 * DocumentHandler and forwarding it those events received throug @@ -32,7 +30,7 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:30 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public class DocumentHandlerWrapper extends AbstractXMLConsumer implements Loggable /*, Recyclable*/ { 1.1.1.1.2.1 +5 -5 xml-cocoon2/src/org/apache/cocoon/xml/LoggingEntityResolver.java Index: LoggingEntityResolver.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/LoggingEntityResolver.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- LoggingEntityResolver.java 2001/05/09 20:49:30 1.1.1.1 +++ LoggingEntityResolver.java 2001/08/20 14:07:35 1.1.1.1.2.1 @@ -1,14 +1,14 @@ package org.apache.cocoon.xml; -import java.io.IOException; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import org.apache.avalon.framework.logger.AbstractLoggable; -import org.apache.log.Logger; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; + +import java.io.IOException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; /** * Logging entity resolver to assist in caching. 1.2.2.1 +2 -3 xml-cocoon2/src/org/apache/cocoon/xml/XMLProducer.java Index: XMLProducer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLProducer.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- XMLProducer.java 2001/05/29 06:13:48 1.2 +++ XMLProducer.java 2001/08/20 14:07:35 1.2.2.1 @@ -7,9 +7,8 @@ *****************************************************************************/ package org.apache.cocoon.xml; -import org.xml.sax.ContentHandler; -import org.xml.sax.ext.LexicalHandler; + /** * This interfaces identifies classes that produce XML data, sending SAX * events to the configured XMLConsumer. @@ -19,7 +18,7 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.2 $ $Date: 2001/05/29 06:13:48 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:35 $ */ public interface XMLProducer { No revision No revision 1.1.1.1.2.2 +3 -6 xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java Index: DOMBuilder.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- DOMBuilder.java 2001/07/12 08:25:32 1.1.1.1.2.1 +++ DOMBuilder.java 2001/08/20 14:07:36 1.1.1.1.2.2 @@ -8,35 +8,32 @@ package org.apache.cocoon.xml.dom; -import java.util.Vector; import org.apache.avalon.framework.logger.Loggable; import org.apache.cocoon.xml.NamespacesTable; import org.apache.cocoon.xml.XMLConsumer; import org.apache.log.Logger; -import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; import org.w3c.dom.Element; import org.w3c.dom.EntityReference; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; import org.xml.sax.Attributes; -import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import java.util.Vector; + /** * The DOMBuilder is a utility class that will generate a W3C * DOM Document from SAX events. * * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/12 08:25:32 $ + * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/08/20 14:07:36 $ */ public class DOMBuilder implements XMLConsumer, Loggable { protected Logger log; 1.1.1.1.2.4 +9 -9 xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java Index: DOMStreamer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- DOMStreamer.java 2001/07/24 12:12:44 1.1.1.1.2.3 +++ DOMStreamer.java 2001/08/20 14:07:36 1.1.1.1.2.4 @@ -8,20 +8,20 @@ package org.apache.cocoon.xml.dom; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXResult; - import org.apache.cocoon.xml.AbstractXMLProducer; import org.apache.cocoon.xml.EmbeddedXMLPipe; import org.apache.cocoon.xml.XMLConsumer; +import org.w3c.dom.Node; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; -import org.w3c.dom.Node; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXResult; /** * The DOMStreamer is a utility class that will generate SAX @@ -30,7 +30,7 @@ * @author Carsten Ziegeler * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/07/24 12:12:44 $ + * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/08/20 14:07:36 $ */ public class DOMStreamer extends AbstractXMLProducer { 1.2.2.1 +1 -16 xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java Index: SVGBuilder.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- SVGBuilder.java 2001/05/23 21:27:40 1.2 +++ SVGBuilder.java 2001/08/20 14:07:36 1.2.2.1 @@ -8,28 +8,13 @@ package org.apache.cocoon.xml.dom; -import java.util.Vector; import org.apache.avalon.framework.logger.Loggable; import org.apache.batik.css.CSSDocumentHandler; import org.apache.batik.dom.svg.SAXSVGDocumentFactory; import org.apache.batik.dom.svg.SVGDOMImplementation; import org.apache.cocoon.xml.XMLConsumer; import org.apache.log.Logger; -import org.w3c.dom.Attr; -import org.w3c.dom.CDATASection; -import org.w3c.dom.Comment; import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; -import org.w3c.dom.Element; -import org.w3c.dom.EntityReference; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.ProcessingInstruction; -import org.w3c.dom.Text; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; import org.xml.sax.SAXException; /** @@ -37,7 +22,7 @@ * SVG-DOM Document from SAX events using Batik's SVGDocumentFactory. * * @author Davanum Srinivas - * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 21:27:40 $ + * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/08/20 14:07:36 $ */ public class SVGBuilder extends SAXSVGDocumentFactory implements XMLConsumer, Loggable { protected Logger log; No revision No revision 1.1.1.1.2.1 +1 -2 xml-cocoon2/src/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java Index: ExtendedXLinkPipe.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- ExtendedXLinkPipe.java 2001/05/09 20:49:32 1.1.1.1 +++ ExtendedXLinkPipe.java 2001/08/20 14:07:36 1.1.1.1.2.1 @@ -8,7 +8,6 @@ package org.apache.cocoon.xml.xlink; -import org.apache.cocoon.xml.AbstractXMLPipe; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; @@ -27,7 +26,7 @@ * be a way to remove this, that will be a happy day for XML and for Cocoon too. * * @author Stefano Mazzocchi - * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:32 $ + * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/08/20 14:07:36 $ */ public abstract class ExtendedXLinkPipe extends XLinkPipe { ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org