bloritsch 01/10/08 13:03:23
Modified: . LISCENSE.resolver
bin/src st.java
src/org/apache/cocoon Cocoon.java CodeFactory.java Main.java
Notification.java Notifier.java
ProcessingException.java Processor.java
ProcessorWrapper.java
src/org/apache/cocoon/acting AbstractAction.java
AbstractComplementaryConfigurableAction.java
AbstractConfigurableAction.java
AbstractDatabaseAction.java
AbstractValidatorAction.java Action.java
ComposerAction.java ConfigurableComposerAction.java
DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseSelectAction.java
DatabaseUpdateAction.java FormValidatorAction.java
HelloAction.java HttpHeaderAction.java
LangSelect.java LocaleAction.java OraAddAction.java
RequestParamAction.java ResourceExistsAction.java
ScriptAction.java SendmailAction.java
ServerPagesAction.java
SessionInvalidatorAction.java
SessionIsValidAction.java
SessionPropagatorAction.java
SessionStateAction.java SessionValidatorAction.java
src/org/apache/cocoon/caching AggregatedCacheValidity.java
CachingOutputStream.java IncludeCacheValidity.java
PipelineCacheKey.java
src/org/apache/cocoon/components/browser Browser.java
src/org/apache/cocoon/components/classloader
ClassLoaderManager.java ClassLoaderManagerImpl.java
RepositoryClassLoader.java
src/org/apache/cocoon/components/hsqldb ServerImpl.java
src/org/apache/cocoon/components/jsp JSPEngine.java
JSPEngineImpl.java
JSPEngineImplNamedDispatcherInclude.java
JSPEngineImplWLS.java JSPReader.java
src/org/apache/cocoon/components/language
LanguageException.java
src/org/apache/cocoon/components/language/generator
CompiledComponent.java GeneratorSelector.java
ProgramGenerator.java ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java Logicsheet.java
LogicsheetCodeGenerator.java
MarkupCodeGenerator.java MarkupLanguage.java
NamedLogicsheet.java
src/org/apache/cocoon/components/language/markup/sitemap
SitemapMarkupLanguage.java
src/org/apache/cocoon/components/language/markup/xsp
XSPCookieHelper.java XSPFormValidatorHelper.java
XSPGenerator.java XSPMarkupLanguage.java
XSPObjectHelper.java XSPRequestHelper.java
XSPResponseHelper.java XSPUtil.java
src/org/apache/cocoon/components/language/programming
AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
LanguageCompiler.java ProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
AbstractJavaCompiler.java JavaLanguage.java
Javac.java Jikes.java JstyleFormatter.java
src/org/apache/cocoon/components/language/programming/javascript
JavascriptLanguage.java
src/org/apache/cocoon/components/parser JaxpParser.java
Parser.java XercesParser.java
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
AbstractStreamPipeline.java
CacheableEventPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java EventPipeline.java
NonCachingStreamPipeline.java StreamPipeline.java
src/org/apache/cocoon/components/profiler Profiler.java
ProfilerData.java ProfilerGenerator.java
ProfilingCachingEventPipeline.java
ProfilingNonCachingEventPipeline.java
ProfilingSAXConnector.java SimpleProfiler.java
src/org/apache/cocoon/components/renderer
ExtendableRendererFactory.java
src/org/apache/cocoon/components/resolver Resolver.java
ResolverImpl.java
src/org/apache/cocoon/components/sax
XMLByteStreamCompiler.java
XMLByteStreamFragment.java
XMLByteStreamInterpreter.java XMLDeserializer.java
XMLTeePipe.java
src/org/apache/cocoon/components/saxconnector
LoggingSAXConnector.java SAXConnector.java
src/org/apache/cocoon/components/source
CocoonSourceFactory.java SitemapSource.java
SourceFactory.java SourceHandler.java
SourceHandlerImpl.java URLSource.java
src/org/apache/cocoon/components/store FilesystemStore.java
MRUMemoryStore.java MemoryStore.java Store.java
StoreJanitorImpl.java
src/org/apache/cocoon/components/transcoder
ExtendableTranscoderFactory.java
src/org/apache/cocoon/components/url ContextURLFactory.java
ResourceURLFactory.java URLFactory.java
URLFactoryImpl.java
src/org/apache/cocoon/components/xpath
JaxenProcessorImpl.java XPathProcessor.java
XPathProcessorImpl.java
src/org/apache/cocoon/components/xslt XSLTProcessor.java
XSLTProcessorImpl.java
src/org/apache/cocoon/environment AbstractEnvironment.java
Context.java Environment.java Request.java
Source.java SourceResolver.java
URLFactorySourceResolver.java
src/org/apache/cocoon/environment/commandline
AbstractCommandLineEnvironment.java
CommandLineRequest.java CommandLineResponse.java
CommandLineSession.java CommandlineContext.java
FileSavingEnvironment.java
LinkSamplingEnvironment.java
src/org/apache/cocoon/environment/http HttpContext.java
HttpEnvironment.java HttpRequest.java
HttpResponse.java HttpSession.java
RequestWrapper22.java RequestWrapper23.java
RequestWrapperMaybeUpload22.java
RequestWrapperMaybeUpload23.java
src/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java RequestParameters.java
RequestWrapper.java
src/org/apache/cocoon/generation 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
XMLDBCollectionGenerator.java XMLDBGenerator.java
src/org/apache/cocoon/i18n XMLResourceBundle.java
XMLResourceBundleFactory.java
src/org/apache/cocoon/matching BrowserMatcherFactory.java
Matcher.java RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
RequestParamMatcher.java
WildcardHeaderMatcherFactory.java
WildcardParameterValueMatcherFactory.java
WildcardSessionAttributeMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading AbstractReader.java
DatabaseReader.java Reader.java ResourceReader.java
src/org/apache/cocoon/samples/parentcm Configurator.java
Generator.java ParentComponentManager.java
Time.java TimeComponent.java
src/org/apache/cocoon/selection BrowserSelectorFactory.java
CodedSelectorFactory.java
HeaderSelectorFactory.java HostSelectorFactory.java
ParameterSelectorFactory.java
RequestSelectorFactory.java Selector.java
SessionAttributeSelectorFactory.java
src/org/apache/cocoon/selection/helpers
CodedSelectorHelper.java
src/org/apache/cocoon/serialization AbstractSerializer.java
AbstractTextSerializer.java FOPSerializer.java
HTMLSerializer.java LinkSerializer.java
SVGSerializer.java Serializer.java
TextSerializer.java XMLSerializer.java
src/org/apache/cocoon/servlet CocoonServlet.java
ParanoidClassLoader.java ParanoidCocoonServlet.java
src/org/apache/cocoon/sitemap AbstractSitemap.java
ContentAggregator.java ErrorNotifier.java
Handler.java LinkTranslator.java Manager.java
Sitemap.java SitemapComponentSelector.java
SitemapModelComponent.java
SitemapOutputComponent.java SitemapRedirector.java
XSLTFactoryLoader.java
src/org/apache/cocoon/transformation
AbstractDOMTransformer.java
CIncludeTransformer.java
CachingCIncludeTransformer.java
FilterTransformer.java
FragmentExtractorTransformer.java
I18nTransformer.java LDAPTransformer.java
LogTransformer.java ReadDOMSessionTransformer.java
RoleFilterTransformer.java SQLTransformer.java
Transformer.java TraxTransformer.java
WriteDOMSessionTransformer.java
XIncludeTransformer.java XTTransformer.java
src/org/apache/cocoon/util ClassUtils.java IOUtils.java
JavaArchiveFilter.java NetUtils.java
PostInputStream.java Tokenizer.java
TraxErrorHandler.java
src/org/apache/cocoon/util/log CocoonLogFormatter.java
CocoonTargetFactory.java
ExtensiblePatternFormatter.java
XMLCocoonLogFormatter.java
src/org/apache/cocoon/xml AbstractDOMFragment.java
AbstractSAXFragment.java AbstractXMLConsumer.java
AbstractXMLPipe.java AbstractXMLProducer.java
ContentHandlerWrapper.java
DocumentHandlerAdapter.java
DocumentHandlerWrapper.java EmbeddedXMLPipe.java
IncludeXMLConsumer.java LoggingEntityResolver.java
XMLConsumer.java XMLFragment.java
XMLMulticaster.java XMLizable.java
src/org/apache/cocoon/xml/dom DOMBuilder.java
DOMStreamer.java SVGBuilder.java
src/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java
XLinkHandler.java XLinkPipe.java
test/org/apache/cocoon/util IOUtilsTest.java
Log:
Optimize imports
Revision Changes Path
1.3 +152 -152 xml-cocoon2/LISCENSE.resolver
Index: LISCENSE.resolver
===================================================================
RCS file: /home/cvs/xml-cocoon2/LISCENSE.resolver,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LISCENSE.resolver 2001/10/08 19:35:16 1.2
+++ LISCENSE.resolver 2001/10/08 20:03:10 1.3
@@ -1,153 +1,153 @@
-Software License Agreement
-
-SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE
-XML ENTITY AND URI RESOLVERS, VERSION 1.0 SOFTWARE TO YOU
-ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS
-CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE
-READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY.
-BY INSTALLING THIS SOFTWARE, YOU ACCEPT THE TERMS AND
-CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE
-BOUND BY ITS TERMS, SELECT THE "DECLINE" BUTTON AT THE
-BOTTOM OF THIS PAGE AND THE INSTALLATION PROCESS WILL NOT
-CONTINUE.
-
-1.0 DEFINITIONS "Licensed Software" means the XML Entity and
-URI Resolvers, Version 1.0 Software and any other machine
-readable materials (including, but not limited to,
-libraries, source files, header files, and data files) and
-any user manuals, programming guides and other documentation
-provided to you by Sun under this Agreement.
-
-2.0 LIMITED LICENSE 2.1 Sun grants to you, a non-exclusive,
-non-transferable, royalty-free and limited license to
-reproduce, modify, and create derivative works of the
-Licensed Software for the sole purpose of adding value and
-improving the Licensed Software for the development of
-applications ("Programs"). No license is granted to you for
-any other purpose. 2.2 In addition to the license granted
-in Section 2.1, Sun grants to you, a non-exclusive,
-non-transferable, royalty-free and limited license to
-distribute the Licensed Software modified by you as
-permitted in Section 2.1 ("Modified Software") in source or
-binary form, provided that; i) the Modified Software is only
-distributed bundled as a part of your Programs, ii) the
-Modified Software improves on and adds value to the Licensed
-Software, and iii) the Programs are only distributed subject
-to a license agreement that protects Sun's interests
-consistent with the terms and conditions contained in this
-Agreement.
-
-3.0 LICENSE RESTRICTIONS 3.1 You agree to reproduce any
-copyright and other proprietary right notices on any such
-copy. 3.2 Except as otherwise provided by Section 2.0, you
-may not modify or create derivative works of the Licensed
-Software, or reverse engineer, disassemble or decompile
-binary portions of the Licensed Software, or otherwise
-attempt to derive the source code from such portions. 3.3
-No right, title, or interest in or to Licensed Software, any
-trademarks, service marks, or trade names of Sun or Sun's
-licensors is granted under this Agreement.
-
-4.0 NO SUPPORT Sun is under no obligation to support
-Licensed Software or to provide you with updates or error
-corrections (collectively "Software Updates"). If Sun at
-its sole option, supplies Software Updates to you, the
-Software Updates will be considered part of Licensed
-Software, and subject to the terms of this Agreement.
-
-5.0 TERM AND TERMINATION OF AGREEMENT 5.1 You may terminate
-this Agreement at any time by destroying all copies of
-Software. 5.2 Either party may terminate this Agreement
-immediately should any Software become, or in either party's
-opinion be likely to become, the subject of a claim of
-infringement of any intellectual property right. 5.3 This
-Agreement will terminate immediately without notice from Sun
-if the you fail to comply with any provision of this
-Agreement. 5.4 Upon termination or expiration of this
-Agreement, you shall immediately cease use of and destroy
-Licensed Software and any copies thereof. 5.5 Rights and
-obligations under this Agreement which by their nature
-should survive, will remain in effect after termination or
-expiration hereof.
-
-6.0 DISCLAIMER OF WARRANTY 6.1 Licensee acknowledges that
-Licensed Software may contain errors and is not designed or
-intended for use in the design, construction, operation or
-maintenance of any nuclear facility ("High Risk
-Activities"). Sun disclaims any express or implied warranty
-of fitness for such uses. You represent and warrant to Sun
-that you will not use, distribute or license the Licensed
-Software for High Risk Activities. 6.2 LICENSED SOFTWARE IS
-PROVIDED "AS IS". ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS, AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS
-FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE
-DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE
-HELD TO BE LEGALLY INVALID.
-
-7.0 LIMITATION OF LIABILITY 7.1 You acknowledge that the
-Licensed Software is experimental. You acknowledge that the
-Licensed Software may have defects or deficiencies which
-cannot or will not be corrected by Sun. You will hold Sun
-harmless from any claims based on your use or inability to
-use the Licensed Software for any purpose, and from any
-claims that later versions or releases of any Licensed
-Software furnished to you are incompatible with the Licensed
-Software provided to you under this Agreement. 7.2 You
-shall have the sole responsibility to protect adequately and
-backup your data and/or equipment used in connection with
-the Licensed Software. You shall not claim against Sun for
-lost data, re-run time, inaccurate output, work delays or
-lost profits resulting from your use of the Licensed
-Software. 7.3 Neither party will be liable for any
-indirect, punitive, special, incidental or consequential
-damage in connection with or arising out of this Agreement
-(including loss of business, revenue, profits, use, data or
-other economic advantage), however it arises, whether for
-breach or in tort, even if that party has been previously
-advised of the possibility of such damage.
-
-8.0 U.S. GOVERNMENT RIGHTS If this Software is being
-acquired by or on behalf of the U.S. Government or by a
-U.S. Government prime contractor or subcontractor (at any
-tier), then the Government's rights in the Software and
-accompanying documentation shall be only as set forth in
-this license; this is in accordance with 48 C.F.R. 227.7201
-through 227.7202-4 (for Department of Defense (DoD)
-acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for
-non-DoD acquisitions).
-
-9.0 GENERAL TERMS 9.1 Any action related to this Agreement
-will be governed by California law and controlling U.S.
-federal law. The U.N. Convention for the International
-Sale of Goods and the choice of law rules of any
-jurisdiction will not apply. 9.2 Licensed Software and
-technical data delivered under this Agreement are subject to
-U.S. export control laws and may be subject to export or
-import regulations in other countries. You agree to comply
-strictly with all such laws and regulations and acknowledge
-that you have the responsibility to obtain such licenses to
-export, re-export or import as may be required after
-delivery to you. 9.3 Neither party may assign or otherwise
-transfer any of its rights or obligations under this
-Agreement, without the prior written consent of the other
-party, except that Sun may assign this Agreement to an
-affiliated company. 9.4 This Agreement is the parties'
-entire agreement relating to its subject matter. It
-supersedes all prior or contemporaneous oral or written
-communications, proposals, conditions, representations and
-warranties and prevails over any conflicting or additional
-terms of any quote, order, acknowledgment, or other
-communication between the parties relating to its subject
-matter during the term of this Agreement. No modification
-to this Agreement will be binding, unless in writing and
-signed by an authorized representative of each party.
-
-For inquiries please contact: Sun Microsystems, Inc. 901
-San Antonio Road, Palo Alto, California 94303
-
-Copyright 2001 Sun Microsystems, Inc., All rights reserved.
-(LFI# 90748/FORMID#011801)
-
-
+Software License Agreement
+
+SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE
+XML ENTITY AND URI RESOLVERS, VERSION 1.0 SOFTWARE TO YOU
+ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS
+CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE
+READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY.
+BY INSTALLING THIS SOFTWARE, YOU ACCEPT THE TERMS AND
+CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE
+BOUND BY ITS TERMS, SELECT THE "DECLINE" BUTTON AT THE
+BOTTOM OF THIS PAGE AND THE INSTALLATION PROCESS WILL NOT
+CONTINUE.
+
+1.0 DEFINITIONS "Licensed Software" means the XML Entity and
+URI Resolvers, Version 1.0 Software and any other machine
+readable materials (including, but not limited to,
+libraries, source files, header files, and data files) and
+any user manuals, programming guides and other documentation
+provided to you by Sun under this Agreement.
+
+2.0 LIMITED LICENSE 2.1 Sun grants to you, a non-exclusive,
+non-transferable, royalty-free and limited license to
+reproduce, modify, and create derivative works of the
+Licensed Software for the sole purpose of adding value and
+improving the Licensed Software for the development of
+applications ("Programs"). No license is granted to you for
+any other purpose. 2.2 In addition to the license granted
+in Section 2.1, Sun grants to you, a non-exclusive,
+non-transferable, royalty-free and limited license to
+distribute the Licensed Software modified by you as
+permitted in Section 2.1 ("Modified Software") in source or
+binary form, provided that; i) the Modified Software is only
+distributed bundled as a part of your Programs, ii) the
+Modified Software improves on and adds value to the Licensed
+Software, and iii) the Programs are only distributed subject
+to a license agreement that protects Sun's interests
+consistent with the terms and conditions contained in this
+Agreement.
+
+3.0 LICENSE RESTRICTIONS 3.1 You agree to reproduce any
+copyright and other proprietary right notices on any such
+copy. 3.2 Except as otherwise provided by Section 2.0, you
+may not modify or create derivative works of the Licensed
+Software, or reverse engineer, disassemble or decompile
+binary portions of the Licensed Software, or otherwise
+attempt to derive the source code from such portions. 3.3
+No right, title, or interest in or to Licensed Software, any
+trademarks, service marks, or trade names of Sun or Sun's
+licensors is granted under this Agreement.
+
+4.0 NO SUPPORT Sun is under no obligation to support
+Licensed Software or to provide you with updates or error
+corrections (collectively "Software Updates"). If Sun at
+its sole option, supplies Software Updates to you, the
+Software Updates will be considered part of Licensed
+Software, and subject to the terms of this Agreement.
+
+5.0 TERM AND TERMINATION OF AGREEMENT 5.1 You may terminate
+this Agreement at any time by destroying all copies of
+Software. 5.2 Either party may terminate this Agreement
+immediately should any Software become, or in either party's
+opinion be likely to become, the subject of a claim of
+infringement of any intellectual property right. 5.3 This
+Agreement will terminate immediately without notice from Sun
+if the you fail to comply with any provision of this
+Agreement. 5.4 Upon termination or expiration of this
+Agreement, you shall immediately cease use of and destroy
+Licensed Software and any copies thereof. 5.5 Rights and
+obligations under this Agreement which by their nature
+should survive, will remain in effect after termination or
+expiration hereof.
+
+6.0 DISCLAIMER OF WARRANTY 6.1 Licensee acknowledges that
+Licensed Software may contain errors and is not designed or
+intended for use in the design, construction, operation or
+maintenance of any nuclear facility ("High Risk
+Activities"). Sun disclaims any express or implied warranty
+of fitness for such uses. You represent and warrant to Sun
+that you will not use, distribute or license the Licensed
+Software for High Risk Activities. 6.2 LICENSED SOFTWARE IS
+PROVIDED "AS IS". ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS, AND WARRANTIES, INCLUDING ANY IMPLIED
+WARRANTY OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS
+FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE
+DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE
+HELD TO BE LEGALLY INVALID.
+
+7.0 LIMITATION OF LIABILITY 7.1 You acknowledge that the
+Licensed Software is experimental. You acknowledge that the
+Licensed Software may have defects or deficiencies which
+cannot or will not be corrected by Sun. You will hold Sun
+harmless from any claims based on your use or inability to
+use the Licensed Software for any purpose, and from any
+claims that later versions or releases of any Licensed
+Software furnished to you are incompatible with the Licensed
+Software provided to you under this Agreement. 7.2 You
+shall have the sole responsibility to protect adequately and
+backup your data and/or equipment used in connection with
+the Licensed Software. You shall not claim against Sun for
+lost data, re-run time, inaccurate output, work delays or
+lost profits resulting from your use of the Licensed
+Software. 7.3 Neither party will be liable for any
+indirect, punitive, special, incidental or consequential
+damage in connection with or arising out of this Agreement
+(including loss of business, revenue, profits, use, data or
+other economic advantage), however it arises, whether for
+breach or in tort, even if that party has been previously
+advised of the possibility of such damage.
+
+8.0 U.S. GOVERNMENT RIGHTS If this Software is being
+acquired by or on behalf of the U.S. Government or by a
+U.S. Government prime contractor or subcontractor (at any
+tier), then the Government's rights in the Software and
+accompanying documentation shall be only as set forth in
+this license; this is in accordance with 48 C.F.R. 227.7201
+through 227.7202-4 (for Department of Defense (DoD)
+acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for
+non-DoD acquisitions).
+
+9.0 GENERAL TERMS 9.1 Any action related to this Agreement
+will be governed by California law and controlling U.S.
+federal law. The U.N. Convention for the International
+Sale of Goods and the choice of law rules of any
+jurisdiction will not apply. 9.2 Licensed Software and
+technical data delivered under this Agreement are subject to
+U.S. export control laws and may be subject to export or
+import regulations in other countries. You agree to comply
+strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to
+export, re-export or import as may be required after
+delivery to you. 9.3 Neither party may assign or otherwise
+transfer any of its rights or obligations under this
+Agreement, without the prior written consent of the other
+party, except that Sun may assign this Agreement to an
+affiliated company. 9.4 This Agreement is the parties'
+entire agreement relating to its subject matter. It
+supersedes all prior or contemporaneous oral or written
+communications, proposals, conditions, representations and
+warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other
+communication between the parties relating to its subject
+matter during the term of this Agreement. No modification
+to this Agreement will be binding, unless in writing and
+signed by an authorized representative of each party.
+
+For inquiries please contact: Sun Microsystems, Inc. 901
+San Antonio Road, Palo Alto, California 94303
+
+Copyright 2001 Sun Microsystems, Inc., All rights reserved.
+(LFI# 90748/FORMID#011801)
+
+
1.4 +4 -2 xml-cocoon2/bin/src/st.java
Index: st.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/bin/src/st.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- st.java 2001/07/17 09:28:52 1.3
+++ st.java 2001/10/08 20:03:10 1.4
@@ -5,7 +5,9 @@
* version 1.1, a copy of which has been included with this distribution in
*
* the LICENSE file.
*
*****************************************************************************/
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
/**
* This is a quick and dirty commandline tool which can add new
@@ -31,7 +33,7 @@
* Pretty printing
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/17 09:28:52 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $
*/
public class st {
1.29 +43 -44 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Cocoon.java 2001/09/28 21:21:29 1.28
+++ Cocoon.java 2001/10/08 20:03:10 1.29
@@ -7,49 +7,48 @@
*****************************************************************************/
package org.apache.cocoon;
-import org.apache.avalon.excalibur.component.DefaultRoleManager;
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-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.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.components.hsqldb.Server;
-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.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.environment.ModifiableSource;
-import org.apache.cocoon.sitemap.AbstractSitemap;
-import org.apache.cocoon.sitemap.Manager;
-import org.apache.cocoon.util.ClassUtils;
-import org.xml.sax.InputSource;
-
-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 org.apache.avalon.excalibur.component.DefaultRoleManager;
+import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
+import org.apache.avalon.excalibur.logger.LogKitManageable;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.hsqldb.Server;
+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.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.ModifiableSource;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.sitemap.AbstractSitemap;
+import org.apache.cocoon.sitemap.Manager;
+import org.apache.cocoon.util.ClassUtils;
+import org.xml.sax.InputSource;
+
+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;
/**
@@ -58,7 +57,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
(Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
- * @version CVS $Revision: 1.28 $ $Date: 2001/09/28 21:21:29 $
+ * @version CVS $Revision: 1.29 $ $Date: 2001/10/08 20:03:10 $
*/
public class Cocoon
extends AbstractLoggable
1.3 +2 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CodeFactory.java 2001/08/20 13:55:09 1.2
+++ CodeFactory.java 2001/10/08 20:03:10 1.3
@@ -8,7 +8,7 @@
package org.apache.cocoon;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
/**
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:10 $
*/
public interface CodeFactory {
1.20 +22 -42 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Main.java 2001/10/08 06:18:42 1.19
+++ Main.java 2001/10/08 20:03:10 1.20
@@ -8,53 +8,33 @@
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.excalibur.logger.DefaultLogKitManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.configuration.Configuration;
-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.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.excalibur.logger.DefaultLogKitManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+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.Logger;
+import org.apache.log.Priority;
+
+import java.io.*;
+import java.util.*;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.TreeMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.19 $ $Date: 2001/10/08 06:18:42 $
+ * @version CVS $Revision: 1.20 $ $Date: 2001/10/08 20:03:10 $
*/
public class Main {
1.5 +5 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Notification.java 2001/08/20 13:55:09 1.4
+++ Notification.java 2001/10/08 20:03:10 1.5
@@ -8,11 +8,11 @@
package org.apache.cocoon;
-import org.apache.avalon.framework.CascadingThrowable;
-import org.xml.sax.SAXException;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import org.apache.avalon.framework.CascadingThrowable;
+import org.xml.sax.SAXException;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.HashMap;
1.5 +8 -8 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Notifier.java 2001/08/20 13:55:09 1.4
+++ Notifier.java 2001/10/08 20:03:10 1.5
@@ -8,13 +8,13 @@
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.util.HashMap;
+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.util.HashMap;
import java.util.Iterator;
/**
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:10 $
*/
public class Notifier {
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessingException.java 2001/08/22 03:51:05 1.4
+++ ProcessingException.java 2001/10/08 20:03:10 1.5
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon;
-import org.apache.avalon.framework.CascadingException;
-
-import java.io.PrintStream;
+import org.apache.avalon.framework.CascadingException;
+
+import java.io.PrintStream;
import java.io.PrintWriter;
/**
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:10 $
*/
public class ProcessingException extends CascadingException {
1.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Processor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Processor.java 2001/07/20 07:26:53 1.3
+++ Processor.java 2001/10/08 20:03:10 1.4
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/20 07:26:53 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $
*/
public interface Processor {
1.2 +6 -6 xml-cocoon2/src/org/apache/cocoon/ProcessorWrapper.java
Index: ProcessorWrapper.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/ProcessorWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessorWrapper.java 2001/07/09 13:19:49 1.1
+++ ProcessorWrapper.java 2001/10/08 20:03:10 1.2
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
/**
* This class is a wrapper around the real processor (the
<code>Cocoon</code> class).
* It is necessary to avoid infinite dispose loops
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/07/09 13:19:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:10 $
*/
public final class ProcessorWrapper
implements Processor, Component, Disposable, ThreadSafe {
1.8 +9 -9
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractAction.java 2001/08/20 13:55:09 1.7
+++ AbstractAction.java 2001/10/08 20:03:10 1.8
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-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 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;
/**
@@ -23,7 +23,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:10 $
*/
public abstract class AbstractAction extends AbstractLoggable
implements Action, Configurable, Disposable {
1.11 +10 -10
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractComplementaryConfigurableAction.java 2001/08/25 19:40:31
1.10
+++ AbstractComplementaryConfigurableAction.java 2001/10/08 20:03:10
1.11
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-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.Constants;
-import org.apache.cocoon.components.source.SourceHandler;
-import org.apache.cocoon.environment.Source;
-
-import java.util.HashMap;
+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.Constants;
+import org.apache.cocoon.components.source.SourceHandler;
+import org.apache.cocoon.environment.Source;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -26,7 +26,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/25 19:40:31 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/08 20:03:10 $
*/
public abstract class AbstractComplementaryConfigurableAction extends
ConfigurableComposerAction {
private static Map configurations = new HashMap();
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractConfigurableAction.java 2001/08/20 13:55:09 1.3
+++ AbstractConfigurableAction.java 2001/10/08 20:03:10 1.4
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.util.HashMap;
/**
@@ -17,7 +17,7 @@
* deploying more Actions that take default parameters.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $ */
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $ */
public abstract class AbstractConfigurableAction extends AbstractAction
implements Configurable {
/**
1.12 +19 -30
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractDatabaseAction.java 2001/09/06 19:56:22 1.11
+++ AbstractDatabaseAction.java 2001/10/08 20:03:10 1.12
@@ -7,35 +7,24 @@
*****************************************************************************/
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;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.HashMap;
+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.*;
+import java.math.BigDecimal;
+import java.sql.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -158,7 +147,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/09/06 19:56:22 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:10 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
1.10 +9 -9
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractValidatorAction.java 2001/09/03 10:25:52 1.9
+++ AbstractValidatorAction.java 2001/10/08 20:03:10 1.10
@@ -1,12 +1,12 @@
-// $Id: AbstractValidatorAction.java,v 1.9 2001/09/03 10:25:52 mman Exp $
+// $Id: AbstractValidatorAction.java,v 1.10 2001/10/08 20:03:10 bloritsch
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.configuration.ConfigurationException;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
-
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
+
import java.util.Map;
/**
@@ -97,7 +97,7 @@
* </table>
* @author Martin Man <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
-* @version CVS $Revision: 1.9 $ $Date: 2001/09/03 10:25:52 $
+* @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:10 $
*/
public abstract class AbstractValidatorAction
extends AbstractComplementaryConfigurableAction
@@ -645,5 +645,5 @@
}
-// $Id: AbstractValidatorAction.java,v 1.9 2001/09/03 10:25:52 mman Exp $
+// $Id: AbstractValidatorAction.java,v 1.10 2001/10/08 20:03:10 bloritsch
Exp $
// vim: set et ts=4 sw=4:
1.7 +6 -6 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Action.java 2001/08/22 12:03:32 1.6
+++ Action.java 2001/10/08 20:03:10 1.7
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
-
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
+
import java.util.Map;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:10 $
*/
public interface Action extends Component {
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComposerAction.java 2001/08/20 13:55:09 1.2
+++ ComposerAction.java 2001/10/08 20:03:10 1.3
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.component.ComponentException;
-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;
/**
@@ -16,7 +16,7 @@
* that extends this to access SitemapComponents.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:10 $
*/
public abstract class ComposerAction extends AbstractAction implements
Composable {
1.4 +3 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurableComposerAction.java 2001/08/20 13:55:09 1.3
+++ ConfigurableComposerAction.java 2001/10/08 20:03:10 1.4
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.component.ComponentException;
-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;
/**
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $ */
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $ */
public abstract class ConfigurableComposerAction extends
AbstractConfigurableAction implements Composable {
/** The component manager instance */
1.12 +17 -23
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DatabaseAddAction.java 2001/08/22 12:03:32 1.11
+++ DatabaseAddAction.java 2001/10/08 20:03:10 1.12
@@ -7,29 +7,23 @@
*****************************************************************************/
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.avalon.framework.thread.ThreadSafe;
-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.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.avalon.framework.thread.ThreadSafe;
+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.util.*;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
/**
* Adds record in a database. The action can update one or more tables,
* and can add more than one row to a table at a time. The form descriptor
@@ -39,7 +33,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:10 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction implements
ThreadSafe {
protected static final Map addStatements = new HashMap();
1.14 +18 -18
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DatabaseAuthenticatorAction.java 2001/08/25 12:57:30 1.13
+++ DatabaseAuthenticatorAction.java 2001/10/08 20:03:10 1.14
@@ -1,21 +1,21 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.13 2001/08/25 12:57:30 mman Exp
$
+// $Id: DatabaseAuthenticatorAction.java,v 1.14 2001/10/08 20:03:10
bloritsch Exp $
package org.apache.cocoon.acting;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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 java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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 java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -54,7 +54,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.13 $ $Date: 2001/08/25 12:57:30 $
+ * @version CVS $Revision: 1.14 $ $Date: 2001/10/08 20:03:10 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
implements ThreadSafe
{
@@ -272,5 +272,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.13 2001/08/25 12:57:30 mman Exp
$
+// $Id: DatabaseAuthenticatorAction.java,v 1.14 2001/10/08 20:03:10
bloritsch Exp $
// vim: set et ts=4 sw=4:
1.10 +16 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatabaseDeleteAction.java 2001/08/22 12:03:32 1.9
+++ DatabaseDeleteAction.java 2001/10/08 20:03:10 1.10
@@ -7,21 +7,21 @@
*****************************************************************************/
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.avalon.framework.thread.ThreadSafe;
-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.SQLException;
-import java.util.HashMap;
+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.avalon.framework.thread.ThreadSafe;
+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.SQLException;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,7 +32,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:10 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction
implements ThreadSafe {
private static final Map deleteStatements = new HashMap();
1.4 +17 -17
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatabaseSelectAction.java 2001/08/22 12:03:32 1.3
+++ DatabaseSelectAction.java 2001/10/08 20:03:10 1.4
@@ -7,22 +7,22 @@
*****************************************************************************/
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.avalon.framework.thread.ThreadSafe;
-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.util.HashMap;
+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.avalon.framework.thread.ThreadSafe;
+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.util.HashMap;
import java.util.Map;
/**
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $
*/
public class DatabaseSelectAction extends AbstractDatabaseAction implements
ThreadSafe {
1.11 +16 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DatabaseUpdateAction.java 2001/08/22 12:03:32 1.10
+++ DatabaseUpdateAction.java 2001/10/08 20:03:10 1.11
@@ -7,21 +7,21 @@
*****************************************************************************/
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.avalon.framework.thread.ThreadSafe;
-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.SQLException;
-import java.util.HashMap;
+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.avalon.framework.thread.ThreadSafe;
+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.SQLException;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -29,7 +29,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/08 20:03:10 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map updateStatements = new HashMap();
1.11 +13 -13
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FormValidatorAction.java 2001/08/22 12:03:32 1.10
+++ FormValidatorAction.java 2001/10/08 20:03:10 1.11
@@ -1,16 +1,16 @@
-// $Id: FormValidatorAction.java,v 1.10 2001/08/22 12:03:32 sylvain Exp $
+// $Id: FormValidatorAction.java,v 1.11 2001/10/08 20:03:10 bloritsch Exp $
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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.util.Tokenizer;
-
-import java.util.HashMap;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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.util.Tokenizer;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -55,7 +55,7 @@
*
* @author Martin Man <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/08 20:03:10 $
*/
public class FormValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
@@ -205,5 +205,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.10 2001/08/22 12:03:32 sylvain Exp $
+// $Id: FormValidatorAction.java,v 1.11 2001/10/08 20:03:10 bloritsch Exp $
// vim: set et ts=4 sw=4:
1.6 +9 -9 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HelloAction.java 2001/08/22 12:03:32 1.5
+++ HelloAction.java 2001/10/08 20:03:10 1.6
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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 java.util.Map;
/**
@@ -22,7 +22,7 @@
* has been created or not.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:10 $
*/
public class HelloAction extends ComposerAction implements ThreadSafe {
1.5 +11 -11
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpHeaderAction.java 2001/08/22 12:03:32 1.4
+++ HttpHeaderAction.java 2001/10/08 20:03:10 1.5
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.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;
/**
1.7 +9 -20 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LangSelect.java 2001/08/22 12:03:32 1.6
+++ LangSelect.java 2001/10/08 20:03:10 1.7
@@ -7,26 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.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;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.*;
+
+import java.util.*;
/**
* LangSelect Action returns two character language code to sitemap.
1.5 +10 -15
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocaleAction.java 2001/08/22 12:03:32 1.4
+++ LocaleAction.java 2001/10/08 20:03:10 1.5
@@ -7,21 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.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 org.apache.regexp.RE;
-
-import java.util.HashMap;
-import java.util.Locale;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.*;
+import org.apache.regexp.RE;
+
+import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
1.7 +22 -29
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OraAddAction.java 2001/08/20 15:22:16 1.6
+++ OraAddAction.java 2001/10/08 20:03:10 1.7
@@ -7,42 +7,35 @@
*****************************************************************************/
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;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
+import oracle.jdbc.OracleResultSet;
+import oracle.sql.BLOB;
+import oracle.sql.CLOB;
+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.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Map;
-import oracle.jdbc.OracleResultSet;
-import oracle.sql.CLOB;
-import oracle.sql.BLOB;
-
/**
* Add a record in a database. This Action assumes that there is
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 15:22:16 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:10 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
1.7 +10 -10
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestParamAction.java 2001/09/26 13:15:59 1.6
+++ RequestParamAction.java 2001/10/08 20:03:10 1.7
@@ -14,15 +14,15 @@
/*
* Standard imports
*/
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Enumeration;
-import java.util.HashMap;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Revision: 1.6 $
+ * @version CVS $Revision: 1.7 $
*/
public class RequestParamAction extends ComposerAction implements ThreadSafe
{
1.11 +9 -9
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResourceExistsAction.java 2001/08/22 12:03:32 1.10
+++ ResourceExistsAction.java 2001/10/08 20:03:10 1.11
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-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.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
+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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -23,7 +23,7 @@
* null otherwise. It has only been tested with context urls.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/08 20:03:10 $
*/
public class ResourceExistsAction extends ComposerAction implements
ThreadSafe {
1.5 +17 -17
xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptAction.java 2001/09/06 19:56:22 1.4
+++ ScriptAction.java 2001/10/08 20:03:10 1.5
@@ -10,23 +10,23 @@
// Cocoon imports
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.IOUtils;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.io.FileNotFoundException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Collections;
-import java.util.HashMap;
+import com.ibm.bsf.BSFException;
+import com.ibm.bsf.BSFManager;
+import com.ibm.bsf.util.IOUtils;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.io.FileNotFoundException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
1.9 +10 -20
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SendmailAction.java 2001/09/21 09:23:45 1.8
+++ SendmailAction.java 2001/10/08 20:03:10 1.9
@@ -7,26 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
-
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.*;
/**
* The SendmailAction class sends email. The action needs four parameters:
1.7 +19 -19
xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerPagesAction.java 2001/08/30 19:15:43 1.6
+++ ServerPagesAction.java 2001/10/08 20:03:10 1.7
@@ -7,24 +7,24 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
-import org.apache.cocoon.components.sax.XMLByteStreamFragment;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.generation.ServerPagesGenerator;
-import org.apache.cocoon.xml.AbstractXMLConsumer;
-
-import java.util.HashMap;
+import org.apache.avalon.excalibur.component.ComponentHandler;
+import org.apache.avalon.excalibur.logger.LogKitManageable;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
+import org.apache.cocoon.components.sax.XMLByteStreamFragment;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.generation.ServerPagesGenerator;
+import org.apache.cocoon.xml.AbstractXMLConsumer;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -61,7 +61,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:10 $
*/
public class ServerPagesAction
extends ConfigurableComposerAction
1.6 +13 -13
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionInvalidatorAction.java 2001/08/22 12:03:32 1.5
+++ SessionInvalidatorAction.java 2001/10/08 20:03:10 1.6
@@ -1,16 +1,16 @@
-// $Id: SessionInvalidatorAction.java,v 1.5 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionInvalidatorAction.java,v 1.6 2001/10/08 20:03:10 bloritsch
Exp $
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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 java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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 java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -18,7 +18,7 @@
* empty map if everything is ok, null otherwise.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:10 $
*/
public class SessionInvalidatorAction extends AbstractAction implements
ThreadSafe
{
@@ -50,5 +50,5 @@
}
}
-// $Id: SessionInvalidatorAction.java,v 1.5 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionInvalidatorAction.java,v 1.6 2001/10/08 20:03:10 bloritsch
Exp $
// vim: set et ts=4 sw=4:
1.4 +10 -10
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionIsValidAction.java 2001/08/22 12:03:32 1.3
+++ SessionIsValidAction.java 2001/10/08 20:03:10 1.4
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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 java.util.HashMap;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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 java.util.HashMap;
import java.util.Map;
@@ -24,7 +24,7 @@
* seesion is still valid.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:10 $
*/
public class SessionIsValidAction extends AbstractValidatorAction implements
ThreadSafe
1.7 +15 -15
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionPropagatorAction.java 2001/08/22 12:03:32 1.6
+++ SessionPropagatorAction.java 2001/10/08 20:03:10 1.7
@@ -1,18 +1,18 @@
-// $Id: SessionPropagatorAction.java,v 1.6 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionPropagatorAction.java,v 1.7 2001/10/08 20:03:10 bloritsch Exp
$
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -29,7 +29,7 @@
* </pre>
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:10 $
*/
public class SessionPropagatorAction extends AbstractConfigurableAction
implements ThreadSafe
{
@@ -115,6 +115,6 @@
}
}
-// $Id: SessionPropagatorAction.java,v 1.6 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionPropagatorAction.java,v 1.7 2001/10/08 20:03:10 bloritsch Exp
$
// vim: set et ts=4 sw=4:
1.6 +12 -12
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionStateAction.java 2001/09/18 14:47:00 1.5
+++ SessionStateAction.java 2001/10/08 20:03:10 1.6
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.HashMap;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -69,7 +69,7 @@
* @see org.apache.cocoon.selection.SessionAttributeSelectorFactory
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Id: SessionStateAction.java,v 1.5 2001/09/18 14:47:00 haul
Exp $ */
+ * @version CVS $Id: SessionStateAction.java,v 1.6 2001/10/08 20:03:10
bloritsch Exp $ */
public class SessionStateAction extends AbstractConfigurableAction
implements ThreadSafe {
protected String statekey = "org.apache.cocoon.SessionState";
1.11 +15 -15
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SessionValidatorAction.java 2001/08/22 12:03:32 1.10
+++ SessionValidatorAction.java 2001/10/08 20:03:10 1.11
@@ -1,18 +1,18 @@
-// $Id: SessionValidatorAction.java,v 1.10 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionValidatorAction.java,v 1.11 2001/10/08 20:03:10 bloritsch Exp
$
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-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 java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+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 java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
@@ -52,7 +52,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/10/08 20:03:10 $
*/
public class SessionValidatorAction extends AbstractValidatorAction
implements ThreadSafe
{
@@ -197,5 +197,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.10 2001/08/22 12:03:32 sylvain Exp $
+// $Id: SessionValidatorAction.java,v 1.11 2001/10/08 20:03:10 bloritsch Exp
$
// vim: set et ts=4 sw=4:
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AggregatedCacheValidity.java 2001/08/20 13:55:10 1.2
+++ AggregatedCacheValidity.java 2001/10/08 20:03:11 1.3
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
/**
* A validation object using a List.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:11 $
*/
public final class AggregatedCacheValidity
implements CacheValidity {
1.4 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CachingOutputStream.java
Index: CachingOutputStream.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CachingOutputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CachingOutputStream.java 2001/07/12 06:23:19 1.3
+++ CachingOutputStream.java 2001/10/08 20:03:11 1.4
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import java.io.IOException;
+import java.io.IOException;
import java.io.OutputStream;
/**
@@ -16,7 +16,7 @@
* TeeOutputStream.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/12 06:23:19 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:11 $
*/
public final class CachingOutputStream
1.3 +4 -4
xml-cocoon2/src/org/apache/cocoon/caching/IncludeCacheValidity.java
Index: IncludeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/IncludeCacheValidity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncludeCacheValidity.java 2001/08/20 13:55:10 1.2
+++ IncludeCacheValidity.java 2001/10/08 20:03:11 1.3
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import org.apache.cocoon.environment.SourceResolver;
-
-import java.util.ArrayList;
-import java.util.Iterator;
+import org.apache.cocoon.environment.SourceResolver;
+
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipelineCacheKey.java 2001/08/20 13:55:10 1.3
+++ PipelineCacheKey.java 2001/10/08 20:03:11 1.4
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import java.util.ArrayList;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -15,7 +15,7 @@
* or more <code>ComponentCacheKey</code> objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:11 $
*/
public final class PipelineCacheKey {
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Browser.java 2001/08/20 13:55:10 1.4
+++ Browser.java 2001/10/08 20:03:11 1.5
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.components.browser;
-import org.apache.avalon.framework.component.Component;
-import org.w3c.dom.Document;
-
+import org.apache.avalon.framework.component.Component;
+import org.w3c.dom.Document;
+
import java.util.HashMap;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:11 $
*/
public interface Browser extends Component {
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassLoaderManager.java 2001/08/20 13:55:10 1.3
+++ ClassLoaderManager.java 2001/10/08 20:03:11 1.4
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.classloader;
-import org.apache.avalon.framework.component.Component;
-
-import java.io.File;
+import org.apache.avalon.framework.component.Component;
+
+import java.io.File;
import java.io.IOException;
/**
@@ -19,7 +19,7 @@
* that it can be safely reinstantiated for dynamic class reloading
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:11 $
*/
public interface ClassLoaderManager extends Component {
1.5 +8 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassLoaderManagerImpl.java 2001/08/20 13:55:10 1.4
+++ ClassLoaderManagerImpl.java 2001/10/08 20:03:11 1.5
@@ -7,20 +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.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import java.util.Vector;
/**
* A singleton-like implementation of <code>ClassLoaderManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:11 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager,
ThreadSafe {
/**
1.4 +11 -11
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepositoryClassLoader.java 2001/10/02 19:38:57 1.3
+++ RepositoryClassLoader.java 2001/10/08 20:03:11 1.4
@@ -7,16 +7,16 @@
*****************************************************************************/
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;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Iterator;
+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;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
import java.util.Vector;
/**
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/10/02 19:38:57 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:11 $
*/
public class RepositoryClassLoader extends URLClassLoader implements
Loggable {
1.3 +14 -15
xml-cocoon2/src/org/apache/cocoon/components/hsqldb/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerImpl.java 2001/09/08 16:20:38 1.2
+++ ServerImpl.java 2001/10/08 20:03:12 1.3
@@ -7,22 +7,21 @@
*****************************************************************************/
package org.apache.cocoon.components.hsqldb;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-
-import java.io.File;
-import java.io.IOException;
+import org.apache.avalon.framework.activity.Startable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+
+import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
-import java.util.ArrayList;
/**
* This class runs an instance of HSQLDB Server.
1.4 +8 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JSPEngine.java 2001/08/20 13:55:10 1.3
+++ JSPEngine.java 2001/10/08 20:03:12 1.4
@@ -7,20 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.components.jsp;
-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 javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* A component for loading and running JSP.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:12 $
*/
public interface JSPEngine extends Component {
1.5 +26 -35
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSPEngineImpl.java 2001/09/07 23:00:28 1.4
+++ JSPEngineImpl.java 2001/10/08 20:03:12 1.5
@@ -7,40 +7,31 @@
*****************************************************************************/
package org.apache.cocoon.components.jsp;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-//import org.apache.cocoon.components.parser.Parser;
-//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 org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+import javax.servlet.*;
+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.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.Principal;
+import java.util.Enumeration;
import java.util.Locale;
/**
@@ -48,7 +39,7 @@
* functionality - overrides the output method and returns the byte(s).
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/07 23:00:28 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
*/
public class JSPEngineImpl extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.3 +25 -33
xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java
Index: JSPEngineImplNamedDispatcherInclude.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSPEngineImplNamedDispatcherInclude.java 2001/08/20 13:55:10 1.2
+++ JSPEngineImplNamedDispatcherInclude.java 2001/10/08 20:03:12 1.3
@@ -7,38 +7,30 @@
*****************************************************************************/
package org.apache.cocoon.components.jsp;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.parser.Parser;
-import org.xml.sax.SAXException;
-
-import javax.servlet.RequestDispatcher;
-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 org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.parser.Parser;
+import org.xml.sax.SAXException;
+
+import javax.servlet.*;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.security.Principal;
+import java.util.Enumeration;
import java.util.Locale;
/**
@@ -49,7 +41,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
*/
public class JSPEngineImplNamedDispatcherInclude extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.3 +24 -24
xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java
Index: JSPEngineImplWLS.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSPEngineImplWLS.java 2001/08/20 13:55:10 1.2
+++ JSPEngineImplWLS.java 2001/10/08 20:03:12 1.3
@@ -7,29 +7,29 @@
*****************************************************************************/
package org.apache.cocoon.components.jsp;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.parser.Parser;
-import org.xml.sax.SAXException;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.parser.Parser;
+import org.xml.sax.SAXException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.util.Locale;
/**
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
*/
public class JSPEngineImplWLS extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.2 +15 -20
xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPReader.java
Index: JSPReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSPReader.java 2001/09/07 23:00:28 1.1
+++ JSPReader.java 2001/10/08 20:03:12 1.2
@@ -7,30 +7,25 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-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.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
-import org.apache.cocoon.components.jsp.JSPEngine;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.File;
-import java.io.ByteArrayInputStream;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.jsp.JSPEngine;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.http.HttpEnvironment;
+
+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.File;
import java.io.IOException;
-import java.net.MalformedURLException;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Konstantin Piroumian</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/07 23:00:28 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:12 $
*
* The <code>JSPReader</code> component is used to serve JSP page output data
* in a sitemap pipeline.
1.3 +4 -3
xml-cocoon2/src/org/apache/cocoon/components/language/LanguageException.java
Index: LanguageException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/LanguageException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LanguageException.java 2001/09/19 12:32:37 1.2
+++ LanguageException.java 2001/10/08 20:03:12 1.3
@@ -7,15 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.components.language;
-import org.apache.avalon.framework.CascadingException;
-import java.io.PrintStream;
+import org.apache.avalon.framework.CascadingException;
+
+import java.io.PrintStream;
import java.io.PrintWriter;
/**
* The language exception.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/09/19 12:32:37 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
*/
public class LanguageException extends CascadingException {
/**
1.2 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/language/generator/CompiledComponent.java
Index: CompiledComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/CompiledComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompiledComponent.java 2001/05/09 20:49:49 1.1
+++ CompiledComponent.java 2001/10/08 20:03:12 1.2
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.Composable;
import org.apache.cocoon.Modifiable;
/**
@@ -16,7 +16,7 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:12 $
*/
public interface CompiledComponent extends Component, Composable, Modifiable
{
}
1.10 +16 -20
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeneratorSelector.java 2001/08/30 19:15:43 1.9
+++ GeneratorSelector.java 2001/10/08 20:03:12 1.10
@@ -7,32 +7,28 @@
*****************************************************************************/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.excalibur.component.ComponentHandler;
-import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.classloader.ClassLoaderManager;
+import org.apache.avalon.excalibur.component.ComponentHandler;
+import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.components.classloader.ClassLoaderManager;
+
+import java.io.File;
+import java.util.*;
-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 <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:12 $
*/
public class GeneratorSelector extends ExcaliburComponentSelector implements
Disposable {
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProgramGenerator.java 2001/08/20 13:55:10 1.6
+++ ProgramGenerator.java 2001/10/08 20:03:12 1.7
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.environment.SourceResolver;
/**
@@ -16,7 +16,7 @@
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:10 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:12 $
*/
public interface ProgramGenerator extends Component {
1.20 +27 -31
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ProgramGeneratorImpl.java 2001/08/29 17:26:41 1.19
+++ ProgramGeneratorImpl.java 2001/10/08 20:03:12 1.20
@@ -8,42 +8,38 @@
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.classloader.ClassLoaderManager;
-import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.components.language.markup.MarkupLanguage;
-import
org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
-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.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.IOUtils;
-import org.xml.sax.InputSource;
-
-import java.io.File;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.*;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.classloader.ClassLoaderManager;
+import org.apache.cocoon.components.language.LanguageException;
+import org.apache.cocoon.components.language.markup.MarkupLanguage;
+import
org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
+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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.IOUtils;
+import org.xml.sax.InputSource;
+
+import java.io.File;
import java.net.MalformedURLException;
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.19 $ $Date: 2001/08/29 17:26:41 $
+ * @version CVS $Revision: 1.20 $ $Date: 2001/10/08 20:03:12 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.12 +22 -38
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractMarkupLanguage.java 2001/08/31 13:48:57 1.11
+++ AbstractMarkupLanguage.java 2001/10/08 20:03:12 1.12
@@ -8,44 +8,28 @@
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.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.Source;
-import org.apache.cocoon.components.source.URLSource;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.IOUtils;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
-import org.xml.sax.helpers.XMLReaderFactory;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLFilterImpl;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.*;
-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 <code>MarkupLanguage</code>. This class uses
* logicsheets as the only means of code generation. Code generation
@@ -54,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/08/31 13:48:57 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:12 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable
1.8 +21 -30
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Logicsheet.java 2001/09/24 09:34:43 1.7
+++ Logicsheet.java 2001/10/08 20:03:12 1.8
@@ -8,36 +8,27 @@
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
-
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.URLFactorySourceResolver;
-import org.apache.cocoon.util.TraxErrorHandler;
-import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.components.xslt.XSLTProcessor;
-import org.apache.cocoon.components.source.URLSource;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
-
-import javax.xml.transform.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 org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.components.source.URLSource;
+import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.components.xslt.XSLTProcessor;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.URLFactorySourceResolver;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import javax.xml.transform.sax.TransformerHandler;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
/**
* A code-generation logicsheet. This class is actually a wrapper for
@@ -50,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/09/24 09:34:43 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:12 $
*/
public class Logicsheet extends AbstractLoggable
{
1.4 +15 -15
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogicsheetCodeGenerator.java 2001/08/20 13:55:11 1.3
+++ LogicsheetCodeGenerator.java 2001/10/08 20:03:12 1.4
@@ -7,20 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup;
-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.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 java.io.StringWriter;
+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.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 java.io.StringWriter;
import java.util.Properties;
/**
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:12 $
*/
public class LogicsheetCodeGenerator extends AbstractLoggable implements
MarkupCodeGenerator {
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MarkupCodeGenerator.java 2001/08/20 13:55:11 1.2
+++ MarkupCodeGenerator.java 2001/10/08 20:03:12 1.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup;
-import org.xml.sax.InputSource;
+import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
/**
* This interfaces defines the functionality of a source code generator
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:12 $
*/
public interface MarkupCodeGenerator {
/**
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MarkupLanguage.java 2001/08/20 13:55:11 1.4
+++ MarkupLanguage.java 2001/10/08 20:03:12 1.5
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.avalon.framework.component.Component;
+import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
+import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.InputSource;
/**
@@ -18,7 +18,7 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
*/
public interface MarkupLanguage extends Component {
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NamedLogicsheet.java 2001/08/25 19:40:32 1.3
+++ NamedLogicsheet.java 2001/10/08 20:03:12 1.4
@@ -7,12 +7,12 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.components.url.URLFactory;
+
+import java.io.IOException;
import java.net.MalformedURLException;
-import java.io.IOException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.components.url.URLFactory;
-
/**
* An extension to <code>Logicsheet</code> that is associated with a
namespace.
* Named logicsheets are implicitly declared (and automagically applied) when
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/25 19:40:32 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:12 $
*/
public class NamedLogicsheet extends Logicsheet {
/**
1.5 +18 -23
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SitemapMarkupLanguage.java 2001/08/20 13:55:11 1.4
+++ SitemapMarkupLanguage.java 2001/10/08 20:03:12 1.5
@@ -7,35 +7,30 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.sitemap;
-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.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 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.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.*;
-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 <code>MarkupLanguage</code> for Cocoon's
* <a href="http://xml.apache.org/cocoon/sitemap.html";>Sitemap</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
1.9 +9 -9
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSPCookieHelper.java 2001/09/06 17:50:13 1.8
+++ XSPCookieHelper.java 2001/10/08 20:03:12 1.9
@@ -39,15 +39,15 @@
package org.apache.cocoon.components.language.markup.xsp;
-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 java.util.Enumeration;
-import java.util.Hashtable;
+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 java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Map;
public class XSPCookieHelper extends XSPObjectHelper {
1.13 +15 -15
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSPFormValidatorHelper.java 2001/08/25 19:40:32 1.12
+++ XSPFormValidatorHelper.java 2001/10/08 20:03:12 1.13
@@ -7,27 +7,27 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-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.ConfigurationHelper;
-import org.apache.cocoon.acting.ValidatorActionResult;
-import org.apache.cocoon.components.source.SourceHandler;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Source;
-import org.apache.log.Logger;
-
-import java.util.HashMap;
+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.ConfigurationHelper;
+import org.apache.cocoon.acting.ValidatorActionResult;
+import org.apache.cocoon.components.source.SourceHandler;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Source;
+import org.apache.log.Logger;
+
+import java.util.HashMap;
import java.util.Map;
/**
* The <code>ValidatorActionResult</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/08/25 19:40:32 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/10/08 20:03:12 $
*/
public class XSPFormValidatorHelper {
/**
1.8 +8 -8
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPGenerator.java 2001/08/20 13:55:11 1.7
+++ XSPGenerator.java 2001/10/08 20:03:12 1.8
@@ -7,20 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-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.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;
/**
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:12 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Recyclable {
protected Context avalonContext = null;
1.5 +18 -24
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPMarkupLanguage.java 2001/08/20 13:55:11 1.4
+++ XSPMarkupLanguage.java 2001/10/08 20:03:12 1.5
@@ -7,37 +7,31 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-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.log.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.XMLFilterImpl;
+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.log.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
-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 <code>MarkupLanguage</code> for Cocoon's
* <a href="http://xml.apache.org/cocoon/xsp.html";>XSP</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Sahuc</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:12 $
*/
public class XSPMarkupLanguage extends AbstractMarkupLanguage {
1.6 +10 -12
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSPObjectHelper.java 2001/09/08 04:31:10 1.5
+++ XSPObjectHelper.java 2001/10/08 20:03:12 1.6
@@ -7,17 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.xml.XMLFragment;
-import org.apache.cocoon.xml.XMLizable;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.cocoon.ProcessingException;
-
-import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.Collection;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.xml.XMLizable;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.util.Collection;
import java.util.Iterator;
/**
@@ -26,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
* (Cocoon1 <code>xspExpr()</code> methods port)
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/08 04:31:10 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:12 $
*/
public class XSPObjectHelper {
/**
1.10 +11 -11
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSPRequestHelper.java 2001/09/19 16:07:58 1.9
+++ XSPRequestHelper.java 2001/10/08 20:03:12 1.10
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
import java.util.Map;
/**
* The <code>Request</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/09/19 16:07:58 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:12 $
*/
public class XSPRequestHelper {
/**
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSPResponseHelper.java 2001/08/20 13:55:11 1.3
+++ XSPResponseHelper.java 2001/10/08 20:03:13 1.4
@@ -7,16 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Response;
-
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Response;
+
import java.util.Map;
/**
* The XSP <code>Response</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
*/
public class XSPResponseHelper {
/**
1.6 +16 -24
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSPUtil.java 2001/08/20 13:55:11 1.5
+++ XSPUtil.java 2001/10/08 20:03:13 1.6
@@ -7,36 +7,28 @@
*****************************************************************************/
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;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+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.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Map;
/**
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.5 $ $Date: 2001/08/20 13:55:11 $
+ * @version $Revision: 1.6 $ $Date: 2001/10/08 20:03:13 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
1.3 +9 -9
xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractProgrammingLanguage.java 2001/08/20 13:55:11 1.2
+++ AbstractProgrammingLanguage.java 2001/10/08 20:03:13 1.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.util.ClassUtils;
-
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.components.language.LanguageException;
+import org.apache.cocoon.util.ClassUtils;
+
import java.io.File;
/**
@@ -23,7 +23,7 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
*/
public abstract class AbstractProgrammingLanguage extends AbstractLoggable
implements ProgrammingLanguage, Configurable
1.7 +10 -10
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompiledProgrammingLanguage.java 2001/09/19 12:22:41 1.6
+++ CompiledProgrammingLanguage.java 2001/10/08 20:03:13 1.7
@@ -7,22 +7,22 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.util.IOUtils;
-
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.components.language.LanguageException;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.util.IOUtils;
+
import java.io.File;
/**
* A compiled programming language. This class extends
<code>AbstractProgrammingLanguage</code> adding support for compilation
* and object program files
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/09/19 12:22:41 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:13 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LanguageCompiler.java 2001/08/20 13:55:11 1.2
+++ LanguageCompiler.java 2001/10/08 20:03:13 1.3
@@ -8,16 +8,16 @@
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.component.Component;
-
-import java.io.IOException;
+import org.apache.avalon.framework.component.Component;
+
+import java.io.IOException;
import java.util.List;
/**
* This interface defines a compiler's functionality for all
* (Java-based) compiled languages
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
* @since 2.0
*/
public interface LanguageCompiler extends Component {
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProgrammingLanguage.java 2001/08/20 13:55:11 1.3
+++ ProgrammingLanguage.java 2001/10/08 20:03:13 1.4
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.components.language.generator.CompiledComponent;
-
+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 <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
*/
public interface ProgrammingLanguage extends Component {
1.3 +9 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractJavaCompiler.java 2001/08/20 13:55:11 1.2
+++ AbstractJavaCompiler.java 2001/10/08 20:03:13 1.3
@@ -8,20 +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 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;
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler extends AbstractLoggable
implements LanguageCompiler, Recyclable {
1.9 +18 -18
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaLanguage.java 2001/09/10 18:28:03 1.8
+++ JavaLanguage.java 2001/10/08 20:03:13 1.9
@@ -8,30 +8,30 @@
package org.apache.cocoon.components.language.programming.java;
-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.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.classloader.ClassLoaderManager;
-import org.apache.cocoon.components.language.LanguageException;
-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.util.ClassUtils;
-import org.apache.cocoon.util.JavaArchiveFilter;
-
-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.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.classloader.ClassLoaderManager;
+import org.apache.cocoon.components.language.LanguageException;
+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.util.ClassUtils;
+import org.apache.cocoon.util.JavaArchiveFilter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
import java.util.StringTokenizer;
/**
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/09/10 18:28:03 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/08 20:03:13 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
1.8 +9 -13
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Javac.java 2001/09/10 18:28:03 1.7
+++ Javac.java 2001/10/08 20:03:13 1.8
@@ -8,25 +8,21 @@
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;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
+import org.apache.cocoon.components.language.programming.CompilerError;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.log.Hierarchy;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
import java.util.StringTokenizer;
/**
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.7 $ $Date: 2001/09/10 18:28:03 $
+ * @version $Revision: 1.8 $ $Date: 2001/10/08 20:03:13 $
* @since 2.0
*/
1.7 +6 -11
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jikes.java 2001/08/20 13:55:11 1.6
+++ Jikes.java 2001/10/08 20:03:13 1.7
@@ -8,23 +8,18 @@
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;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.cocoon.components.language.programming.CompilerError;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
/**
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.6 $ $Date: 2001/08/20 13:55:11 $
+ * @version $Revision: 1.7 $ $Date: 2001/10/08 20:03:13 $
* @since 2.0
*/
1.3 +7 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JstyleFormatter.java 2001/08/20 13:55:11 1.2
+++ JstyleFormatter.java 2001/10/08 20:03:13 1.3
@@ -7,24 +7,20 @@
*****************************************************************************/
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 jstyle.JSBeautifier;
+import jstyle.JSFormatter;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.components.language.programming.CodeFormatter;
+
+import java.io.*;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-
/**
* This class implements <code>CodeFormatter</code> based on
* Tal Davidson's ([EMAIL PROTECTED]) <i>Jstyle</i> Java
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:11 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
*/
public class JstyleFormatter extends AbstractLoggable implements
CodeFormatter {
/**
1.3 +5 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavascriptLanguage.java 2001/08/20 13:55:12 1.2
+++ JavascriptLanguage.java 2001/10/08 20:03:13 1.3
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming.javascript;
-import org.apache.cocoon.components.language.LanguageException;
-import org.apache.cocoon.components.language.programming.java.JavaLanguage;
-import org.mozilla.javascript.tools.jsc.Main;
-
+import org.apache.cocoon.components.language.LanguageException;
+import org.apache.cocoon.components.language.programming.java.JavaLanguage;
+import org.mozilla.javascript.tools.jsc.Main;
+
import java.io.File;
/**
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
*/
public class JavascriptLanguage extends JavaLanguage
{
1.9 +13 -21
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JaxpParser.java 2001/08/21 21:20:10 1.8
+++ JaxpParser.java 2001/10/08 20:03:13 1.9
@@ -7,26 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.parser;
-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.thread.SingleThreaded;
-import org.apache.cocoon.components.resolver.Resolver;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.AbstractXMLProducer;
-import org.w3c.dom.DOMImplementation;
-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 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.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.thread.SingleThreaded;
+import org.apache.cocoon.components.resolver.Resolver;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+import javax.xml.parsers.*;
import java.io.IOException;
/**
@@ -34,7 +26,7 @@
* If only we can get rid of the need for the Document...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/08/21 21:20:10 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/10/08 20:03:13 $
*/
public class JaxpParser extends AbstractXMLProducer
implements Parser, ErrorHandler, Composable, SingleThreaded {
1.5 +10 -10
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Parser.java 2001/08/20 13:55:12 1.4
+++ Parser.java 2001/10/08 20:03:13 1.5
@@ -7,22 +7,22 @@
*****************************************************************************/
package org.apache.cocoon.components.parser;
-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.ext.LexicalHandler;
-
+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.ext.LexicalHandler;
+
import java.io.IOException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:13 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
1.4 +17 -17
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesParser.java 2001/09/24 09:19:02 1.3
+++ XercesParser.java 2001/10/08 20:03:13 1.4
@@ -7,29 +7,29 @@
*****************************************************************************/
package org.apache.cocoon.components.parser;
-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.thread.SingleThreaded;
-import org.apache.cocoon.components.resolver.Resolver;
-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.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.thread.SingleThreaded;
+import org.apache.cocoon.components.resolver.Resolver;
+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 java.io.IOException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/09/24 09:19:02 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
*/
public class XercesParser extends AbstractXMLProducer
implements Parser, ErrorHandler, Composable, SingleThreaded {
1.15 +20 -20
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractEventPipeline.java 2001/08/20 13:55:12 1.14
+++ AbstractEventPipeline.java 2001/10/08 20:03:13 1.15
@@ -7,31 +7,31 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-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.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.saxconnector.SAXConnector;
-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;
-
-import java.io.IOException;
-import java.util.ArrayList;
+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.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.saxconnector.SAXConnector;
+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;
+
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED] Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/10/08 20:03:13 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
1.10 +13 -13
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractStreamPipeline.java 2001/08/20 13:55:12 1.9
+++ AbstractStreamPipeline.java 2001/10/08 20:03:13 1.10
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-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.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.reading.Reader;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.sitemap.SitemapComponentSelector;
-import org.apache.cocoon.xml.XMLProducer;
-
+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.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.reading.Reader;
+import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.sitemap.SitemapComponentSelector;
+import org.apache.cocoon.xml.XMLProducer;
+
import java.io.ByteArrayOutputStream;
/** A <CODE>ResourcePipeline</CODE> either
@@ -30,7 +30,7 @@
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:13 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable
implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CacheableEventPipeline.java 2001/08/20 13:55:12 1.3
+++ CacheableEventPipeline.java 2001/10/08 20:03:13 1.4
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-import org.apache.cocoon.caching.PipelineCacheKey;
-import org.apache.cocoon.environment.Environment;
-
+import org.apache.cocoon.caching.PipelineCacheKey;
+import org.apache.cocoon.environment.Environment;
+
import java.util.Map;
/**
@@ -17,7 +17,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:13 $
*/
public interface CacheableEventPipeline {
1.18 +24 -28
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CachingEventPipeline.java 2001/08/20 13:55:12 1.17
+++ CachingEventPipeline.java 2001/10/08 20:03:13 1.18
@@ -7,33 +7,29 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-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.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.CachedEventObject;
-import org.apache.cocoon.caching.ComponentCacheKey;
-import org.apache.cocoon.caching.PipelineCacheKey;
-import org.apache.cocoon.components.sax.XMLDeserializer;
-import org.apache.cocoon.components.sax.XMLSerializer;
-import org.apache.cocoon.components.sax.XMLTeePipe;
-import org.apache.cocoon.components.saxconnector.SAXConnector;
-import org.apache.cocoon.components.store.Store;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.transformation.Transformer;
-import org.apache.cocoon.xml.XMLConsumer;
-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 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.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.*;
+import org.apache.cocoon.components.sax.XMLDeserializer;
+import org.apache.cocoon.components.sax.XMLSerializer;
+import org.apache.cocoon.components.sax.XMLTeePipe;
+import org.apache.cocoon.components.saxconnector.SAXConnector;
+import org.apache.cocoon.components.store.Store;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.transformation.Transformer;
+import org.apache.cocoon.xml.XMLConsumer;
+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;
/**
@@ -45,7 +41,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.17 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.18 $ $Date: 2001/10/08 20:03:13 $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
1.12 +18 -23
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CachingStreamPipeline.java 2001/08/20 13:55:12 1.11
+++ CachingStreamPipeline.java 2001/10/08 20:03:13 1.12
@@ -7,28 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-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.ConnectionResetException;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.CachedStreamObject;
-import org.apache.cocoon.caching.CachingOutputStream;
-import org.apache.cocoon.caching.ComponentCacheKey;
-import org.apache.cocoon.caching.PipelineCacheKey;
-import org.apache.cocoon.components.store.Store;
-import org.apache.cocoon.environment.Environment;
-import org.xml.sax.SAXException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.SocketException;
-import java.util.HashMap;
-import java.util.Iterator;
+import 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.ConnectionResetException;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.*;
+import org.apache.cocoon.components.store.Store;
+import org.apache.cocoon.environment.Environment;
+import org.xml.sax.SAXException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/** A <CODE>StreamPipeline</CODE> either
@@ -46,7 +41,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:13 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
1.8 +6 -6
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EventPipeline.java 2001/08/20 13:55:12 1.7
+++ EventPipeline.java 2001/10/08 20:03:13 1.8
@@ -7,16 +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.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;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:13 $
*/
public interface EventPipeline extends Component, Composable, Recyclable {
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NonCachingStreamPipeline.java 2001/08/20 13:55:12 1.2
+++ NonCachingStreamPipeline.java 2001/10/08 20:03:13 1.3
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Environment;
-
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Environment;
+
import java.io.IOException;
/** A <CODE>ResourcePipeline</CODE> either
@@ -20,7 +20,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:13 $
*/
public final class NonCachingStreamPipeline extends AbstractStreamPipeline {
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StreamPipeline.java 2001/08/20 13:55:12 1.6
+++ StreamPipeline.java 2001/10/08 20:03:13 1.7
@@ -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.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Environment;
/** A <CODE>StreamPipeline</CODE> either
@@ -20,7 +20,7 @@
* <CODE>Serializer</CODE> and let them produce the character stream
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:13 $
*/
public interface StreamPipeline extends Component, Composable, Recyclable {
1.5 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/profiler/Profiler.java
Index: Profiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/Profiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Profiler.java 2001/08/30 19:15:43 1.4
+++ Profiler.java 2001/10/08 20:03:14 1.5
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.framework.component.Component;
-
+import org.apache.avalon.framework.component.Component;
+
import java.util.Collection;
/**
* Profiler component interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:14 $
*/
public interface Profiler extends Component
{
1.3 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerData.java
Index: ProfilerData.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilerData.java 2001/08/20 13:55:12 1.2
+++ ProfilerData.java 2001/10/08 20:03:14 1.3
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.cocoon.util.HashUtil;
-
+import org.apache.cocoon.util.HashUtil;
+
import java.util.ArrayList;
/**
* Request-time profiler information.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:14 $
*/
public class ProfilerData
{
1.4 +14 -14
xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerGenerator.java
Index: ProfilerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilerGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfilerGenerator.java 2001/08/20 13:55:12 1.3
+++ ProfilerGenerator.java 2001/10/08 20:03:14 1.4
@@ -7,26 +7,26 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.cocoon.generation.ComposerGenerator;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.text.DateFormat;
-import java.util.Collection;
-import java.util.Date;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.cocoon.generation.ComposerGenerator;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
import java.util.Iterator;
/**
* Generates an XML representation of the current status of Profiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:14 $
*/
public class ProfilerGenerator extends ComposerGenerator
implements Recyclable, Composable, Disposable {
1.4 +8 -8
xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java
Index: ProfilingCachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingCachingEventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfilingCachingEventPipeline.java 2001/08/20 13:55:12 1.3
+++ ProfilingCachingEventPipeline.java 2001/10/08 20:03:14 1.4
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.pipeline.CachingEventPipeline;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.components.pipeline.CachingEventPipeline;
import org.apache.cocoon.environment.Environment;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:14 $
*/
public class ProfilingCachingEventPipeline extends CachingEventPipeline
implements Recyclable, Composable, Disposable {
1.4 +8 -8
xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java
Index: ProfilingNonCachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingNonCachingEventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfilingNonCachingEventPipeline.java 2001/08/20 13:55:12 1.3
+++ ProfilingNonCachingEventPipeline.java 2001/10/08 20:03:14 1.4
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.pipeline.NonCachingEventPipeline;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.components.pipeline.NonCachingEventPipeline;
import org.apache.cocoon.environment.Environment;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:14 $
*/
public class ProfilingNonCachingEventPipeline extends NonCachingEventPipeline
implements Recyclable, Composable, Disposable {
1.3 +12 -12
xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingSAXConnector.java
Index: ProfilingSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/ProfilingSAXConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilingSAXConnector.java 2001/08/20 13:55:12 1.2
+++ ProfilingSAXConnector.java 2001/10/08 20:03:14 1.3
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.saxconnector.SAXConnector;
-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.SAXException;
-
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.saxconnector.SAXConnector;
+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.SAXException;
+
+import java.io.IOException;
import java.util.Map;
/**
* This SAX connector measures time taken by the following SAX handler.
* @author <a href="[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:14 $
*/
public class ProfilingSAXConnector extends AbstractXMLPipe
implements Recyclable, SAXConnector
1.3 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/profiler/SimpleProfiler.java
Index: SimpleProfiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/profiler/SimpleProfiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleProfiler.java 2001/08/20 13:55:12 1.2
+++ SimpleProfiler.java 2001/10/08 20:03:14 1.3
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.Collection;
-import java.util.HashMap;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -19,7 +19,7 @@
* all pipelines.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:14 $
*/
public class SimpleProfiler extends AbstractLoggable
implements Profiler, ThreadSafe //, Composable, Configurable, Disposable
1.3 +7 -7
xml-cocoon2/src/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
Index: ExtendableRendererFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendableRendererFactory.java 2001/08/20 13:55:12 1.2
+++ ExtendableRendererFactory.java 2001/10/08 20:03:14 1.3
@@ -7,12 +7,12 @@
*****************************************************************************/
package org.apache.cocoon.components.renderer;
-import org.apache.fop.render.Renderer;
-import org.apache.fop.render.pcl.PCLRenderer;
-import org.apache.fop.render.pdf.PDFRenderer;
-import org.apache.fop.render.ps.PSRenderer;
-
-import java.util.HashMap;
+import org.apache.fop.render.Renderer;
+import org.apache.fop.render.pcl.PCLRenderer;
+import org.apache.fop.render.pdf.PDFRenderer;
+import org.apache.fop.render.ps.PSRenderer;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -21,7 +21,7 @@
* type. This factory is extendable as new <code>Renderer</code>s can
* be added at runtime.
* @author Davanum Srinivas
- * @version $Revision: 1.2 $, $Date: 2001/08/20 13:55:12 $
+ * @version $Revision: 1.3 $, $Date: 2001/10/08 20:03:14 $
*/
public class ExtendableRendererFactory implements RendererFactory {
1.3 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/resolver/Resolver.java
Index: Resolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/resolver/Resolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resolver.java 2001/08/30 19:15:43 1.2
+++ Resolver.java 2001/10/08 20:03:14 1.3
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.resolver;
-import org.apache.avalon.framework.component.Component;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
+import org.apache.avalon.framework.component.Component;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
import java.io.IOException;
/**
* A component that uses catalogs for resolving Entities.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:14 $
*/
public interface Resolver extends Component, EntityResolver {
1.5 +20 -22
xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResolverImpl.java 2001/10/05 07:27:46 1.4
+++ ResolverImpl.java 2001/10/08 20:03:14 1.5
@@ -7,28 +7,26 @@
*****************************************************************************/
package org.apache.cocoon.components.resolver;
-import com.sun.resolver.helpers.Debug;
-import com.sun.resolver.tools.CatalogResolver;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
+import com.sun.resolver.helpers.Debug;
+import com.sun.resolver.tools.CatalogResolver;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
/**
@@ -46,7 +44,7 @@
* </resolver>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/05 07:27:46 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:14 $
*/
public class ResolverImpl extends AbstractLoggable
implements Resolver, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.5 +7 -7
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLByteStreamCompiler.java 2001/09/17 13:34:02 1.4
+++ XMLByteStreamCompiler.java 2001/10/08 20:03:14 1.5
@@ -7,12 +7,12 @@
*****************************************************************************/
package org.apache.cocoon.components.sax;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.component.Component;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
import java.util.HashMap;
/**
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/17 13:34:02 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:14 $
*/
public final class XMLByteStreamCompiler
1.5 +5 -5
xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java
Index: XMLByteStreamFragment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLByteStreamFragment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLByteStreamFragment.java 2001/08/30 11:48:41 1.4
+++ XMLByteStreamFragment.java 2001/10/08 20:03:14 1.5
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.components.sax;
-import org.apache.cocoon.xml.AbstractSAXFragment;
-import org.apache.cocoon.xml.EmbeddedXMLPipe;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.xml.sax.ContentHandler;
+import org.apache.cocoon.xml.AbstractSAXFragment;
+import org.apache.cocoon.xml.EmbeddedXMLPipe;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
@@ -18,7 +18,7 @@
* store SAX events and insert them in an XSP result using <xsp:expr>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/30 11:48:41 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:14 $
*/
public class XMLByteStreamFragment extends AbstractSAXFragment {
1.7 +7 -7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLByteStreamInterpreter.java 2001/09/17 13:34:02 1.6
+++ XMLByteStreamInterpreter.java 2001/10/08 20:03:14 1.7
@@ -7,12 +7,12 @@
*****************************************************************************/
package org.apache.cocoon.components.sax;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.xml.AbstractXMLProducer;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
import java.util.ArrayList;
/**
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/09/17 13:34:02 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:14 $
*/
public final class XMLByteStreamInterpreter
1.4 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java
Index: XMLDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDeserializer.java 2001/07/07 11:43:25 1.3
+++ XMLDeserializer.java 2001/10/08 20:03:14 1.4
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.sax;
-import org.apache.cocoon.xml.XMLProducer;
+import org.apache.cocoon.xml.XMLProducer;
import org.xml.sax.SAXException;
/**
@@ -22,7 +22,7 @@
* the serialized data.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:25 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:14 $
*/
public interface XMLDeserializer
extends XMLProducer {
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLTeePipe.java 2001/08/20 13:55:12 1.3
+++ XMLTeePipe.java 2001/10/08 20:03:14 1.4
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.sax;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.XMLPipe;
-import org.apache.cocoon.xml.XMLProducer;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.XMLPipe;
+import org.apache.cocoon.xml.XMLProducer;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -20,7 +20,7 @@
* The incoming events are forwarded to two other components.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:12 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:14 $
*/
public final class XMLTeePipe
1.5 +16 -16
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggingSAXConnector.java 2001/08/20 13:55:13 1.4
+++ LoggingSAXConnector.java 2001/10/08 20:03:14 1.5
@@ -7,27 +7,27 @@
*****************************************************************************/
package org.apache.cocoon.components.saxconnector;
-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.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 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.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 <a href="[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:14 $
*/
public class LoggingSAXConnector
extends AbstractXMLPipe
1.4 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SAXConnector.java 2001/07/07 11:43:26 1.3
+++ SAXConnector.java 2001/10/08 20:03:15 1.4
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.saxconnector;
-import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.sitemap.SitemapModelComponent;
+import org.apache.avalon.framework.component.Component;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLPipe;
/**
* Provides a connection between SAX components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/07/07 11:43:26 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:15 $
*/
public interface SAXConnector extends XMLPipe, Component,
SitemapModelComponent {
1.6 +10 -10
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CocoonSourceFactory.java 2001/08/20 13:55:13 1.5
+++ CocoonSourceFactory.java 2001/10/08 20:03:15 1.6
@@ -8,15 +8,15 @@
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.sitemap.Sitemap;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.sitemap.Sitemap;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
/**
@@ -25,7 +25,7 @@
* as it needs the current <code>Sitemap</code> as input.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:15 $
*/
public final class CocoonSourceFactory
1.23 +33 -35
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SitemapSource.java 2001/09/08 04:46:13 1.22
+++ SitemapSource.java 2001/10/08 20:03:15 1.23
@@ -8,47 +8,45 @@
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.Constants;
-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.environment.Environment;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.sitemap.Sitemap;
-import org.apache.cocoon.sitemap.SitemapComponentSelector;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.AbstractXMLConsumer;
-import org.apache.cocoon.xml.ContentHandlerWrapper;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.XMLProducer;
-import org.apache.log.Logger;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.Node;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.Constants;
+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.environment.Environment;
+import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
+import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.sitemap.Sitemap;
+import org.apache.cocoon.sitemap.SitemapComponentSelector;
+import org.apache.cocoon.util.HashUtil;
+import org.apache.cocoon.xml.AbstractXMLConsumer;
+import org.apache.cocoon.xml.ContentHandlerWrapper;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.XMLProducer;
+import org.apache.log.Logger;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Map;
/**
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.22 $ $Date: 2001/09/08 04:46:13 $
+ * @version CVS $Revision: 1.23 $ $Date: 2001/10/08 20:03:15 $
*/
public final class SitemapSource
1.5 +8 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceFactory.java 2001/08/20 13:55:13 1.4
+++ SourceFactory.java 2001/10/08 20:03:15 1.5
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.source;
-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 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 <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: SourceFactory.java,v 1.4 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: SourceFactory.java,v 1.5 2001/10/08 20:03:15 bloritsch Exp $
*/
public interface SourceFactory extends ThreadSafe {
1.6 +8 -8
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SourceHandler.java 2001/08/20 13:55:13 1.5
+++ SourceHandler.java 2001/10/08 20:03:15 1.6
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.source;
-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 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 <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: SourceHandler.java,v 1.5 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: SourceHandler.java,v 1.6 2001/10/08 20:03:15 bloritsch Exp $
*/
public interface SourceHandler extends Component {
1.6 +25 -25
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SourceHandlerImpl.java 2001/09/06 07:46:36 1.5
+++ SourceHandlerImpl.java 2001/10/08 20:03:15 1.6
@@ -7,35 +7,35 @@
*****************************************************************************/
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.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.logger.Loggable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.util.ClassUtils;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.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.logger.Loggable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.util.ClassUtils;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: SourceHandlerImpl.java,v 1.5 2001/09/06 07:46:36 cziegeler
Exp $
+ * @version $Id: SourceHandlerImpl.java,v 1.6 2001/10/08 20:03:15 bloritsch
Exp $
*/
public final class SourceHandlerImpl
extends AbstractLoggable
1.16 +15 -20
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- URLSource.java 2001/09/24 09:34:43 1.15
+++ URLSource.java 2001/10/08 20:03:15 1.16
@@ -8,32 +8,27 @@
package org.apache.cocoon.components.source;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.ModifiableSource;
-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 java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.URL;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.ModifiableSource;
+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 java.io.*;
+import java.lang.reflect.Method;
+import java.net.URL;
import java.net.URLConnection;
/**
* Description of a source which is described by an URL.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/09/24 09:34:43 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/10/08 20:03:15 $
*/
public final class URLSource implements ModifiableSource {
1.6 +10 -10
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FilesystemStore.java 2001/09/05 11:56:26 1.5
+++ FilesystemStore.java 2001/10/08 20:03:15 1.6
@@ -7,16 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.components.store;
-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;
-import org.apache.cocoon.util.IOUtils;
-
-import java.io.File;
-import java.io.IOException;
+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;
+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 {
1.20 +22 -22
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MRUMemoryStore.java 2001/09/11 10:35:26 1.19
+++ MRUMemoryStore.java 2001/10/08 20:03:15 1.20
@@ -7,28 +7,28 @@
*****************************************************************************/
package org.apache.cocoon.components.store;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.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.io.IOException;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedList;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.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.io.IOException;
+import java.net.URLEncoder;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Stack;
/**
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryStore.java 2001/09/05 11:56:26 1.3
+++ MemoryStore.java 2001/10/08 20:03:15 1.4
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.store;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.Enumeration;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.util.Enumeration;
import java.util.Hashtable;
/**
@@ -20,7 +20,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/09/05 11:56:26 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:15 $
*/
public class MemoryStore implements Store, ThreadSafe {
/* WARNING: Hashtable is threadsafe, whereas HashMap is not.
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Store.java 2001/09/05 11:56:26 1.4
+++ Store.java 2001/10/08 20:03:15 1.5
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.components.store;
-import org.apache.avalon.framework.component.Component;
-
-import java.io.IOException;
+import org.apache.avalon.framework.component.Component;
+
+import java.io.IOException;
import java.util.Enumeration;
/**
@@ -20,7 +20,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/05 11:56:26 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:15 $
*/
public interface Store extends Component {
1.4 +7 -7
xml-cocoon2/src/org/apache/cocoon/components/store/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/StoreJanitorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StoreJanitorImpl.java 2001/09/11 10:35:26 1.3
+++ StoreJanitorImpl.java 2001/10/08 20:03:15 1.4
@@ -7,13 +7,13 @@
*****************************************************************************/
package org.apache.cocoon.components.store;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.ArrayList;
/**
1.3 +6 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendableTranscoderFactory.java 2001/08/20 13:55:13 1.2
+++ ExtendableTranscoderFactory.java 2001/10/08 20:03:15 1.3
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.transcoder;
-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 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;
/**
@@ -20,7 +20,7 @@
* type. This factory is extendable as new <code>Transcoder</code>s can
* be added at runtime.
* @author Ross Burton
- * @version $Revision: 1.2 $, $Date: 2001/08/20 13:55:13 $
+ * @version $Revision: 1.3 $, $Date: 2001/10/08 20:03:15 $
*/
public class ExtendableTranscoderFactory implements TranscoderFactory {
1.4 +8 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextURLFactory.java 2001/08/20 13:55:13 1.3
+++ ContextURLFactory.java 2001/10/08 20:03:15 1.4
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.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 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 <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ContextURLFactory.java,v 1.3 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: ContextURLFactory.java,v 1.4 2001/10/08 20:03:15 bloritsch
Exp $
*/
public class ContextURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.3 +8 -8
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceURLFactory.java 2001/08/20 13:55:13 1.2
+++ ResourceURLFactory.java 2001/10/08 20:03:15 1.3
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.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 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 <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ResourceURLFactory.java,v 1.2 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: ResourceURLFactory.java,v 1.3 2001/10/08 20:03:15 bloritsch
Exp $
*/
public class ResourceURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URLFactory.java 2001/08/20 13:55:13 1.3
+++ URLFactory.java 2001/10/08 20:03:15 1.4
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.url;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.net.MalformedURLException;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+import java.net.MalformedURLException;
import java.net.URL;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactory.java,v 1.3 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: URLFactory.java,v 1.4 2001/10/08 20:03:15 bloritsch Exp $
*/
public interface URLFactory extends ThreadSafe {
1.8 +19 -19
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URLFactoryImpl.java 2001/08/20 13:55:13 1.7
+++ URLFactoryImpl.java 2001/10/08 20:03:15 1.8
@@ -7,30 +7,30 @@
*****************************************************************************/
package org.apache.cocoon.components.url;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.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.logger.Loggable;
-import org.apache.cocoon.Constants;
-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 org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.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.logger.Loggable;
+import org.apache.cocoon.Constants;
+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 <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.7 2001/08/20 13:55:13 dims Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.8 2001/10/08 20:03:15 bloritsch Exp
$
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
1.2 +6 -7
xml-cocoon2/src/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java
Index: JaxenProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JaxenProcessorImpl.java 2001/09/19 19:37:55 1.1
+++ JaxenProcessorImpl.java 2001/10/08 20:03:16 1.2
@@ -7,12 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.jaxen.dom.XPath;
-import org.jaxen.JaxenException;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import java.util.List;
/**
@@ -28,7 +27,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/19 19:37:55 $ $Author: dims $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:16 $ $Author:
bloritsch $
*/
public class JaxenProcessorImpl
extends AbstractLoggable
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/xpath/XPathProcessor.java
Index: XPathProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xpath/XPathProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathProcessor.java 2001/09/19 19:37:55 1.1
+++ XPathProcessor.java 2001/10/08 20:03:16 1.2
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
-import org.w3c.dom.Node;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* This is the interface of the XPath processor in Cocoon.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/19 19:37:55 $ $Author: dims $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:16 $ $Author:
bloritsch $
*/
public interface XPathProcessor
{
1.2 +5 -5
xml-cocoon2/src/org/apache/cocoon/components/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xpath/XPathProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathProcessorImpl.java 2001/09/19 19:37:55 1.1
+++ XPathProcessorImpl.java 2001/10/08 20:03:16 1.2
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.xpath.XPathAPI;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.xpath.XPathAPI;
/**
* This class defines the implementation of the [EMAIL PROTECTED]
XPathProcessor}
@@ -26,7 +26,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/19 19:37:55 $ $Author: dims $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:16 $ $Author:
bloritsch $
*/
public class XPathProcessorImpl
extends AbstractLoggable
1.5 +7 -8
xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessor.java
Index: XSLTProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTProcessor.java 2001/08/30 19:15:43 1.4
+++ XSLTProcessor.java 2001/10/08 20:03:16 1.5
@@ -7,15 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.xslt;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-
-import javax.xml.transform.Result;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.XMLFilter;
+
+import javax.xml.transform.Result;
import javax.xml.transform.sax.TransformerHandler;
-
-import org.xml.sax.XMLFilter;
/**
* This is the interface of the XSLT processor in Cocoon.
1.7 +30 -36
xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTProcessorImpl.java 2001/09/18 16:23:46 1.6
+++ XSLTProcessorImpl.java 2001/10/08 20:03:16 1.7
@@ -7,42 +7,36 @@
*****************************************************************************/
package org.apache.cocoon.components.xslt;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.store.Store;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.TraxErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.store.Store;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.TraxErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import javax.xml.transform.*;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
import java.io.Writer;
/**
1.22 +11 -11
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AbstractEnvironment.java 2001/09/05 06:10:49 1.21
+++ AbstractEnvironment.java 2001/10/08 20:03:16 1.22
@@ -7,16 +7,16 @@
*****************************************************************************/
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.HashMap;
+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.HashMap;
import java.util.Map;
/**
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.21 $ $Date: 2001/09/05 06:10:49 $
+ * @version CVS $Revision: 1.22 $ $Date: 2001/10/08 20:03:16 $
*/
public abstract class AbstractEnvironment extends AbstractLoggable
implements Environment {
1.5 +2 -2
xml-cocoon2/src/org/apache/cocoon/environment/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Context.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Context.java 2001/08/11 16:48:53 1.4
+++ Context.java 2001/10/08 20:03:16 1.5
@@ -8,14 +8,14 @@
package org.apache.cocoon.environment;
-import java.net.MalformedURLException;
+import java.net.MalformedURLException;
import java.net.URL;
/**
* Defines an interface to provide client context information .
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/11 16:48:53 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:16 $
*
*/
1.12 +6 -6
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Environment.java 2001/09/04 15:23:03 1.11
+++ Environment.java 2001/10/08 20:03:16 1.12
@@ -8,11 +8,11 @@
package org.apache.cocoon.environment;
-import org.apache.cocoon.components.source.SourceHandler;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
+import org.apache.cocoon.components.source.SourceHandler;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
import java.util.Map;
/**
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/09/04 15:23:03 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:16 $
*/
public interface Environment extends SourceResolver {
1.6 +4 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Request.java 2001/08/20 13:55:13 1.5
+++ Request.java 2001/10/08 20:03:16 1.6
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.environment;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.Locale;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
import java.util.Map;
/**
@@ -18,7 +18,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:16 $
*
*/
1.13 +7 -7 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Source.java 2001/08/30 19:15:43 1.12
+++ Source.java 2001/10/08 20:03:16 1.13
@@ -8,13 +8,13 @@
package org.apache.cocoon.environment;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.xml.XMLizable;
-import org.apache.cocoon.ProcessingException;
-import org.xml.sax.InputSource;
-
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.xml.XMLizable;
+import org.xml.sax.InputSource;
+
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
/**
* Description of a source. This interface provides a simple interface
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/10/08 20:03:16 $
*/
public interface Source extends Recyclable, XMLizable {
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceResolver.java 2001/08/20 13:55:13 1.4
+++ SourceResolver.java 2001/10/08 20:03:16 1.5
@@ -8,16 +8,16 @@
package org.apache.cocoon.environment;
-import org.apache.cocoon.ProcessingException;
-import org.xml.sax.SAXException;
-
+import org.apache.cocoon.ProcessingException;
+import org.xml.sax.SAXException;
+
import java.io.IOException;
/**
* Base interface for resolving a source by system identifiers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:16 $
*/
public interface SourceResolver {
1.2 +9 -11
xml-cocoon2/src/org/apache/cocoon/environment/URLFactorySourceResolver.java
Index: URLFactorySourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/URLFactorySourceResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLFactorySourceResolver.java 2001/08/31 13:48:57 1.1
+++ URLFactorySourceResolver.java 2001/10/08 20:03:16 1.2
@@ -8,23 +8,21 @@
package org.apache.cocoon.environment;
-import java.io.IOException;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.source.URLSource;
+import org.apache.cocoon.components.url.URLFactory;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.net.URL;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
-
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.URLSource;
-import org.apache.cocoon.components.url.URLFactory;
-
-import org.xml.sax.SAXException;
-
/**
* A <code>SourceResolver</code> based on a <code>URLFactory</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/08/31 13:48:57 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:16 $
*/
public class URLFactorySourceResolver implements SourceResolver {
1.7 +8 -8
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractCommandLineEnvironment.java 2001/08/20 13:55:14 1.6
+++ AbstractCommandLineEnvironment.java 2001/10/08 20:03:16 1.7
@@ -8,20 +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 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;
/**
* This environment is used to save the requested file to disk.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:16 $
*/
public abstract class AbstractCommandLineEnvironment
1.7 +8 -13
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineRequest.java 2001/08/20 16:31:49 1.6
+++ CommandLineRequest.java 2001/10/08 20:03:16 1.7
@@ -8,24 +8,19 @@
package org.apache.cocoon.environment.commandline;
-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 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.*;
-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 <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 16:31:49 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:16 $
*/
/*
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommandLineResponse.java 2001/08/20 13:55:14 1.2
+++ CommandLineResponse.java 2001/10/08 20:03:16 1.3
@@ -8,16 +8,16 @@
package org.apache.cocoon.environment.commandline;
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.Response;
-
+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 <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:16 $
*/
public class CommandLineResponse implements Response {
1.2 +4 -4
xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineSession.java
Index: CommandLineSession.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandLineSession.java 2001/08/20 16:31:49 1.1
+++ CommandLineSession.java 2001/10/08 20:03:16 1.2
@@ -8,9 +8,9 @@
package org.apache.cocoon.environment.commandline;
-import org.apache.cocoon.environment.Session;
-
-import java.util.Enumeration;
+import org.apache.cocoon.environment.Session;
+
+import java.util.Enumeration;
import java.util.Hashtable;
/**
@@ -18,7 +18,7 @@
* Command-line version of Http Session.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/08/20 16:31:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:16 $
*/
public final class CommandLineSession
implements Session {
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandlineContext.java 2001/08/20 13:55:14 1.3
+++ CommandlineContext.java 2001/10/08 20:03:16 1.4
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.environment.commandline;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.cocoon.environment.Context;
-
-import java.net.MalformedURLException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.environment.Context;
+
+import java.net.MalformedURLException;
import java.net.URL;
/**
1.5 +7 -7
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileSavingEnvironment.java 2001/08/20 13:55:14 1.4
+++ FileSavingEnvironment.java 2001/10/08 20:03:16 1.5
@@ -8,19 +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.OutputStream;
-import java.net.MalformedURLException;
+import org.apache.cocoon.Constants;
+import org.apache.log.Logger;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
import java.util.Map;
/**
* This environment is used to save the requested file to disk.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:16 $
*/
public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
1.5 +8 -13
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkSamplingEnvironment.java 2001/08/20 13:55:14 1.4
+++ LinkSamplingEnvironment.java 2001/10/08 20:03:16 1.5
@@ -7,25 +7,20 @@
*****************************************************************************/
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.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collection;
+import org.apache.cocoon.Constants;
+import org.apache.log.Logger;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Map;
/**
* This environment is sample the links of the resource.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:16 $
*/
public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment {
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpContext.java 2001/08/20 13:55:14 1.4
+++ HttpContext.java 2001/10/08 20:03:17 1.5
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.environment.http;
-import org.apache.cocoon.environment.Context;
-
-import javax.servlet.ServletContext;
-import java.net.MalformedURLException;
+import org.apache.cocoon.environment.Context;
+
+import javax.servlet.ServletContext;
+import java.net.MalformedURLException;
import java.net.URL;
/**
1.8 +11 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpEnvironment.java 2001/08/20 13:55:14 1.7
+++ HttpEnvironment.java 2001/10/08 20:03:17 1.8
@@ -8,17 +8,17 @@
package org.apache.cocoon.environment.http;
-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 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;
public class HttpEnvironment extends AbstractEnvironment implements
Redirector {
1.8 +11 -15
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpRequest.java 2001/08/20 13:55:14 1.7
+++ HttpRequest.java 2001/10/08 20:03:17 1.8
@@ -7,27 +7,23 @@
*****************************************************************************/
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 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.util.*;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
/**
* Implements the [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest}
interface
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Id: HttpRequest.java,v 1.7 2001/08/20 13:55:14 dims Exp $
+ * @version CVS $Id: HttpRequest.java,v 1.8 2001/10/08 20:03:17 bloritsch
Exp $
*/
public class HttpRequest implements Request {
1.4 +7 -7
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpResponse.java 2001/08/20 13:55:14 1.3
+++ HttpResponse.java 2001/10/08 20:03:17 1.4
@@ -7,13 +7,13 @@
*****************************************************************************/
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 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.util.Locale;
/**
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpSession.java 2001/08/20 13:55:14 1.2
+++ HttpSession.java 2001/10/08 20:03:17 1.3
@@ -8,8 +8,8 @@
package org.apache.cocoon.environment.http;
-import org.apache.cocoon.environment.Session;
-
+import org.apache.cocoon.environment.Session;
+
import java.util.Enumeration;
/**
@@ -37,7 +37,7 @@
* will not be directly visible in another.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:17 $
*
*/
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestWrapper22.java 2001/08/20 13:55:14 1.6
+++ RequestWrapper22.java 2001/10/08 20:03:17 1.7
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.environment.http;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
import java.util.Vector;
/**
@@ -17,7 +17,7 @@
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:17 $
*/
public final class RequestWrapper {
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestWrapper23.java 2001/08/20 13:55:14 1.6
+++ RequestWrapper23.java 2001/10/08 20:03:17 1.7
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.environment.http;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
import java.util.Vector;
/**
@@ -17,7 +17,7 @@
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:17 $
*/
public final class RequestWrapper {
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestWrapperMaybeUpload22.java 2001/08/20 13:55:14 1.3
+++ RequestWrapperMaybeUpload22.java 2001/10/08 20:03:17 1.4
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.environment.http;
-import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
+import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
import java.util.Vector;
/**
@@ -19,7 +19,7 @@
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:17 $
*/
public final class RequestWrapper extends MaybeUploadRequestWrapper {
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestWrapperMaybeUpload23.java 2001/08/20 13:55:14 1.3
+++ RequestWrapperMaybeUpload23.java 2001/10/08 20:03:17 1.4
@@ -7,11 +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.Map;
+import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.util.Map;
import java.util.Vector;
/**
@@ -20,7 +20,7 @@
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:17 $
*/
public final class RequestWrapper extends MaybeUploadRequestWrapper
implements HttpServletRequest {
1.10 +14 -14
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EnvironmentWrapper.java 2001/09/04 14:44:12 1.9
+++ EnvironmentWrapper.java 2001/10/08 20:03:17 1.10
@@ -8,19 +8,19 @@
package org.apache.cocoon.environment.wrapper;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.AbstractEnvironment;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-import org.apache.log.Logger;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.AbstractEnvironment;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.log.Logger;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
@@ -30,7 +30,7 @@
* contains a <code>RequestWrapper</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: EnvironmentWrapper.java,v 1.9 2001/09/04 14:44:12 cziegeler
Exp $
+ * @version $Id: EnvironmentWrapper.java,v 1.10 2001/10/08 20:03:17
bloritsch Exp $
*/
public final class EnvironmentWrapper
extends AbstractEnvironment
1.5 +3 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestParameters.java 2001/08/20 13:55:14 1.4
+++ RequestParameters.java 2001/10/08 20:03:17 1.5
@@ -7,13 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.environment.wrapper;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.io.Serializable;
+import java.util.*;
/**
* This class is used by the <code>RequestWrapper</code>. It parses
@@ -21,7 +16,7 @@
* for the <code>Request</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: RequestParameters.java,v 1.4 2001/08/20 13:55:14 dims Exp $
+ * @version $Id: RequestParameters.java,v 1.5 2001/10/08 20:03:17 bloritsch
Exp $
*/
public final class RequestParameters
implements Serializable {
1.9 +8 -13
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RequestWrapper.java 2001/08/20 13:55:14 1.8
+++ RequestWrapper.java 2001/10/08 20:03:17 1.9
@@ -8,27 +8,22 @@
package org.apache.cocoon.environment.wrapper;
-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 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.*;
-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 <code>Request</code> object.
* It has the same properties except that the url and the parameters
* are different.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: RequestWrapper.java,v 1.8 2001/08/20 13:55:14 dims Exp $
+ * @version $Id: RequestWrapper.java,v 1.9 2001/10/08 20:03:17 bloritsch Exp
$
*/
public final class RequestWrapper implements Request {
1.4 +8 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractGenerator.java 2001/08/20 13:55:14 1.3
+++ AbstractGenerator.java 2001/10/08 20:03:17 1.4
@@ -7,20 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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 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 <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:14 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:17 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.3 +9 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractServerPage.java 2001/08/20 13:55:15 1.2
+++ AbstractServerPage.java 2001/10/08 20:03:17 1.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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 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;
/**
@@ -22,7 +22,7 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:17 $
*/
public abstract class AbstractServerPage
extends ServletGenerator implements CompiledComponent, Cacheable
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComposerGenerator.java 2001/08/20 13:55:15 1.3
+++ ComposerGenerator.java 2001/10/08 20:03:17 1.4
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.component.ComponentException;
-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;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:17 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composable {
1.14 +18 -18
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DirectoryGenerator.java 2001/08/31 15:49:35 1.13
+++ DirectoryGenerator.java 2001/10/08 20:03:17 1.14
@@ -8,23 +8,23 @@
package org.apache.cocoon.generation;
-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.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.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
+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.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.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
import java.util.Stack;
/**
@@ -62,7 +62,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Conny Krappatsch</a>
* (SMB GmbH) for Virbus AG
- * @version CVS $Revision: 1.13 $ $Date: 2001/08/31 15:49:35 $ */
+ * @version CVS $Revision: 1.14 $ $Date: 2001/10/08 20:03:17 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Recyclable {
private static final String FILE = "file:";
1.24 +15 -17
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FileGenerator.java 2001/09/08 04:31:10 1.23
+++ FileGenerator.java 2001/10/08 20:03:17 1.24
@@ -7,22 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-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.FileNotFoundException;
-import java.io.IOException;
+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.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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashUtil;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.util.Map;
/**
@@ -35,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.23 $ $Date: 2001/09/08 04:31:10 $
+ * @version CVS $Revision: 1.24 $ $Date: 2001/10/08 20:03:17 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
1.6 +18 -18
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FragmentExtractorGenerator.java 2001/08/20 13:55:15 1.5
+++ FragmentExtractorGenerator.java 2001/10/08 20:03:17 1.6
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.NOPCacheValidity;
-import org.apache.cocoon.environment.AbstractEnvironment;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.rmi.server.UID;
-import java.util.HashMap;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.NOPCacheValidity;
+import org.apache.cocoon.environment.AbstractEnvironment;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashUtil;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+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.
@@ -36,7 +36,7 @@
* This is by no means complete yet, but it should prove useful, particularly
* for offline generation.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:17 $
*/
public class FragmentExtractorGenerator extends AbstractGenerator
implements Recyclable, Cacheable {
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Generator.java 2001/08/20 13:55:15 1.3
+++ Generator.java 2001/10/08 20:03:17 1.4
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.sitemap.SitemapModelComponent;
-import org.apache.cocoon.xml.XMLProducer;
-import org.xml.sax.SAXException;
-
+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 <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:17 $
*/
public interface Generator extends XMLProducer, SitemapModelComponent {
1.14 +31 -34
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HTMLGenerator.java 2001/09/19 19:37:55 1.13
+++ HTMLGenerator.java 2001/10/08 20:03:17 1.14
@@ -7,45 +7,42 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.xpath.XPathProcessor;
-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.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-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 java.io.BufferedInputStream;
-import java.io.IOException;
+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.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.TimeStampCacheValidity;
+import org.apache.cocoon.components.xpath.XPathProcessor;
+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.w3c.dom.NodeList;
+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 java.io.BufferedInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
import java.util.Map;
-import java.util.Enumeration;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.13 $ $Date: 2001/09/19 19:37:55 $
+ * @version CVS $Revision: 1.14 $ $Date: 2001/10/08 20:03:17 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable, Composable, Disposable {
1.9 +5 -9
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ImageDirectoryGenerator.java 2001/08/20 13:55:15 1.8
+++ ImageDirectoryGenerator.java 2001/10/08 20:03:17 1.9
@@ -7,21 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.log.Hierarchy;
-import org.xml.sax.SAXException;
+import org.apache.log.Hierarchy;
+import org.xml.sax.SAXException;
+
+import java.io.*;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
/**
* An extension of DirectoryGenerators that adds extra attributes for image
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
- * @version $Revision: 1.8 $ $Date: 2001/08/20 13:55:15 $
+ * @version $Revision: 1.9 $ $Date: 2001/10/08 20:03:17 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
1.17 +18 -18
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JspGenerator.java 2001/08/22 03:51:05 1.16
+++ JspGenerator.java 2001/10/08 20:03:17 1.17
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.ProcessingException;
-import org.apache.cocoon.components.jsp.JSPEngine;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-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 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.ProcessingException;
+import org.apache.cocoon.components.jsp.JSPEngine;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.http.HttpEnvironment;
+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;
/**
@@ -32,7 +32,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.16 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.17 $ $Date: 2001/10/08 20:03:17 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable,
Configurable {
1.10 +18 -18
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PhpGenerator.java 2001/08/22 03:51:05 1.9
+++ PhpGenerator.java 2001/10/08 20:03:17 1.10
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.Source;
-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 org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.Source;
+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;
/**
@@ -32,7 +32,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sam Ruby</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:17 $
*/
public class PhpGenerator extends ServletGenerator implements Recyclable {
1.6 +8 -8
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestGenerator.java 2001/08/20 13:55:15 1.5
+++ RequestGenerator.java 2001/10/08 20:03:17 1.6
@@ -7,13 +7,13 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Request;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.Enumeration;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Request;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.util.Enumeration;
import java.util.Iterator;
/**
@@ -21,7 +21,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:17 $
*/
public class RequestGenerator extends ServletGenerator implements Recyclable
{
1.12 +16 -16
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ScriptGenerator.java 2001/08/22 03:51:05 1.11
+++ ScriptGenerator.java 2001/10/08 20:03:17 1.12
@@ -8,21 +8,21 @@
package org.apache.cocoon.generation;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.IOUtils;
-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.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.Source;
-import org.xml.sax.InputSource;
-
-import java.io.FileNotFoundException;
-import java.io.Reader;
+import com.ibm.bsf.BSFException;
+import com.ibm.bsf.BSFManager;
+import com.ibm.bsf.util.IOUtils;
+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.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.Source;
+import org.xml.sax.InputSource;
+
+import java.io.FileNotFoundException;
+import java.io.Reader;
import java.io.StringReader;
/**
@@ -45,7 +45,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason Foster</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:17 $
*/
public class ScriptGenerator extends ComposerGenerator implements
Configurable,
Recyclable {
1.16 +26 -26
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ServerPagesGenerator.java 2001/08/22 03:51:05 1.15
+++ ServerPagesGenerator.java 2001/10/08 20:03:17 1.16
@@ -7,31 +7,31 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-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.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.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
+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.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+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.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.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
/**
@@ -39,7 +39,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/10/08 20:03:17 $
*/
public class ServerPagesGenerator
extends ServletGenerator
1.5 +12 -12
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletGenerator.java 2001/08/20 13:55:15 1.4
+++ ServletGenerator.java 2001/10/08 20:03:17 1.5
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.SourceResolver;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.util.Map;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:17 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composable {
1.6 +13 -13
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StatusGenerator.java 2001/08/20 13:55:15 1.5
+++ StatusGenerator.java 2001/10/08 20:03:17 1.6
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.Date;
-import java.util.List;
+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.Date;
+import java.util.List;
import java.util.StringTokenizer;
/** Generates an XML representation of the current status of Cocoon.
@@ -47,7 +47,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a> (Luminas
Limited)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:17 $
*/
public class StatusGenerator extends ComposerGenerator implements Recyclable
{
1.6 +13 -13
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StreamGenerator.java 2001/10/08 07:16:29 1.5
+++ StreamGenerator.java 2001/10/08 20:03:17 1.6
@@ -8,18 +8,18 @@
package org.apache.cocoon.generation;
-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.Request;
-import org.apache.cocoon.environment.http.HttpEnvironment;
-import org.apache.cocoon.util.PostInputStream;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
+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.Request;
+import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.cocoon.util.PostInputStream;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.io.StringReader;
/**
@@ -43,7 +43,7 @@
* number of bytes read is equal to the getContentLength() value.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kinga Dziembowski</a>
- * @version $Revision: 1.5 $ $Date: 2001/10/08 07:16:29 $
+ * @version $Revision: 1.6 $ $Date: 2001/10/08 20:03:17 $
*/
public class StreamGenerator extends ComposerGenerator {
public static final String CLASS = StreamGenerator.class.getName();
1.8 +13 -13
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityGenerator.java 2001/08/20 13:55:15 1.7
+++ VelocityGenerator.java 2001/10/08 20:03:17 1.8
@@ -7,23 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-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.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 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.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 <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:15 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:17 $
*/
public class VelocityGenerator extends ServletGenerator implements
Recyclable {
1.3 +17 -33
xml-cocoon2/src/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDBCollectionGenerator.java 2001/08/23 14:43:28 1.2
+++ XMLDBCollectionGenerator.java 2001/10/08 20:03:17 1.3
@@ -7,40 +7,24 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
import java.util.Map;
-
-import org.xmldb.api.DatabaseManager;
-import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
-import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.XMLResource;
-
-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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Poolable;
-
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-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 org.xml.sax.helpers.AttributesImpl;
/**
* This class implements generation of a XML:DB collection
1.3 +16 -32
xml-cocoon2/src/org/apache/cocoon/generation/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/XMLDBGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDBGenerator.java 2001/08/23 12:54:58 1.2
+++ XMLDBGenerator.java 2001/10/08 20:03:17 1.3
@@ -7,39 +7,23 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.util.Map;
-
-import org.xmldb.api.DatabaseManager;
-import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.Database;
-import org.xmldb.api.base.ErrorCodes;
-import org.xmldb.api.base.Resource;
-import org.xmldb.api.base.Service;
-import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.XMLResource;
-
-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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Poolable;
-
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-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;
/**
* This class implements generation of XML documents from a
1.4 +19 -28
xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLResourceBundle.java 2001/09/19 19:37:56 1.3
+++ XMLResourceBundle.java 2001/10/08 20:03:18 1.4
@@ -9,39 +9,30 @@
package org.apache.cocoon.i18n;
/** JDK classes **/
-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.framework.logger.Loggable;
-import org.apache.cocoon.components.xpath.XPathProcessor;
-import org.apache.log.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
+import org.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.cocoon.components.xpath.XPathProcessor;
+import org.apache.log.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.util.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Oleg Podolsky</a>
- * @version $Id: XMLResourceBundle.java,v 1.3 2001/09/19 19:37:56 dims Exp $
+ * @version $Id: XMLResourceBundle.java,v 1.4 2001/10/08 20:03:18 bloritsch
Exp $
*/
public class XMLResourceBundle
extends ResourceBundle
1.3 +14 -14
xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLResourceBundleFactory.java 2001/08/20 13:55:16 1.2
+++ XMLResourceBundleFactory.java 2001/10/08 20:03:18 1.3
@@ -8,19 +8,19 @@
//package org.apache.avalon.excalibur.i18n;
package org.apache.cocoon.i18n;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.DefaultComponentSelector;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.log.Logger;
-import org.xml.sax.SAXParseException;
-
-import java.util.HashMap;
-import java.util.Locale;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.DefaultComponentSelector;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.log.Logger;
+import org.xml.sax.SAXParseException;
+
+import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -30,7 +30,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Oleg Podolsky</a>
- * @version $Id: XMLResourceBundleFactory.java,v 1.2 2001/08/20 13:55:16
dims Exp $
+ * @version $Id: XMLResourceBundleFactory.java,v 1.3 2001/10/08 20:03:18
bloritsch Exp $
*/
public class XMLResourceBundleFactory
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BrowserMatcherFactory.java 2001/09/19 14:46:37 1.4
+++ BrowserMatcherFactory.java 2001/10/08 20:03:18 1.5
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.CodeFactory;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.CodeFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:18 $
*/
public class BrowserMatcherFactory implements CodeFactory {
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Matcher.java 2001/08/20 13:55:16 1.4
+++ Matcher.java 2001/10/08 20:03:18 1.5
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.parameters.Parameters;
-
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
+
import java.util.Map;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:18 $
*/
public interface Matcher extends Component {
1.3 +7 -7
xml-cocoon2/src/org/apache/cocoon/matching/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpTargetHostMatcherFactory.java 2001/07/19 13:40:41 1.2
+++ RegexpTargetHostMatcherFactory.java 2001/10/08 20:03:18 1.3
@@ -7,12 +7,12 @@
*****************************************************************************/
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.regexp.RECompiler;
-import org.apache.regexp.REProgram;
-import org.apache.regexp.RESyntaxException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.CodeFactory;
+import org.apache.regexp.RECompiler;
+import org.apache.regexp.REProgram;
+import org.apache.regexp.RESyntaxException;
import org.w3c.dom.NodeList;
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/07/19 13:40:41 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:18 $
*/
public class RegexpTargetHostMatcherFactory extends AbstractLoggable
implements CodeFactory {
1.3 +7 -7
xml-cocoon2/src/org/apache/cocoon/matching/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RegexpURIMatcherFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpURIMatcherFactory.java 2001/07/19 13:36:23 1.2
+++ RegexpURIMatcherFactory.java 2001/10/08 20:03:18 1.3
@@ -7,12 +7,12 @@
*****************************************************************************/
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.regexp.RECompiler;
-import org.apache.regexp.REProgram;
-import org.apache.regexp.RESyntaxException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.CodeFactory;
+import org.apache.regexp.RECompiler;
+import org.apache.regexp.REProgram;
+import org.apache.regexp.RESyntaxException;
import org.w3c.dom.NodeList;
/**
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/07/19 13:36:23 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:18 $
*/
public class RegexpURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
1.7 +7 -7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestParamMatcher.java 2001/08/28 16:31:38 1.6
+++ RequestParamMatcher.java 2001/10/08 20:03:18 1.7
@@ -14,12 +14,12 @@
/*
* Standard imports
*/
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.Request;
-
-import java.util.HashMap;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.Request;
+
+import java.util.HashMap;
import java.util.Map;
/**
@@ -35,7 +35,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
- * @version CVS $Revision: 1.6 $
+ * @version CVS $Revision: 1.7 $
*/
public class RequestParamMatcher implements Matcher, ThreadSafe {
/**
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WildcardHeaderMatcherFactory.java 2001/09/19 14:46:37 1.5
+++ WildcardHeaderMatcherFactory.java 2001/10/08 20:03:18 1.6
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:18 $
*/
public class WildcardHeaderMatcherFactory extends WildcardURIMatcherFactory {
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WildcardParameterValueMatcherFactory.java 2001/09/19 14:46:37 1.5
+++ WildcardParameterValueMatcherFactory.java 2001/10/08 20:03:18 1.6
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -26,7 +26,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:46:37 $ */
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:18 $ */
public class WildcardParameterValueMatcherFactory extends
WildcardURIMatcherFactory {
1.3 +3 -3
xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionAttributeMatcherFactory.java
Index: WildcardSessionAttributeMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardSessionAttributeMatcherFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WildcardSessionAttributeMatcherFactory.java 2001/09/19 14:46:37
1.2
+++ WildcardSessionAttributeMatcherFactory.java 2001/10/08 20:03:18
1.3
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -21,7 +21,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:18 $
*/
public class WildcardSessionAttributeMatcherFactory extends
WildcardURIMatcherFactory {
1.3 +4 -4
xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WildcardURIMatcherFactory.java 2001/05/31 17:38:33 1.2
+++ WildcardURIMatcherFactory.java 2001/10/08 20:03:18 1.3
@@ -7,9 +7,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.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.CodeFactory;
import org.w3c.dom.NodeList;
/**
@@ -19,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:33 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:18 $
*/
public class WildcardURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
1.5 +11 -11
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractReader.java 2001/08/20 13:55:16 1.4
+++ AbstractReader.java 2001/10/08 20:03:18 1.5
@@ -7,22 +7,22 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-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.BufferedOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+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.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import java.util.Map;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:18 $
*/
public abstract class AbstractReader extends AbstractLoggable implements
Reader, Recyclable {
/** The current <code>SourceResolver</code>. */
1.8 +26 -35
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DatabaseReader.java 2001/09/06 19:56:22 1.7
+++ DatabaseReader.java 2001/10/08 20:03:19 1.8
@@ -7,41 +7,32 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-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;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-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 org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.*;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.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.*;
+import java.util.Date;
import java.util.Map;
/**
1.5 +6 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Reader.java 2001/08/20 13:55:16 1.4
+++ Reader.java 2001/10/08 20:03:19 1.5
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.sitemap.SitemapModelComponent;
-import org.apache.cocoon.sitemap.SitemapOutputComponent;
-import org.xml.sax.SAXException;
-
+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 <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:19 $
*/
public interface Reader extends SitemapModelComponent,
SitemapOutputComponent {
1.10 +20 -20
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceReader.java 2001/08/30 17:43:21 1.9
+++ ResourceReader.java 2001/10/08 20:03:19 1.10
@@ -7,31 +7,31 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-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.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.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 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.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.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 <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/30 17:43:21 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:19 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
1.2 +5 -5
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java
Index: Configurator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Configurator.java 2001/09/06 20:56:21 1.1
+++ Configurator.java 2001/10/08 20:03:19 1.2
@@ -1,11 +1,11 @@
package org.apache.cocoon.samples.parentcm;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
import java.util.Hashtable;
-
-import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
/**
* This class sets up the configuration used by the ParentComponentManager
sample.
1.2 +11 -20
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Generator.java 2001/09/06 20:56:21 1.1
+++ Generator.java 2001/10/08 20:03:19 1.2
@@ -1,26 +1,17 @@
package org.apache.cocoon.samples.parentcm;
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.generation.ComposerGenerator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.util.Date;
import java.util.Map;
-import java.util.Date;
-
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
-
-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.avalon.excalibur.pool.Poolable;
-
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
-import org.apache.cocoon.environment.http.HttpResponse;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.generation.ComposerGenerator;
/**
* Generator for the parent component manager sample. The generator outputs
1.2 +12 -13
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Index: ParentComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParentComponentManager.java 2001/09/06 20:56:21 1.1
+++ ParentComponentManager.java 2001/10/08 20:03:19 1.2
@@ -1,19 +1,18 @@
package org.apache.cocoon.samples.parentcm;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
+import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
+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.configuration.Configuration;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.log.Logger;
+
+import javax.naming.Context;
import java.util.Hashtable;
-
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
-import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.logger.Loggable;
-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.Configuration;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.log.Logger;
/**
* A sample parent component manager. This manager will lookup the
configuration object
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Time.java
Index: Time.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Time.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Time.java 2001/09/07 11:13:27 1.2
+++ Time.java 2001/10/08 20:03:19 1.3
@@ -1,8 +1,8 @@
package org.apache.cocoon.samples.parentcm;
+import org.apache.avalon.framework.component.Component;
+
import java.util.Date;
-
-import org.apache.avalon.framework.component.Component;
/**
* Interface for a simple time-keeping component.
1.2 +3 -3
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/TimeComponent.java
Index: TimeComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/TimeComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeComponent.java 2001/09/06 20:56:21 1.1
+++ TimeComponent.java 2001/10/08 20:03:19 1.2
@@ -1,9 +1,9 @@
package org.apache.cocoon.samples.parentcm;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.Date;
-
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* Implementing class for the parent component manager sample's
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BrowserSelectorFactory.java 2001/10/02 07:09:27 1.4
+++ BrowserSelectorFactory.java 2001/10/08 20:03:19 1.5
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.CodeFactory;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.CodeFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/02 07:09:27 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:19 $
*/
1.2 +3 -3
xml-cocoon2/src/org/apache/cocoon/selection/CodedSelectorFactory.java
Index: CodedSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/CodedSelectorFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodedSelectorFactory.java 2001/05/09 20:49:28 1.1
+++ CodedSelectorFactory.java 2001/10/08 20:03:19 1.2
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.CodeFactory;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.CodeFactory;
import org.w3c.dom.NodeList;
/**
@@ -16,7 +16,7 @@
* embedded java code within the 'test' clause of the select.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:28 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:19 $
*/
public class CodedSelectorFactory extends java.lang.Object
implements CodeFactory {
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HeaderSelectorFactory.java 2001/09/19 14:46:37 1.5
+++ HeaderSelectorFactory.java 2001/10/08 20:03:19 1.6
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:19 $
*/
public class HeaderSelectorFactory extends ParameterSelectorFactory {
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HostSelectorFactory.java 2001/09/19 14:46:37 1.4
+++ HostSelectorFactory.java 2001/10/08 20:03:19 1.5
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.CodeFactory;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.CodeFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -32,7 +32,7 @@
* </map:select>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Colin Britton</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:19 $
*/
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParameterSelectorFactory.java 2001/08/20 13:55:16 1.3
+++ ParameterSelectorFactory.java 2001/10/08 20:03:19 1.4
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.CodeFactory;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.cocoon.CodeFactory;
import org.w3c.dom.NodeList;
/**
@@ -35,7 +35,7 @@
* depending on those parameters.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:19 $
*/
public class ParameterSelectorFactory implements CodeFactory {
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestSelectorFactory.java 2001/09/19 14:46:37 1.5
+++ RequestSelectorFactory.java 2001/10/08 20:03:19 1.6
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -22,7 +22,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:19 $
*/
public class RequestSelectorFactory extends ParameterSelectorFactory {
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Selector.java 2001/08/20 13:55:16 1.3
+++ Selector.java 2001/10/08 20:03:19 1.4
@@ -7,16 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.parameters.Parameters;
-
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
+
import java.util.Map;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:leo.sutic";>Leo Sutic</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:19 $
*/
public interface Selector extends Component {
1.3 +3 -3
xml-cocoon2/src/org/apache/cocoon/selection/SessionAttributeSelectorFactory.java
Index: SessionAttributeSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/selection/SessionAttributeSelectorFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionAttributeSelectorFactory.java 2001/09/19 14:46:37 1.2
+++ SessionAttributeSelectorFactory.java 2001/10/08 20:03:19 1.3
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.w3c.dom.Node;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -21,7 +21,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/09/19 14:46:37 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:19 $
*/
public class SessionAttributeSelectorFactory extends
ParameterSelectorFactory {
1.3 +7 -7
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CodedSelectorHelper.java 2001/08/20 13:55:16 1.2
+++ CodedSelectorHelper.java 2001/10/08 20:03:20 1.3
@@ -7,12 +7,12 @@
*****************************************************************************/
package org.apache.cocoon.selection.helpers;
-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 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;
/**
@@ -22,7 +22,7 @@
* variables for developer ease.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:20 $
*/
public abstract class CodedSelectorHelper
{
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractSerializer.java 2001/08/20 13:55:16 1.4
+++ AbstractSerializer.java 2001/10/08 20:03:20 1.5
@@ -8,17 +8,17 @@
package org.apache.cocoon.serialization;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.xml.AbstractXMLPipe;
-
-import java.io.BufferedOutputStream;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.xml.AbstractXMLPipe;
+
+import java.io.BufferedOutputStream;
import java.io.OutputStream;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:20 $
*/
public abstract class AbstractSerializer extends AbstractXMLPipe implements
Serializer, Recyclable {
1.7 +18 -22
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractTextSerializer.java 2001/09/19 15:51:49 1.6
+++ AbstractTextSerializer.java 2001/10/08 20:03:20 1.7
@@ -8,34 +8,30 @@
package org.apache.cocoon.serialization;
-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.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.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+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.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.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.*;
-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.Map;
-import java.util.HashMap;
-import java.util.Properties;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/09/19 15:51:49 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:20 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
implements Configurable, Cacheable, Poolable {
1.8 +15 -18
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FOPSerializer.java 2001/09/19 09:40:39 1.7
+++ FOPSerializer.java 2001/10/08 20:03:20 1.8
@@ -8,24 +8,21 @@
package org.apache.cocoon.serialization;
-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.cocoon.components.renderer.ExtendableRendererFactory;
-import org.apache.cocoon.components.renderer.RendererFactory;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Options;
-import org.apache.fop.render.Renderer;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
+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.framework.logger.Loggable;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.NOPCacheValidity;
+import org.apache.cocoon.components.renderer.ExtendableRendererFactory;
+import org.apache.cocoon.components.renderer.RendererFactory;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.Options;
+import org.apache.fop.render.Renderer;
+
import java.io.OutputStream;
public class FOPSerializer extends AbstractSerializer
1.3 +6 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLSerializer.java 2001/08/20 13:55:16 1.2
+++ HTMLSerializer.java 2001/10/08 20:03:20 1.3
@@ -8,16 +8,16 @@
package org.apache.cocoon.serialization;
-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.excalibur.pool.Poolable;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
import java.io.OutputStream;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:20 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
1.6 +9 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkSerializer.java 2001/10/01 12:33:38 1.5
+++ LinkSerializer.java 2001/10/08 20:03:20 1.6
@@ -8,19 +8,19 @@
package org.apache.cocoon.serialization;
-import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.OutputStream;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintStream;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/01 12:33:38 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:20 $
*/
public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
1.4 +27 -27
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGSerializer.java 2001/08/20 13:55:16 1.3
+++ SVGSerializer.java 2001/10/08 20:03:20 1.4
@@ -8,32 +8,32 @@
package org.apache.cocoon.serialization;
-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;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.batik.transcoder.Transcoder;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.NOPCacheValidity;
-import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
-import org.apache.cocoon.components.transcoder.TranscoderFactory;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.dom.SVGBuilder;
-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 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;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.batik.transcoder.Transcoder;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.TranscodingHints;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.NOPCacheValidity;
+import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
+import org.apache.cocoon.components.transcoder.TranscoderFactory;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.dom.SVGBuilder;
+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;
/**
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:20 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable
{
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/serialization/Serializer.java
Index: Serializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/Serializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Serializer.java 2001/07/07 11:43:33 1.2
+++ Serializer.java 2001/10/08 20:03:20 1.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.serialization;
-import org.apache.cocoon.sitemap.SitemapOutputComponent;
+import org.apache.cocoon.sitemap.SitemapOutputComponent;
import org.apache.cocoon.xml.XMLConsumer;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:33 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:20 $
*/
public interface Serializer extends XMLConsumer, SitemapOutputComponent {
1.3 +6 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextSerializer.java 2001/08/20 13:55:16 1.2
+++ TextSerializer.java 2001/10/08 20:03:20 1.3
@@ -8,16 +8,16 @@
package org.apache.cocoon.serialization;
-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.excalibur.pool.Poolable;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
import java.io.OutputStream;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:20 $
*/
public class TextSerializer extends AbstractTextSerializer implements
Poolable {
1.3 +6 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLSerializer.java 2001/08/20 13:55:16 1.2
+++ XMLSerializer.java 2001/10/08 20:03:20 1.3
@@ -8,16 +8,16 @@
package org.apache.cocoon.serialization;
-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.excalibur.pool.Poolable;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
import java.io.OutputStream;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:20 $
*/
public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
1.40 +40 -50
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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- CocoonServlet.java 2001/10/02 19:38:57 1.39
+++ CocoonServlet.java 2001/10/08 20:03:20 1.40
@@ -7,55 +7,45 @@
*****************************************************************************/
package org.apache.cocoon.servlet;
-import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.cocoon.Cocoon;
-import org.apache.cocoon.ConnectionResetException;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.Notification;
-import org.apache.cocoon.Notifier;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-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.log.CocoonLogFormatter;
-import org.apache.cocoon.util.log.XMLCocoonLogFormatter;
-import org.apache.cocoon.util.StringUtils;
-import org.apache.log.ContextMap;
-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.format.Formatter;
-import org.apache.log.output.ServletOutputLogTarget;
-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.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Date;
+import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.cocoon.*;
+import org.apache.cocoon.components.classloader.RepositoryClassLoader;
+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.StringUtils;
+import org.apache.cocoon.util.log.CocoonLogFormatter;
+import org.apache.log.ContextMap;
+import org.apache.log.Hierarchy;
+import org.apache.log.Logger;
+import org.apache.log.Priority;
+import org.apache.log.output.ServletOutputLogTarget;
+
+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.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Constructor;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Date;
import java.util.StringTokenizer;
/**
@@ -68,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
- * @version CVS $Revision: 1.39 $ $Date: 2001/10/02 19:38:57 $
+ * @version CVS $Revision: 1.40 $ $Date: 2001/10/08 20:03:20 $
*/
public class CocoonServlet extends HttpServlet {
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParanoidClassLoader.java 2001/08/20 13:55:17 1.3
+++ ParanoidClassLoader.java 2001/10/08 20:03:20 1.4
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.servlet;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.net.URLStreamHandlerFactory;
/**
@@ -19,7 +19,7 @@
* classes. It checks this classloader before it checks its parent.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:20 $
*/
public class ParanoidClassLoader extends URLClassLoader {
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParanoidCocoonServlet.java 2001/08/20 13:55:17 1.4
+++ ParanoidCocoonServlet.java 2001/10/08 20:03:20 1.5
@@ -8,9 +8,9 @@
package org.apache.cocoon.servlet;
-import org.apache.cocoon.util.IOUtils;
-
-import javax.servlet.ServletException;
+import org.apache.cocoon.util.IOUtils;
+
+import javax.servlet.ServletException;
import java.io.File;
/**
@@ -22,7 +22,7 @@
* of it.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:20 $
*/
public class ParanoidCocoonServlet extends CocoonServlet {
1.18 +34 -34
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractSitemap.java 2001/08/30 19:15:43 1.17
+++ AbstractSitemap.java 2001/10/08 20:03:20 1.18
@@ -8,46 +8,46 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.acting.Action;
-import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.http.HttpResponse;
-import org.apache.cocoon.generation.Generator;
-import org.apache.cocoon.matching.Matcher;
-import org.apache.cocoon.reading.Reader;
-import org.apache.cocoon.selection.Selector;
-import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.transformation.Transformer;
-import org.apache.cocoon.util.ClassUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.acting.Action;
+import org.apache.cocoon.components.classloader.RepositoryClassLoader;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.http.HttpResponse;
+import org.apache.cocoon.generation.Generator;
+import org.apache.cocoon.matching.Matcher;
+import org.apache.cocoon.reading.Reader;
+import org.apache.cocoon.selection.Selector;
+import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.transformation.Transformer;
+import org.apache.cocoon.util.ClassUtils;
+
+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 <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.17 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.18 $ $Date: 2001/10/08 20:03:20 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable, ThreadSafe {
private Context context;
1.18 +23 -25
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ContentAggregator.java 2001/09/06 11:20:54 1.17
+++ ContentAggregator.java 2001/10/08 20:03:20 1.18
@@ -8,36 +8,34 @@
package org.apache.cocoon.sitemap;
-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.AggregatedCacheValidity;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-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.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 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.AggregatedCacheValidity;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.TimeStampCacheValidity;
+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.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.Map;
-import java.util.Iterator;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: ContentAggregator.java,v 1.17 2001/09/06 11:20:54
cziegeler Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.18 2001/10/08 20:03:20
bloritsch Exp $
*/
public class ContentAggregator extends ContentHandlerWrapper implements
Generator, Cacheable, Composable {
1.4 +5 -5
xml-cocoon2/src/org/apache/cocoon/sitemap/ErrorNotifier.java
Index: ErrorNotifier.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ErrorNotifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorNotifier.java 2001/06/08 20:28:24 1.3
+++ ErrorNotifier.java 2001/10/08 20:03:20 1.4
@@ -8,10 +8,10 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.cocoon.Notification;
-import org.apache.cocoon.Notifier;
-import org.apache.cocoon.generation.ComposerGenerator;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.Notification;
+import org.apache.cocoon.Notifier;
+import org.apache.cocoon.generation.ComposerGenerator;
import org.xml.sax.SAXException;
/**
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @created 31 July 2000
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:24 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:20 $
*/
public class ErrorNotifier extends ComposerGenerator implements Recyclable {
/**
1.20 +26 -26 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Handler.java 2001/08/25 19:40:32 1.19
+++ Handler.java 2001/10/08 20:03:20 1.20
@@ -8,31 +8,31 @@
package org.apache.cocoon.sitemap;
-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.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.ProcessingException;
-import org.apache.cocoon.Processor;
-import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.components.language.generator.ProgramGenerator;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.components.source.CocoonSourceFactory;
-import org.apache.cocoon.components.source.SourceHandler;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.ModifiableSource;
-import org.apache.cocoon.environment.SourceResolver;
-import org.xml.sax.SAXException;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.Processor;
+import org.apache.cocoon.components.language.generator.CompiledComponent;
+import org.apache.cocoon.components.language.generator.ProgramGenerator;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.source.CocoonSourceFactory;
+import org.apache.cocoon.components.source.SourceHandler;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.SAXException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.URL;
/**
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.19 $ $Date: 2001/08/25 19:40:32 $
+ * @version CVS $Revision: 1.20 $ $Date: 2001/10/08 20:03:20 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
1.5 +11 -11
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkTranslator.java 2001/08/20 13:55:17 1.4
+++ LinkTranslator.java 2001/10/08 20:03:20 1.5
@@ -8,21 +8,21 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.transformation.Transformer;
-import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.transformation.Transformer;
+import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:20 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
private Map links;
1.17 +20 -22 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Manager.java 2001/09/18 13:45:51 1.16
+++ Manager.java 2001/10/08 20:03:20 1.17
@@ -8,35 +8,33 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.excalibur.component.RoleManager;
-import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.component.Component;
-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.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.ProcessingException;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
-import org.apache.cocoon.environment.Environment;
-
-import java.util.HashMap;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.excalibur.logger.LogKitManageable;
+import org.apache.avalon.excalibur.logger.LogKitManager;
+import org.apache.avalon.framework.component.Component;
+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.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.ProcessingException;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.environment.Environment;
+
+import java.util.HashMap;
import java.util.Iterator;
-
-import java.net.URL;
/**
* This class manages all sub <code>Sitemap</code>s of a <code>Sitemap</code>
* Invokation of sub sitemaps will be done by this instance as well
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.16 $ $Date: 2001/09/18 13:45:51 $
+ * @version CVS $Revision: 1.17 $ $Date: 2001/10/08 20:03:20 $
*/
public class Manager
extends AbstractLoggable
1.4 +8 -8 xml-cocoon2/src/org/apache/cocoon/sitemap/Sitemap.java
Index: Sitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Sitemap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Sitemap.java 2001/06/28 09:56:46 1.3
+++ Sitemap.java 2001/10/08 20:03:20 1.4
@@ -8,20 +8,20 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.cocoon.Processor;
-import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.cocoon.Processor;
+import org.apache.cocoon.components.language.generator.CompiledComponent;
+import org.apache.cocoon.components.pipeline.EventPipeline;
+import org.apache.cocoon.components.pipeline.StreamPipeline;
import org.apache.cocoon.environment.Environment;
/**
* Base interface for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/28 09:56:46 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:20 $
*/
public interface Sitemap extends CompiledComponent, Configurable,
Contextualizable, Processor {
int GENERATOR = 1;
1.9 +9 -9
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SitemapComponentSelector.java 2001/08/20 13:55:17 1.8
+++ SitemapComponentSelector.java 2001/10/08 20:03:20 1.9
@@ -8,20 +8,20 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import java.util.Collections;
-import java.util.HashMap;
+import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/** Default component manager for Cocoon's sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Id: SitemapComponentSelector.java,v 1.8 2001/08/20 13:55:17
dims Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.9 2001/10/08 20:03:20
bloritsch Exp $
*/
public class SitemapComponentSelector extends ExcaliburComponentSelector {
private Map mime_types;
1.5 +8 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SitemapModelComponent.java 2001/08/20 13:55:17 1.4
+++ SitemapModelComponent.java 2001/10/08 20:03:20 1.5
@@ -8,20 +8,20 @@
package org.apache.cocoon.sitemap;
-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 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 <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:20 $
*/
public interface SitemapModelComponent extends Component {
/**
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SitemapOutputComponent.java 2001/08/20 13:55:17 1.4
+++ SitemapOutputComponent.java 2001/10/08 20:03:20 1.5
@@ -8,16 +8,16 @@
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.component.Component;
-
-import java.io.IOException;
+import org.apache.avalon.framework.component.Component;
+
+import java.io.IOException;
import java.io.OutputStream;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:20 $
*/
public interface SitemapOutputComponent extends Component {
/**
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SitemapRedirector.java 2001/08/20 13:55:17 1.3
+++ SitemapRedirector.java 2001/10/08 20:03:20 1.4
@@ -8,16 +8,16 @@
package org.apache.cocoon.sitemap;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Redirector;
+
import java.io.IOException;
/**
* Wrapper for sitemap redirection
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:20 $
*/
public class SitemapRedirector implements Redirector {
private boolean hasRedirected = false;
1.6 +7 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTFactoryLoader.java 2001/09/19 14:06:06 1.5
+++ XSLTFactoryLoader.java 2001/10/08 20:03:20 1.6
@@ -8,12 +8,12 @@
package org.apache.cocoon.sitemap;
-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 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;
/**
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/19 14:06:06 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:20 $
*/
public class XSLTFactoryLoader {
protected static Logger log;
1.6 +18 -18
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractDOMTransformer.java 2001/08/20 13:55:17 1.5
+++ AbstractDOMTransformer.java 2001/10/08 20:03:21 1.6
@@ -7,24 +7,24 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.cocoon.ProcessingException;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.xml.dom.DOMBuilder;
-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 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.cocoon.ProcessingException;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.dom.DOMBuilder;
+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;
/**
1.8 +14 -14
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CIncludeTransformer.java 2001/08/25 19:40:32 1.7
+++ CIncludeTransformer.java 2001/10/08 20:03:21 1.8
@@ -7,19 +7,19 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-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.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Recyclable;
+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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
import java.util.Map;
/**
@@ -32,7 +32,7 @@
* which surrounds the included content.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/25 19:40:32 $ $Author:
giacomo $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class CIncludeTransformer extends AbstractTransformer
implements Recyclable, Composable {
1.8 +17 -17
xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java
Index: CachingCIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CachingCIncludeTransformer.java 2001/08/25 19:40:32 1.7
+++ CachingCIncludeTransformer.java 2001/10/08 20:03:21 1.8
@@ -7,22 +7,22 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.IncludeCacheValidity;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.IncludeCacheValidity;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
import java.util.Map;
/**
@@ -45,7 +45,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Maciek Kaminski</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/25 19:40:32 $ $Author:
giacomo $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class CachingCIncludeTransformer extends AbstractTransformer
implements Recyclable, Composable, Cacheable {
1.4 +10 -10
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FilterTransformer.java 2001/08/20 13:55:17 1.3
+++ FilterTransformer.java 2001/10/08 20:03:21 1.4
@@ -1,14 +1,14 @@
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.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-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.environment.SourceResolver;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
import java.util.Map;
/**
@@ -25,7 +25,7 @@
* Only the 3th block will be shown, containing only 5 row elements.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sven Beauprez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class FilterTransformer extends AbstractTransformer implements
Poolable {
1.8 +25 -25
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FragmentExtractorTransformer.java 2001/09/13 20:51:37 1.7
+++ FragmentExtractorTransformer.java 2001/10/08 20:03:21 1.8
@@ -7,30 +7,30 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.cocoon.ProcessingException;
-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.xml.dom.DOMBuilder;
-import org.apache.cocoon.xml.dom.DOMFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
+import 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.cocoon.ProcessingException;
+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.xml.dom.DOMBuilder;
+import org.apache.cocoon.xml.dom.DOMFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
@@ -42,7 +42,7 @@
* <a href="http://c2.com/cgi/wiki?YouArentGonnaNeedIt";>you aren't gonna
need it</a>,
* so I've just used very simple extraction based on a URI and local name.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/09/13 20:51:37 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:21 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composable, Disposable, Cacheable, Poolable {
1.21 +23 -35
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- I18nTransformer.java 2001/09/19 19:37:56 1.20
+++ I18nTransformer.java 2001/10/08 20:03:21 1.21
@@ -9,41 +9,29 @@
*/
package org.apache.cocoon.transformation;
-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;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.LocaleAction;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.i18n.XMLResourceBundle;
-import org.apache.cocoon.i18n.XMLResourceBundleFactory;
-import org.apache.regexp.RE;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.io.File;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.MessageFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-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.MissingResourceException;
-import java.util.StringTokenizer;
+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;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
+import org.apache.cocoon.acting.LocaleAction;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.i18n.XMLResourceBundle;
+import org.apache.cocoon.i18n.XMLResourceBundleFactory;
+import org.apache.regexp.RE;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.text.*;
+import java.util.*;
/**
* Internationalisation transformer. Used to transform i18n markup into text
1.6 +18 -29
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LDAPTransformer.java 2001/08/20 13:55:17 1.5
+++ LDAPTransformer.java 2001/10/08 20:03:21 1.6
@@ -7,35 +7,24 @@
*****************************************************************************/
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;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-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.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.*;
+import java.io.IOException;
+import java.util.*;
/*****************************************************************************
1.5 +12 -12
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogTransformer.java 2001/08/20 13:55:17 1.4
+++ LogTransformer.java 2001/10/08 20:03:21 1.5
@@ -7,17 +7,17 @@
*****************************************************************************/
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.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 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.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;
/**
@@ -44,7 +44,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:21 $
*
*/
public class LogTransformer extends AbstractTransformer implements Poolable {
1.4 +15 -15
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReadDOMSessionTransformer.java 2001/08/20 13:55:17 1.3
+++ ReadDOMSessionTransformer.java 2001/10/08 20:03:21 1.4
@@ -1,19 +1,19 @@
package org.apache.cocoon.transformation;
-import org.apache.avalon.excalibur.pool.Poolable;
-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.Session;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.EmbeddedXMLPipe;
-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 org.apache.avalon.excalibur.pool.Poolable;
+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.Session;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.EmbeddedXMLPipe;
+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;
@@ -35,7 +35,7 @@
* the trigger-element
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sven Beauprez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class ReadDOMSessionTransformer extends AbstractTransformer
implements Poolable {
1.4 +12 -12
xml-cocoon2/src/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RoleFilterTransformer.java 2001/08/20 13:55:17 1.3
+++ RoleFilterTransformer.java 2001/10/08 20:03:21 1.4
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.SourceResolver;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Map;
+import 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.SourceResolver;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.util.Map;
import java.util.StringTokenizer;
/**
@@ -43,7 +43,7 @@
* will work as expected.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:17 $ $Author: dims $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class RoleFilterTransformer extends FilterTransformer {
private final static String URI =
"http://apache.org/cocoon/role-filter/1.0";;
1.19 +22 -38
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SQLTransformer.java 2001/09/06 19:56:22 1.18
+++ SQLTransformer.java 2001/10/08 20:03:21 1.19
@@ -7,51 +7,35 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.Tokenizer;
-import org.apache.log.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+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.*;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.Tokenizer;
+import org.apache.log.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.sql.*;
+import java.util.*;
-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;
-
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]">Sven Beauprez</a>
- * @version CVS $Revision: 1.18 $ $Date: 2001/09/06 19:56:22 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.19 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer implements
Composable, Recyclable, Disposable, Configurable {
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/Transformer.java
Index: Transformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/Transformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Transformer.java 2001/07/07 11:43:35 1.2
+++ Transformer.java 2001/10/08 20:03:21 1.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.cocoon.sitemap.SitemapModelComponent;
+import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLPipe;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/07/07 11:43:35 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:21 $
*/
public interface Transformer extends XMLPipe, SitemapModelComponent {
1.33 +31 -35
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TraxTransformer.java 2001/09/07 10:30:36 1.32
+++ TraxTransformer.java 2001/10/08 20:03:21 1.33
@@ -7,41 +7,37 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-import org.apache.cocoon.components.browser.Browser;
-import org.apache.cocoon.components.xslt.XSLTProcessor;
-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.xml.XMLConsumer;
-import org.xml.sax.SAXException;
+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.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.TimeStampCacheValidity;
+import org.apache.cocoon.components.browser.Browser;
+import org.apache.cocoon.components.xslt.XSLTProcessor;
+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.xml.XMLConsumer;
+import org.xml.sax.SAXException;
+
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.TransformerHandler;
+import java.io.IOException;
+import java.text.StringCharacterIterator;
+import java.util.*;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.TransformerHandler;
-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
* a XSLT stylesheet. Use the following sitemap declarations to define,
configure
@@ -80,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Id: TraxTransformer.java,v 1.32 2001/09/07 10:30:36
cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.33 2001/10/08 20:03:21
bloritsch Exp $
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable {
1.5 +20 -20
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WriteDOMSessionTransformer.java 2001/09/26 13:03:23 1.4
+++ WriteDOMSessionTransformer.java 2001/10/08 20:03:21 1.5
@@ -8,26 +8,26 @@
package org.apache.cocoon.transformation;
-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.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.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 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.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Constants;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.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.HashMap;
+import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
/**
@@ -44,7 +44,7 @@
* dom-root-element is the trigger that will be the root element of the DOM
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sven Beauprez</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/09/26 13:03:23 $ $Author:
cziegeler $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class WriteDOMSessionTransformer extends AbstractTransformer
implements
1.16 +27 -33
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XIncludeTransformer.java 2001/09/19 19:37:56 1.15
+++ XIncludeTransformer.java 2001/10/08 20:03:21 1.16
@@ -7,38 +7,32 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-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.Loggable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.parser.Parser;
-import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.components.xpath.XPathProcessor;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-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 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.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
import java.util.Stack;
/**
@@ -49,7 +43,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/09/19 19:37:56 $ $Author: dims
$
+ * @version CVS $Revision: 1.16 $ $Date: 2001/10/08 20:03:21 $ $Author:
bloritsch $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composable, Recyclable, Disposable {
1.8 +36 -50
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XTTransformer.java 2001/08/22 03:51:06 1.7
+++ XTTransformer.java 2001/10/08 20:03:21 1.8
@@ -8,62 +8,48 @@
package org.apache.cocoon.transformation;
-import com.jclark.xsl.om.Name;
-import com.jclark.xsl.om.Node;
-import com.jclark.xsl.om.XSLException;
-import com.jclark.xsl.sax.ExtensionHandlerImpl;
-import com.jclark.xsl.sax.MultiNamespaceResult;
-import com.jclark.xsl.sax.OutputMethodHandler;
-import com.jclark.xsl.sax.ResultBase;
-import com.jclark.xsl.sax.XMLProcessorEx;
-import com.jclark.xsl.sax.XMLProcessorImpl;
-import com.jclark.xsl.tr.Engine;
-import com.jclark.xsl.tr.EngineImpl;
-import com.jclark.xsl.tr.ParameterSet;
-import com.jclark.xsl.tr.Sheet;
-import org.apache.avalon.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.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.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.DocumentHandlerAdapter;
-import org.apache.cocoon.xml.DocumentHandlerWrapper;
-import org.apache.cocoon.xml.XMLConsumer;
-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.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.Parser;
-import org.xml.sax.SAXException;
-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 com.jclark.xsl.om.Name;
+import com.jclark.xsl.om.Node;
+import com.jclark.xsl.om.XSLException;
+import com.jclark.xsl.sax.*;
+import com.jclark.xsl.tr.Engine;
+import com.jclark.xsl.tr.EngineImpl;
+import com.jclark.xsl.tr.ParameterSet;
+import com.jclark.xsl.tr.Sheet;
+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.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.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.xml.DocumentHandlerAdapter;
+import org.apache.cocoon.xml.DocumentHandlerWrapper;
+import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.log.Logger;
+import org.xml.sax.*;
+import org.xml.sax.ext.LexicalHandler;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
/**
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/22 03:51:06 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:21 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composable, Loggable, Recyclable, Disposable {
1.12 +4 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ClassUtils.java 2001/08/20 13:55:18 1.11
+++ ClassUtils.java 2001/10/08 20:03:22 1.12
@@ -8,9 +8,9 @@
package org.apache.cocoon.util;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
/**
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/10/08 20:03:22 $
*/
public class ClassUtils {
1.10 +6 -17 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IOUtils.java 2001/08/29 10:26:58 1.9
+++ IOUtils.java 2001/10/08 20:03:22 1.10
@@ -7,22 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import org.apache.log.Hierarchy;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.text.Collator;
-import java.util.Arrays;
+import org.apache.log.Hierarchy;
+
+import java.io.*;
+import java.text.Collator;
+import java.util.Arrays;
import java.util.Locale;
/**
@@ -31,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/29 10:26:58 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/10/08 20:03:22 $
*/
public class IOUtils {
1.2 +1 -1
xml-cocoon2/src/org/apache/cocoon/util/JavaArchiveFilter.java
Index: JavaArchiveFilter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/util/JavaArchiveFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaArchiveFilter.java 2001/05/09 20:49:33 1.1
+++ JavaArchiveFilter.java 2001/10/08 20:03:22 1.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import java.io.File;
+import java.io.File;
import java.io.FileFilter;
/**
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetUtils.java 2001/08/23 02:42:06 1.5
+++ NetUtils.java 2001/10/08 20:03:22 1.6
@@ -8,15 +8,15 @@
package org.apache.cocoon.util;
+import java.util.Iterator;
import java.util.Map;
-import java.util.Iterator;
/**
* A collection of <code>File</code>, <code>URL</code> and filename
* utility methods
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/23 02:42:06 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:22 $
*/
public class NetUtils {
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PostInputStream.java 2001/08/20 13:55:18 1.3
+++ PostInputStream.java 2001/10/08 20:03:22 1.4
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import java.io.IOException;
+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 <a href="mailto:[EMAIL PROTECTED]">Kinga Dziembowski</a>
- * @version $Id: PostInputStream.java,v 1.3 2001/08/20 13:55:18 dims Exp $
+ * @version $Id: PostInputStream.java,v 1.4 2001/10/08 20:03:22 bloritsch
Exp $
*/
public class PostInputStream extends InputStream {
1.2 +1 -1 xml-cocoon2/src/org/apache/cocoon/util/Tokenizer.java
Index: Tokenizer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/Tokenizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tokenizer.java 2001/05/09 20:49:34 1.1
+++ Tokenizer.java 2001/10/08 20:03:22 1.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import java.util.Enumeration;
+import java.util.Enumeration;
import java.util.NoSuchElementException;
/**
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TraxErrorHandler.java 2001/08/20 13:55:18 1.2
+++ TraxErrorHandler.java 2001/10/08 20:03:22 1.3
@@ -8,10 +8,10 @@
package org.apache.cocoon.util;
-import org.apache.log.Logger;
-
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.SourceLocator;
+import org.apache.log.Logger;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
public class TraxErrorHandler implements ErrorListener {
1.7 +9 -9
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CocoonLogFormatter.java 2001/08/20 13:55:18 1.6
+++ CocoonLogFormatter.java 2001/10/08 20:03:22 1.7
@@ -8,14 +8,14 @@
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 java.text.SimpleDateFormat;
-import java.util.Date;
+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;
/**
@@ -32,7 +32,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:22 $
*/
public class CocoonLogFormatter extends ExtensiblePatternFormatter
1.2 +3 -4
xml-cocoon2/src/org/apache/cocoon/util/log/CocoonTargetFactory.java
Index: CocoonTargetFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/CocoonTargetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CocoonTargetFactory.java 2001/08/30 19:15:43 1.1
+++ CocoonTargetFactory.java 2001/10/08 20:03:22 1.2
@@ -7,9 +7,8 @@
*/
package org.apache.cocoon.util.log;
-import org.apache.avalon.excalibur.logger.factory.FileTargetFactory;
-import org.apache.avalon.framework.configuration.Configuration;
-
+import org.apache.avalon.excalibur.logger.factory.FileTargetFactory;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.log.format.Formatter;
/**
@@ -82,7 +81,7 @@
* </dl>
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:22 $
* @since 4.0
*/
public class CocoonTargetFactory
1.7 +7 -7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExtensiblePatternFormatter.java 2001/08/20 13:55:18 1.6
+++ ExtensiblePatternFormatter.java 2001/10/08 20:03:22 1.7
@@ -8,12 +8,12 @@
package org.apache.cocoon.util.log;
-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 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;
/**
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/08 20:03:22 $
*/
public class ExtensiblePatternFormatter
implements Formatter
1.8 +12 -12
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLCocoonLogFormatter.java 2001/08/20 13:55:18 1.7
+++ XMLCocoonLogFormatter.java 2001/10/08 20:03:22 1.8
@@ -7,17 +7,17 @@
*****************************************************************************/
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 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.StringTokenizer;
/**
@@ -50,7 +50,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/08 20:03:22 $
*/
public class XMLCocoonLogFormatter
implements Formatter {
1.3 +9 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDOMFragment.java 2001/08/20 13:55:18 1.2
+++ AbstractDOMFragment.java 2001/10/08 20:03:22 1.3
@@ -8,14 +8,14 @@
package org.apache.cocoon.xml;
-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 javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+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 javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
/**
@@ -26,7 +26,7 @@
* the results of <code>toDOM()</code> that must be implemented by concrete
subclasses.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public abstract class AbstractDOMFragment implements XMLFragment {
1.3 +2 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSAXFragment.java 2001/08/20 13:55:18 1.2
+++ AbstractSAXFragment.java 2001/10/08 20:03:22 1.3
@@ -8,7 +8,7 @@
package org.apache.cocoon.xml;
-import org.apache.cocoon.xml.dom.DOMBuilder;
+import org.apache.cocoon.xml.dom.DOMBuilder;
import org.w3c.dom.Node;
/**
@@ -19,7 +19,7 @@
* of <code>toSAX()</code> that must be implemented by concrete subclasses.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public abstract class AbstractSAXFragment implements XMLFragment {
1.3 +4 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractXMLConsumer.java 2001/08/20 13:55:18 1.2
+++ AbstractXMLConsumer.java 2001/10/08 20:03:22 1.3
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
/**
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
1.5 +4 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractXMLPipe.java 2001/08/20 13:55:18 1.4
+++ AbstractXMLPipe.java 2001/10/08 20:03:22 1.5
@@ -8,9 +8,9 @@
package org.apache.cocoon.xml;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
/**
@@ -18,7 +18,7 @@
* handlers and lexical handlers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:22 $
*/
public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe,
Recyclable {
1.3 +3 -3
xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLProducer.java
Index: AbstractXMLProducer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/AbstractXMLProducer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractXMLProducer.java 2001/05/10 21:17:08 1.2
+++ AbstractXMLProducer.java 2001/10/08 20:03:22 1.3
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.xml.sax.ContentHandler;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
/**
@@ -17,7 +17,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:17:08 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public abstract class AbstractXMLProducer extends AbstractLoggable
implements XMLProducer {
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentHandlerWrapper.java 2001/09/06 11:10:54 1.3
+++ ContentHandlerWrapper.java 2001/10/08 20:03:22 1.4
@@ -8,11 +8,11 @@
package org.apache.cocoon.xml;
-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.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 +23,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* (Apache Software Foundation, Computer Associates)
- * @version CVS $Revision: 1.3 $ $Date: 2001/09/06 11:10:54 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:22 $
*/
public class ContentHandlerWrapper extends AbstractXMLConsumer implements
Recyclable {
1.3 +6 -10
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentHandlerAdapter.java 2001/08/20 13:55:18 1.2
+++ DocumentHandlerAdapter.java 2001/10/08 20:03:22 1.3
@@ -8,15 +8,11 @@
package org.apache.cocoon.xml;
-import org.xml.sax.AttributeList;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
+import org.xml.sax.*;
+import org.xml.sax.helpers.AttributesImpl;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Vector;
/**
@@ -30,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public class DocumentHandlerAdapter extends AbstractXMLProducer
implements DocumentHandler {
1.3 +9 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentHandlerWrapper.java 2001/08/20 13:55:18 1.2
+++ DocumentHandlerWrapper.java 2001/10/08 20:03:22 1.3
@@ -8,14 +8,14 @@
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributeListImpl;
-
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.log.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributeListImpl;
+
import java.util.Vector;
/**
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:18 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
Loggable /*, Recyclable*/ {
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/xml/EmbeddedXMLPipe.java
Index: EmbeddedXMLPipe.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/EmbeddedXMLPipe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmbeddedXMLPipe.java 2001/07/24 12:10:04 1.1
+++ EmbeddedXMLPipe.java 2001/10/08 20:03:22 1.2
@@ -8,7 +8,7 @@
package org.apache.cocoon.xml;
-import org.xml.sax.ContentHandler;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
@@ -19,7 +19,7 @@
* events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/07/24 12:10:04 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:22 $
*/
public class EmbeddedXMLPipe extends AbstractXMLPipe
{
1.6 +5 -5
xml-cocoon2/src/org/apache/cocoon/xml/IncludeXMLConsumer.java
Index: IncludeXMLConsumer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/IncludeXMLConsumer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IncludeXMLConsumer.java 2001/06/19 13:34:20 1.5
+++ IncludeXMLConsumer.java 2001/10/08 20:03:22 1.6
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+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;
/**
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Carsten Ziegeler</a>
- * @version $Revision: 1.5 $ $Date: 2001/06/19 13:34:20 $
+ * @version $Revision: 1.6 $ $Date: 2001/10/08 20:03:22 $
*/
public class IncludeXMLConsumer extends AbstractXMLConsumer {
final private ContentHandler contentHandler;
1.3 +8 -8
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingEntityResolver.java 2001/08/20 13:55:18 1.2
+++ LoggingEntityResolver.java 2001/10/08 20:03:22 1.3
@@ -1,13 +1,13 @@
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-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 org.apache.avalon.framework.logger.AbstractLoggable;
+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;
/**
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/xml/XMLConsumer.java
Index: XMLConsumer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLConsumer.java 2001/05/09 20:49:31 1.1
+++ XMLConsumer.java 2001/10/08 20:03:22 1.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.xml.sax.ContentHandler;
+import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
/**
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:31 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:22 $
*/
public interface XMLConsumer extends ContentHandler, LexicalHandler {
}
1.4 +1 -3 xml-cocoon2/src/org/apache/cocoon/xml/XMLFragment.java
Index: XMLFragment.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLFragment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLFragment.java 2001/08/24 10:03:45 1.3
+++ XMLFragment.java 2001/10/08 20:03:22 1.4
@@ -8,8 +8,6 @@
package org.apache.cocoon.xml;
import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
/**
* This interface must be implemented by classes willing
@@ -23,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> for the
original XObject class
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/24 10:03:45 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:22 $
*/
public interface XMLFragment extends XMLizable {
1.2 +5 -5 xml-cocoon2/src/org/apache/cocoon/xml/XMLMulticaster.java
Index: XMLMulticaster.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLMulticaster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLMulticaster.java 2001/05/09 20:49:31 1.1
+++ XMLMulticaster.java 2001/10/08 20:03:22 1.2
@@ -9,15 +9,15 @@
*/
package org.apache.cocoon.xml;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+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;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:31 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:22 $
*/
public final class XMLMulticaster implements XMLConsumer {
1.3 +3 -4 xml-cocoon2/src/org/apache/cocoon/xml/XMLizable.java
Index: XMLizable.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLizable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLizable.java 2001/09/08 04:31:10 1.2
+++ XMLizable.java 2001/10/08 20:03:22 1.3
@@ -7,9 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.cocoon.ProcessingException;
-
-import org.xml.sax.ContentHandler;
+import org.apache.cocoon.ProcessingException;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
@@ -17,7 +16,7 @@
* of their current state as SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/09/08 04:31:10 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/10/08 20:03:22 $
*/
public interface XMLizable {
1.5 +10 -18 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMBuilder.java 2001/08/30 19:15:43 1.4
+++ DOMBuilder.java 2001/10/08 20:03:23 1.5
@@ -8,23 +8,15 @@
package org.apache.cocoon.xml.dom;
-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.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-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.Locator;
-import org.xml.sax.SAXException;
-
+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.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
import java.util.Vector;
/**
@@ -33,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/30 19:15:43 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:23 $
*/
public class DOMBuilder implements XMLConsumer, Loggable {
protected Logger log;
1.6 +14 -14
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMStreamer.java 2001/08/20 13:55:19 1.5
+++ DOMStreamer.java 2001/10/08 20:03:23 1.6
@@ -8,19 +8,19 @@
package org.apache.cocoon.xml.dom;
-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 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 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 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;
/**
@@ -30,7 +30,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/20 13:55:19 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/08 20:03:23 $
*/
public class DOMStreamer extends AbstractXMLProducer {
1.4 +8 -8 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGBuilder.java 2001/08/20 13:55:19 1.3
+++ SVGBuilder.java 2001/10/08 20:03:23 1.4
@@ -8,13 +8,13 @@
package org.apache.cocoon.xml.dom;
-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.Document;
+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.Document;
import org.xml.sax.SAXException;
/**
@@ -22,7 +22,7 @@
* SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:19 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/08 20:03:23 $
*/
public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
protected Logger log;
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtendedXLinkPipe.java 2001/10/01 13:37:24 1.4
+++ ExtendedXLinkPipe.java 2001/10/08 20:03:23 1.5
@@ -8,8 +8,8 @@
package org.apache.cocoon.xml.xlink;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
/**
@@ -26,7 +26,7 @@
* be a way to remove this, that will be a happy day for XML and for Cocoon
too.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/10/01 13:37:24 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/08 20:03:23 $
*/
public abstract class ExtendedXLinkPipe extends XLinkPipe {
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/xml/xlink/XLinkHandler.java
Index: XLinkHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/xlink/XLinkHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XLinkHandler.java 2001/05/09 20:49:32 1.1
+++ XLinkHandler.java 2001/10/08 20:03:23 1.2
@@ -8,7 +8,7 @@
package org.apache.cocoon.xml.xlink;
-import org.xml.sax.Attributes;
+import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
/**
@@ -16,7 +16,7 @@
* event driven design patterns that SAX enforces.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:32 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:23 $
*/
public interface XLinkHandler {
1.2 +4 -4
xml-cocoon2/src/org/apache/cocoon/xml/xlink/XLinkPipe.java
Index: XLinkPipe.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/xlink/XLinkPipe.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XLinkPipe.java 2001/05/09 20:49:32 1.1
+++ XLinkPipe.java 2001/10/08 20:03:23 1.2
@@ -8,9 +8,9 @@
package org.apache.cocoon.xml.xlink;
-import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
+import org.apache.cocoon.xml.AbstractXMLPipe;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
/**
@@ -23,7 +23,7 @@
* NOTE: this is based on XLink W3C Candidate Recommendation 3 July 2000
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:32 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:23 $
*/
public abstract class XLinkPipe extends AbstractXMLPipe implements
XLinkHandler {
1.2 +1 -3 xml-cocoon2/test/org/apache/cocoon/util/IOUtilsTest.java
Index: IOUtilsTest.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/test/org/apache/cocoon/util/IOUtilsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IOUtilsTest.java 2001/08/03 10:53:49 1.1
+++ IOUtilsTest.java 2001/10/08 20:03:23 1.2
@@ -7,15 +7,13 @@
*****************************************************************************///
package org.apache.cocoon.util;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Cases for the IOUtils Class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stuart Roebuck</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/08/03 10:53:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/10/08 20:03:23 $
*/
public class IOUtilsTest extends TestCase {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
