cziegeler 01/10/11 01:56:18
Modified: src/org/apache/cocoon Tag: cocoon_20_branch Cocoon.java
CodeFactory.java ConnectionResetException.java
Notification.java Notifier.java
ProcessingException.java Processor.java
ProcessorWrapper.java
ResourceNotFoundException.java
src/org/apache/cocoon/caching Tag: cocoon_20_branch
AggregatedCacheValidity.java CachedEventObject.java
CachedStreamObject.java CachingOutputStream.java
PipelineCacheKey.java
src/org/apache/cocoon/components/browser Tag:
cocoon_20_branch Browser.java
src/org/apache/cocoon/components/classloader Tag:
cocoon_20_branch ClassLoaderManager.java
ClassLoaderManagerImpl.java
RepositoryClassLoader.java
src/org/apache/cocoon/components/hsqldb Tag:
cocoon_20_branch ServerImpl.java
src/org/apache/cocoon/components/jsp Tag: cocoon_20_branch
JSPEngine.java JSPEngineImpl.java
JSPEngineImplNamedDispatcherInclude.java
JSPEngineImplWLS.java
src/org/apache/cocoon/components/language Tag:
cocoon_20_branch LanguageException.java
src/org/apache/cocoon/components/language/generator Tag:
cocoon_20_branch CompiledComponent.java
GeneratorSelector.java ProgramGenerator.java
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
cocoon_20_branch AbstractMarkupLanguage.java
Logicsheet.java LogicsheetCodeGenerator.java
MarkupCodeGenerator.java MarkupLanguage.java
NamedLogicsheet.java
src/org/apache/cocoon/components/language/markup/sitemap
Tag: cocoon_20_branch SitemapMarkupLanguage.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
cocoon_20_branch XSPCookieHelper.java
XSPFormValidatorHelper.java XSPGenerator.java
XSPMarkupLanguage.java XSPObjectHelper.java
XSPRequestHelper.java XSPResponseHelper.java
XSPUtil.java
src/org/apache/cocoon/components/language/programming Tag:
cocoon_20_branch AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
LanguageCompiler.java ProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: cocoon_20_branch AbstractJavaCompiler.java
JavaLanguage.java Jikes.java JstyleFormatter.java
src/org/apache/cocoon/components/language/programming/javascript
Tag: cocoon_20_branch JavascriptLanguage.java
src/org/apache/cocoon/components/parser Tag:
cocoon_20_branch Parser.java XercesParser.java
src/org/apache/cocoon/components/pipeline Tag:
cocoon_20_branch AbstractEventPipeline.java
AbstractStreamPipeline.java
CacheableEventPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java EventPipeline.java
NonCachingStreamPipeline.java StreamPipeline.java
src/org/apache/cocoon/components/renderer Tag:
cocoon_20_branch ExtendableRendererFactory.java
src/org/apache/cocoon/components/resolver Tag:
cocoon_20_branch Resolver.java ResolverImpl.java
src/org/apache/cocoon/components/sax Tag: cocoon_20_branch
XMLByteStreamCompiler.java
XMLByteStreamFragment.java
XMLByteStreamInterpreter.java XMLDeserializer.java
XMLTeePipe.java
src/org/apache/cocoon/components/saxconnector Tag:
cocoon_20_branch LoggingSAXConnector.java
SAXConnector.java
src/org/apache/cocoon/components/source Tag:
cocoon_20_branch CocoonSourceFactory.java
SitemapSource.java SourceFactory.java
SourceHandler.java SourceHandlerImpl.java
URLSource.java
src/org/apache/cocoon/components/store Tag: cocoon_20_branch
FilesystemStore.java MemoryStore.java Store.java
StoreJanitorImpl.java
src/org/apache/cocoon/components/transcoder Tag:
cocoon_20_branch ExtendableTranscoderFactory.java
src/org/apache/cocoon/components/url Tag: cocoon_20_branch
ContextURLFactory.java ResourceURLFactory.java
URLFactory.java URLFactoryImpl.java
src/org/apache/cocoon/components/xslt Tag: cocoon_20_branch
XSLTProcessor.java
src/org/apache/cocoon/environment Tag: cocoon_20_branch
AbstractEnvironment.java Context.java
Environment.java Request.java Source.java
SourceResolver.java URLFactorySourceResolver.java
src/org/apache/cocoon/environment/commandline Tag:
cocoon_20_branch
AbstractCommandLineEnvironment.java
CommandLineRequest.java CommandLineResponse.java
CommandLineSession.java CommandlineContext.java
FileSavingEnvironment.java
LinkSamplingEnvironment.java
src/org/apache/cocoon/environment/http Tag: cocoon_20_branch
HttpContext.java HttpEnvironment.java
HttpRequest.java HttpResponse.java HttpSession.java
RequestWrapper22.java RequestWrapper23.java
RequestWrapperMaybeUpload22.java
RequestWrapperMaybeUpload23.java
src/org/apache/cocoon/environment/wrapper Tag:
cocoon_20_branch EnvironmentWrapper.java
RequestParameters.java RequestWrapper.java
src/org/apache/cocoon/generation Tag: cocoon_20_branch
AbstractGenerator.java AbstractServerPage.java
ComposerGenerator.java DirectoryGenerator.java
FileGenerator.java FragmentExtractorGenerator.java
Generator.java HTMLGenerator.java
ImageDirectoryGenerator.java JspGenerator.java
PhpGenerator.java RequestGenerator.java
ScriptGenerator.java ServletGenerator.java
StatusGenerator.java StreamGenerator.java
VelocityGenerator.java
src/org/apache/cocoon/i18n Tag: cocoon_20_branch
XMLResourceBundle.java
XMLResourceBundleFactory.java
src/org/apache/cocoon/matching Tag: cocoon_20_branch
BrowserMatcherFactory.java Matcher.java
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
RequestParamMatcher.java
WildcardHeaderMatcherFactory.java
WildcardParameterValueMatcherFactory.java
WildcardSessionAttributeMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: cocoon_20_branch
AbstractReader.java DatabaseReader.java Reader.java
ResourceReader.java
src/org/apache/cocoon/samples/parentcm Tag: cocoon_20_branch
Configurator.java Generator.java
ParentComponentManager.java Time.java
TimeComponent.java
src/org/apache/cocoon/selection Tag: cocoon_20_branch
BrowserSelectorFactory.java
CodedSelectorFactory.java
HeaderSelectorFactory.java HostSelectorFactory.java
ParameterSelectorFactory.java
RequestSelectorFactory.java Selector.java
SessionAttributeSelectorFactory.java
src/org/apache/cocoon/selection/helpers Tag:
cocoon_20_branch CodedSelectorHelper.java
src/org/apache/cocoon/serialization Tag: cocoon_20_branch
AbstractSerializer.java AbstractTextSerializer.java
FOPSerializer.java HTMLSerializer.java
LinkSerializer.java SVGSerializer.java
Serializer.java TextSerializer.java
XMLSerializer.java
src/org/apache/cocoon/servlet Tag: cocoon_20_branch
ParanoidClassLoader.java ParanoidCocoonServlet.java
src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
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 Tag: cocoon_20_branch
AbstractDOMTransformer.java
CIncludeTransformer.java FilterTransformer.java
FragmentExtractorTransformer.java
I18nTransformer.java LDAPTransformer.java
LogTransformer.java ReadDOMSessionTransformer.java
SQLTransformer.java Transformer.java
WriteDOMSessionTransformer.java
XIncludeTransformer.java XTTransformer.java
src/org/apache/cocoon/util Tag: cocoon_20_branch
ClassUtils.java HashUtil.java IOUtils.java
JavaArchiveFilter.java NetUtils.java
PostInputStream.java Tokenizer.java
TraxErrorHandler.java
src/org/apache/cocoon/util/log Tag: cocoon_20_branch
CocoonLogFormatter.java CocoonTargetFactory.java
ExtensiblePatternFormatter.java
XMLCocoonLogFormatter.java
src/org/apache/cocoon/xml Tag: cocoon_20_branch
AbstractDOMFragment.java AbstractSAXFragment.java
AbstractXMLConsumer.java AbstractXMLPipe.java
AbstractXMLProducer.java ContentHandlerWrapper.java
DocumentHandlerAdapter.java
DocumentHandlerWrapper.java EmbeddedXMLPipe.java
IncludeXMLConsumer.java LoggingEntityResolver.java
XMLConsumer.java XMLMulticaster.java XMLizable.java
src/org/apache/cocoon/xml/dom Tag: cocoon_20_branch
DOMBuilder.java DOMStreamer.java SVGBuilder.java
src/org/apache/cocoon/xml/xlink Tag: cocoon_20_branch
ExtendedXLinkPipe.java XLinkHandler.java
XLinkPipe.java
Log:
Hopefully fixed line endings of source and added simple utility build task
for this.
Revision Changes Path
No revision
No revision
1.9.2.22 +43 -43 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.9.2.21
retrieving revision 1.9.2.22
diff -u -r1.9.2.21 -r1.9.2.22
--- Cocoon.java 2001/10/08 20:18:49 1.9.2.21
+++ Cocoon.java 2001/10/11 08:56:04 1.9.2.22
@@ -7,48 +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.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 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;
/**
@@ -57,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.9.2.21 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.9.2.22 $ $Date: 2001/10/11 08:56:04 $
*/
public class Cocoon
extends AbstractLoggable
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- CodeFactory.java 2001/10/08 20:18:49 1.1.1.1.2.2
+++ CodeFactory.java 2001/10/11 08:56:04 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:04 $
*/
public interface CodeFactory {
1.1.1.1.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/ConnectionResetException.java
Index: ConnectionResetException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/ConnectionResetException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ConnectionResetException.java 2001/05/09 20:49:27 1.1.1.1
+++ ConnectionResetException.java 2001/10/11 08:56:04 1.1.1.1.2.1
@@ -12,7 +12,7 @@
* due to a connection reset by peer.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:27 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/10/11 08:56:04 $
*/
public class ConnectionResetException extends ProcessingException {
@@ -30,4 +30,4 @@
public ConnectionResetException(String message, Throwable t) {
super(message, t);
}
-}
\ No newline at end of file
+}
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Notification.java 2001/10/08 20:18:49 1.2.2.3
+++ Notification.java 2001/10/11 08:56:04 1.2.2.4
@@ -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.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Notifier.java 2001/10/08 20:18:49 1.2.2.3
+++ Notifier.java 2001/10/11 08:56:04 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:04 $
*/
public class Notifier {
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- ProcessingException.java 2001/10/08 20:18:49 1.1.1.1.2.4
+++ ProcessingException.java 2001/10/11 08:56:04 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:04 $
*/
public class ProcessingException extends CascadingException {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- Processor.java 2001/10/08 20:18:49 1.1.1.1.2.3
+++ Processor.java 2001/10/11 08:56:04 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:04 $
*/
public interface Processor {
1.1.2.3 +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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ProcessorWrapper.java 2001/10/08 20:18:49 1.1.2.2
+++ ProcessorWrapper.java 2001/10/11 08:56:04 1.1.2.3
@@ -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.2.2 $ $Date: 2001/10/08 20:18:49 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:04 $
*/
public final class ProcessorWrapper
implements Processor, Component, Disposable, ThreadSafe {
1.1.1.1.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/ResourceNotFoundException.java
Index: ResourceNotFoundException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/ResourceNotFoundException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ResourceNotFoundException.java 2001/05/09 20:49:27 1.1.1.1
+++ ResourceNotFoundException.java 2001/10/11 08:56:04 1.1.1.1.2.1
@@ -12,7 +12,7 @@
* a resource.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:27 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/10/11 08:56:04 $
*/
public class ResourceNotFoundException extends ProcessingException {
@@ -30,4 +30,4 @@
public ResourceNotFoundException(String message, Throwable t) {
super(message, t);
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.2.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.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AggregatedCacheValidity.java 2001/10/08 20:18:51 1.1.2.2
+++ AggregatedCacheValidity.java 2001/10/11 08:56:05 1.1.2.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.1.2.2 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:05 $
*/
public final class AggregatedCacheValidity
implements CacheValidity {
1.1.1.1.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CachedEventObject.java
Index: CachedEventObject.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CachedEventObject.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- CachedEventObject.java 2001/07/13 20:49:02 1.1.1.1.2.1
+++ CachedEventObject.java 2001/10/11 08:56:05 1.1.1.1.2.2
@@ -13,7 +13,7 @@
* This is an cached object as it is stored in the <code>EventCache</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/13 20:49:02 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:05 $
*/
public final class CachedEventObject implements java.io.Serializable {
@@ -61,4 +61,4 @@
public Object getSAXFragment() {
return this.saxFragment;
}
-}
\ No newline at end of file
+}
1.1.1.1.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CachedStreamObject.java
Index: CachedStreamObject.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CachedStreamObject.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- CachedStreamObject.java 2001/07/13 20:49:03 1.1.1.1.2.1
+++ CachedStreamObject.java 2001/10/11 08:56:05 1.1.1.1.2.2
@@ -13,7 +13,7 @@
* This is an cached object as it is stored in the <code>StreamCache</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/13 20:49:03 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:05 $
*/
public final class CachedStreamObject implements java.io.Serializable {
@@ -61,4 +61,4 @@
public byte[] getResponse() {
return this.response;
}
-}
\ No newline at end of file
+}
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- CachingOutputStream.java 2001/10/08 20:18:51 1.2.2.2
+++ CachingOutputStream.java 2001/10/11 08:56:05 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:05 $
*/
public final class CachingOutputStream
1.2.2.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java
Index: PipelineCacheKey.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- PipelineCacheKey.java 2001/10/08 20:18:51 1.2.2.2
+++ PipelineCacheKey.java 2001/10/11 08:56:05 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:05 $
*/
public final class PipelineCacheKey {
No revision
No revision
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Browser.java 2001/10/08 20:18:51 1.2.2.3
+++ Browser.java 2001/10/11 08:56:05 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:05 $
*/
public interface Browser extends Component {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ClassLoaderManager.java 2001/10/08 20:18:51 1.1.1.1.2.3
+++ ClassLoaderManager.java 2001/10/11 08:56:05 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:05 $
*/
public interface ClassLoaderManager extends Component {
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ClassLoaderManagerImpl.java 2001/10/08 20:18:51 1.2.2.3
+++ ClassLoaderManagerImpl.java 2001/10/11 08:56:05 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:05 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager,
ThreadSafe {
/**
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- RepositoryClassLoader.java 2001/10/08 20:18:51 1.1.1.1.2.3
+++ RepositoryClassLoader.java 2001/10/11 08:56:05 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:05 $
*/
public class RepositoryClassLoader extends URLClassLoader implements
Loggable {
No revision
No revision
1.2.2.3 +15 -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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ServerImpl.java 2001/10/08 20:18:51 1.2.2.2
+++ ServerImpl.java 2001/10/11 08:56:05 1.2.2.3
@@ -7,20 +7,20 @@
*****************************************************************************/
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;
/**
@@ -101,4 +101,4 @@
org.hsqldb.Server.main(arguments);
}
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.2.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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JSPEngine.java 2001/10/08 20:18:51 1.1.2.3
+++ JSPEngine.java 2001/10/11 08:56:05 1.1.2.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.1.2.3 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:05 $
*/
public interface JSPEngine extends Component {
1.1.2.5 +26 -26
xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java
Index: JSPEngineImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JSPEngineImpl.java 2001/10/08 20:18:51 1.1.2.4
+++ JSPEngineImpl.java 2001/10/11 08:56:05 1.1.2.5
@@ -7,31 +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 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 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;
/**
@@ -39,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.1.2.4 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:05 $
*/
public class JSPEngineImpl extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.2.2.3 +25 -25
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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- JSPEngineImplNamedDispatcherInclude.java 2001/10/08 20:18:51 1.2.2.2
+++ JSPEngineImplNamedDispatcherInclude.java 2001/10/11 08:56:05 1.2.2.3
@@ -7,30 +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.*;
-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 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;
/**
@@ -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.2.2 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:05 $
*/
public class JSPEngineImplNamedDispatcherInclude extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
1.2.2.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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- JSPEngineImplWLS.java 2001/10/08 20:18:51 1.2.2.2
+++ JSPEngineImplWLS.java 2001/10/11 08:56:05 1.2.2.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.2.2 $ $Date: 2001/10/08 20:18:51 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:05 $
*/
public class JSPEngineImplWLS extends AbstractLoggable
implements JSPEngine, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
No revision
No revision
1.1.1.1.2.3 +4 -4
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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- LanguageException.java 2001/10/08 20:18:52 1.1.1.1.2.2
+++ LanguageException.java 2001/10/11 08:56:06 1.1.1.1.2.3
@@ -7,16 +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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:06 $
*/
public class LanguageException extends CascadingException {
/**
No revision
No revision
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- CompiledComponent.java 2001/10/08 20:18:52 1.1.1.1.2.1
+++ CompiledComponent.java 2001/10/11 08:56:06 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:06 $
*/
public interface CompiledComponent extends Component, Composable, Modifiable
{
}
1.1.1.1.2.11 +15 -15
xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.1.1.1.2.10
retrieving revision 1.1.1.1.2.11
diff -u -r1.1.1.1.2.10 -r1.1.1.1.2.11
--- GeneratorSelector.java 2001/10/08 20:18:52 1.1.1.1.2.10
+++ GeneratorSelector.java 2001/10/11 08:56:06 1.1.1.1.2.11
@@ -7,20 +7,20 @@
*****************************************************************************/
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 java.io.File;
+import org.apache.avalon.excalibur.component.ComponentHandler;
+import org.apache.avalon.excalibur.component.ExcaliburComponentSelector;
+import org.apache.avalon.excalibur.component.RoleManager;
+import org.apache.avalon.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.*;
/**
@@ -28,7 +28,7 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.1.1.2.10 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.1.1.2.11 $ $Date: 2001/10/11 08:56:06 $
*/
public class GeneratorSelector extends ExcaliburComponentSelector implements
Disposable {
1.3.2.5 +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.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- ProgramGenerator.java 2001/10/08 20:18:52 1.3.2.4
+++ ProgramGenerator.java 2001/10/11 08:56:06 1.3.2.5
@@ -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.3.2.4 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/11 08:56:06 $
*/
public interface ProgramGenerator extends Component {
1.5.2.17 +27 -27
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.5.2.16
retrieving revision 1.5.2.17
diff -u -r1.5.2.16 -r1.5.2.17
--- ProgramGeneratorImpl.java 2001/10/08 20:18:52 1.5.2.16
+++ ProgramGeneratorImpl.java 2001/10/11 08:56:06 1.5.2.17
@@ -8,38 +8,38 @@
package org.apache.cocoon.components.language.generator;
-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 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.5.2.16 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.5.2.17 $ $Date: 2001/10/11 08:56:06 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
No revision
No revision
1.4.2.7 +21 -21
xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- AbstractMarkupLanguage.java 2001/10/08 20:18:52 1.4.2.6
+++ AbstractMarkupLanguage.java 2001/10/11 08:56:06 1.4.2.7
@@ -8,26 +8,26 @@
package org.apache.cocoon.components.language.markup;
-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 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.*;
/**
@@ -38,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.4.2.6 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.4.2.7 $ $Date: 2001/10/11 08:56:06 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable
1.3.2.5 +21 -21
xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- Logicsheet.java 2001/10/08 20:18:52 1.3.2.4
+++ Logicsheet.java 2001/10/11 08:56:06 1.3.2.5
@@ -8,26 +8,26 @@
package org.apache.cocoon.components.language.markup;
-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 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;
/**
@@ -41,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.3.2.4 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.3.2.5 $ $Date: 2001/10/11 08:56:06 $
*/
public class Logicsheet extends AbstractLoggable
{
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- LogicsheetCodeGenerator.java 2001/10/08 20:18:52 1.2.2.2
+++ LogicsheetCodeGenerator.java 2001/10/11 08:56:06 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:06 $
*/
public class LogicsheetCodeGenerator extends AbstractLoggable implements
MarkupCodeGenerator {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- MarkupCodeGenerator.java 2001/10/08 20:18:52 1.1.1.1.2.2
+++ MarkupCodeGenerator.java 2001/10/11 08:56:06 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:06 $
*/
public interface MarkupCodeGenerator {
/**
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- MarkupLanguage.java 2001/10/08 20:18:52 1.2.2.3
+++ MarkupLanguage.java 2001/10/11 08:56:06 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:06 $
*/
public interface MarkupLanguage extends Component {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- NamedLogicsheet.java 2001/10/08 20:18:52 1.1.1.1.2.3
+++ NamedLogicsheet.java 2001/10/11 08:56:06 1.1.1.1.2.4
@@ -7,10 +7,10 @@
*****************************************************************************/
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 org.apache.avalon.framework.component.ComponentManager;
+import org.apache.cocoon.components.url.URLFactory;
+
+import java.io.IOException;
import java.net.MalformedURLException;
/**
@@ -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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:06 $
*/
public class NamedLogicsheet extends Logicsheet {
/**
No revision
No revision
1.2.2.4 +17 -17
xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java
Index: SitemapMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/SitemapMarkupLanguage.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- SitemapMarkupLanguage.java 2001/10/08 20:18:52 1.2.2.3
+++ SitemapMarkupLanguage.java 2001/10/11 08:56:06 1.2.2.4
@@ -7,22 +7,22 @@
*****************************************************************************/
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 java.io.File;
-import java.io.IOException;
+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.*;
/**
@@ -30,7 +30,7 @@
* <a href="http://xml.apache.org/cocoon/sitemap.html";>Sitemap</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:06 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.2.2.8 +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.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- XSPCookieHelper.java 2001/10/08 20:18:52 1.2.2.7
+++ XSPCookieHelper.java 2001/10/11 08:56:06 1.2.2.8
@@ -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.1.2.12 +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.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- XSPFormValidatorHelper.java 2001/10/08 20:18:52 1.1.2.11
+++ XSPFormValidatorHelper.java 2001/10/11 08:56:07 1.1.2.12
@@ -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.1.2.11 $ $Date: 2001/10/08 20:18:52 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPFormValidatorHelper {
/**
1.2.2.6 +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.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- XSPGenerator.java 2001/10/08 20:18:53 1.2.2.5
+++ XSPGenerator.java 2001/10/11 08:56:07 1.2.2.6
@@ -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.2.2.5 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/10/11 08:56:07 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Recyclable {
protected Context avalonContext = null;
1.2.2.4 +17 -17
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
Index: XSPMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- XSPMarkupLanguage.java 2001/10/08 20:18:53 1.2.2.3
+++ XSPMarkupLanguage.java 2001/10/11 08:56:07 1.2.2.4
@@ -7,22 +7,22 @@
*****************************************************************************/
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 java.io.File;
-import java.io.IOException;
+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.*;
/**
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Sahuc</a>
- * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPMarkupLanguage extends AbstractMarkupLanguage {
1.1.1.1.2.6 +10 -10
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Index: XSPObjectHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- XSPObjectHelper.java 2001/10/08 20:18:53 1.1.1.1.2.5
+++ XSPObjectHelper.java 2001/10/11 08:56:07 1.1.1.1.2.6
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-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 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;
/**
@@ -24,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.1.1.1.2.5 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPObjectHelper {
/**
1.5.2.6 +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.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- XSPRequestHelper.java 2001/10/08 20:18:53 1.5.2.5
+++ XSPRequestHelper.java 2001/10/11 08:56:07 1.5.2.6
@@ -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.5.2.5 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.5.2.6 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPRequestHelper {
/**
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- XSPResponseHelper.java 2001/10/08 20:18:53 1.1.1.1.2.3
+++ XSPResponseHelper.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPResponseHelper {
/**
1.2.2.5 +16 -16
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- XSPUtil.java 2001/10/08 20:18:53 1.2.2.4
+++ XSPUtil.java 2001/10/11 08:56:07 1.2.2.5
@@ -7,28 +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.*;
-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.2.2.4 $ $Date: 2001/10/08 20:18:53 $
+ * @version $Revision: 1.2.2.5 $ $Date: 2001/10/11 08:56:07 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractProgrammingLanguage.java 2001/10/08 20:18:53 1.1.1.1.2.2
+++ AbstractProgrammingLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
*/
public abstract class AbstractProgrammingLanguage extends AbstractLoggable
implements ProgrammingLanguage, Configurable
1.1.1.1.2.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.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7
--- CompiledProgrammingLanguage.java 2001/10/08 20:18:53 1.1.1.1.2.6
+++ CompiledProgrammingLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.6 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.7 $ $Date: 2001/10/11 08:56:07 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- LanguageCompiler.java 2001/10/08 20:18:53 1.1.1.1.2.2
+++ LanguageCompiler.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:53 $
+ * @version $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
* @since 2.0
*/
public interface LanguageCompiler extends Component {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ProgrammingLanguage.java 2001/10/08 20:18:53 1.1.1.1.2.3
+++ ProgrammingLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:07 $
*/
public interface ProgrammingLanguage extends Component {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractJavaCompiler.java 2001/10/08 20:18:53 1.1.1.1.2.2
+++ AbstractJavaCompiler.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:53 $
+ * @version $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler extends AbstractLoggable
implements LanguageCompiler, Recyclable {
1.2.2.8 +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.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- JavaLanguage.java 2001/10/08 20:18:53 1.2.2.7
+++ JavaLanguage.java 2001/10/11 08:56:07 1.2.2.8
@@ -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.2.2.7 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/10/11 08:56:07 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
1.1.1.1.2.7 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7
--- Jikes.java 2001/10/08 20:18:53 1.1.1.1.2.6
+++ Jikes.java 2001/10/11 08:56:07 1.1.1.1.2.7
@@ -8,18 +8,18 @@
package org.apache.cocoon.components.language.programming.java;
-import org.apache.cocoon.components.language.programming.CompilerError;
-
-import java.io.*;
-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.1.1.1.2.6 $ $Date: 2001/10/08 20:18:53 $
+ * @version $Revision: 1.1.1.1.2.7 $ $Date: 2001/10/11 08:56:07 $
* @since 2.0
*/
1.1.1.1.2.3 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- JstyleFormatter.java 2001/10/08 20:18:53 1.1.1.1.2.2
+++ JstyleFormatter.java 2001/10/11 08:56:07 1.1.1.1.2.3
@@ -7,11 +7,11 @@
*****************************************************************************/
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.*;
/**
@@ -20,7 +20,7 @@
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/08 20:18:53 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
*/
public class JstyleFormatter extends AbstractLoggable implements
CodeFormatter {
/**
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- JavascriptLanguage.java 2001/10/08 20:18:54 1.1.1.1.2.2
+++ JavascriptLanguage.java 2001/10/11 08:56:07 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:07 $
*/
public class JavascriptLanguage extends JavaLanguage
{
No revision
No revision
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Parser.java 2001/10/08 20:18:54 1.2.2.3
+++ Parser.java 2001/10/11 08:56:08 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:08 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
1.1.2.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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XercesParser.java 2001/10/08 20:18:54 1.1.2.3
+++ XercesParser.java 2001/10/11 08:56:08 1.1.2.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.1.2.3 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:08 $
*/
public class XercesParser extends AbstractXMLProducer
implements Parser, ErrorHandler, Composable, SingleThreaded {
No revision
No revision
1.5.2.11 +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.5.2.10
retrieving revision 1.5.2.11
diff -u -r1.5.2.10 -r1.5.2.11
--- AbstractEventPipeline.java 2001/10/08 20:18:54 1.5.2.10
+++ AbstractEventPipeline.java 2001/10/11 08:56:08 1.5.2.11
@@ -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.5.2.10 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.5.2.11 $ $Date: 2001/10/11 08:56:08 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
1.3.2.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.3.2.9
retrieving revision 1.3.2.10
diff -u -r1.3.2.9 -r1.3.2.10
--- AbstractStreamPipeline.java 2001/10/08 20:18:54 1.3.2.9
+++ AbstractStreamPipeline.java 2001/10/11 08:56:08 1.3.2.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.3.2.9 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.3.2.10 $ $Date: 2001/10/11 08:56:08 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable
implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- CacheableEventPipeline.java 2001/10/08 20:18:54 1.2.2.2
+++ CacheableEventPipeline.java 2001/10/11 08:56:08 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:08 $
*/
public interface CacheableEventPipeline {
1.7.2.13 +24 -24
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.7.2.12
retrieving revision 1.7.2.13
diff -u -r1.7.2.12 -r1.7.2.13
--- CachingEventPipeline.java 2001/10/08 20:18:54 1.7.2.12
+++ CachingEventPipeline.java 2001/10/11 08:56:08 1.7.2.13
@@ -7,29 +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.*;
-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;
/**
@@ -41,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.7.2.12 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.7.2.13 $ $Date: 2001/10/11 08:56:08 $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
1.3.2.12 +18 -18
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -r1.3.2.11 -r1.3.2.12
--- CachingStreamPipeline.java 2001/10/08 20:18:54 1.3.2.11
+++ CachingStreamPipeline.java 2001/10/11 08:56:08 1.3.2.12
@@ -7,23 +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.*;
-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
@@ -41,7 +41,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3.2.11 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.3.2.12 $ $Date: 2001/10/11 08:56:08 $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
1.2.2.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.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- EventPipeline.java 2001/10/08 20:18:54 1.2.2.7
+++ EventPipeline.java 2001/10/11 08:56:08 1.2.2.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.2.2.7 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/10/11 08:56:08 $
*/
public interface EventPipeline extends Component, Composable, Recyclable {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- NonCachingStreamPipeline.java 2001/10/08 20:18:54 1.1.1.1.2.2
+++ NonCachingStreamPipeline.java 2001/10/11 08:56:08 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:08 $
*/
public final class NonCachingStreamPipeline extends AbstractStreamPipeline {
1.2.2.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.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- StreamPipeline.java 2001/10/08 20:18:54 1.2.2.6
+++ StreamPipeline.java 2001/10/11 08:56:08 1.2.2.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.2.2.6 $ $Date: 2001/10/08 20:18:54 $
+ * @version CVS $Revision: 1.2.2.7 $ $Date: 2001/10/11 08:56:08 $
*/
public interface StreamPipeline extends Component, Composable, Recyclable {
No revision
No revision
1.2.2.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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ExtendableRendererFactory.java 2001/10/08 20:18:54 1.2.2.2
+++ ExtendableRendererFactory.java 2001/10/11 08:56:08 1.2.2.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.2.2 $, $Date: 2001/10/08 20:18:54 $
+ * @version $Revision: 1.2.2.3 $, $Date: 2001/10/11 08:56:08 $
*/
public class ExtendableRendererFactory implements RendererFactory {
No revision
No revision
1.2.2.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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- Resolver.java 2001/10/08 20:18:55 1.2.2.2
+++ Resolver.java 2001/10/11 08:56:08 1.2.2.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.2.2 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:08 $
*/
public interface Resolver extends Component, EntityResolver {
1.2.2.4 +19 -19
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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ResolverImpl.java 2001/10/08 20:18:55 1.2.2.3
+++ ResolverImpl.java 2001/10/11 08:56:08 1.2.2.4
@@ -7,24 +7,24 @@
*****************************************************************************/
package org.apache.cocoon.components.resolver;
-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.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;
@@ -41,7 +41,7 @@
* </resolver>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:08 $
*/
public class ResolverImpl extends AbstractLoggable
implements Resolver, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- XMLByteStreamCompiler.java 2001/10/08 20:18:55 1.1.1.1.2.4
+++ XMLByteStreamCompiler.java 2001/10/11 08:56:09 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:09 $
*/
public final class XMLByteStreamCompiler
1.4.2.3 +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.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- XMLByteStreamFragment.java 2001/10/08 20:18:55 1.4.2.2
+++ XMLByteStreamFragment.java 2001/10/11 08:56:09 1.4.2.3
@@ -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.2.2 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/10/11 08:56:09 $
*/
public class XMLByteStreamFragment extends AbstractSAXFragment {
1.4.2.4 +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.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- XMLByteStreamInterpreter.java 2001/10/08 20:18:55 1.4.2.3
+++ XMLByteStreamInterpreter.java 2001/10/11 08:56:09 1.4.2.4
@@ -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.4.2.3 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.4.2.4 $ $Date: 2001/10/11 08:56:09 $
*/
public final class XMLByteStreamInterpreter
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XMLDeserializer.java 2001/10/08 20:18:55 1.2.2.2
+++ XMLDeserializer.java 2001/10/11 08:56:09 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:09 $
*/
public interface XMLDeserializer
extends XMLProducer {
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XMLTeePipe.java 2001/10/08 20:18:55 1.2.2.2
+++ XMLTeePipe.java 2001/10/11 08:56:09 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:09 $
*/
public final class XMLTeePipe
No revision
No revision
1.1.2.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.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- LoggingSAXConnector.java 2001/10/08 20:18:55 1.1.2.4
+++ LoggingSAXConnector.java 2001/10/11 08:56:09 1.1.2.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.1.2.4 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:09 $
*/
public class LoggingSAXConnector
extends AbstractXMLPipe
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- SAXConnector.java 2001/10/08 20:18:55 1.1.1.1.2.3
+++ SAXConnector.java 2001/10/11 08:56:09 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:09 $
*/
public interface SAXConnector extends XMLPipe, Component,
SitemapModelComponent {
No revision
No revision
1.1.2.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.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CocoonSourceFactory.java 2001/10/08 20:18:55 1.1.2.5
+++ CocoonSourceFactory.java 2001/10/11 08:56:09 1.1.2.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.1.2.5 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/10/11 08:56:09 $
*/
public final class CocoonSourceFactory
1.1.2.22 +33 -33
xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- SitemapSource.java 2001/10/08 20:18:55 1.1.2.21
+++ SitemapSource.java 2001/10/11 08:56:09 1.1.2.22
@@ -8,45 +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.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 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.1.2.21 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/10/11 08:56:09 $
*/
public final class SitemapSource
1.1.2.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.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SourceFactory.java 2001/10/08 20:18:55 1.1.2.4
+++ SourceFactory.java 2001/10/11 08:56:09 1.1.2.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.1.2.4 2001/10/08 20:18:55 bloritsch
Exp $
+ * @version $Id: SourceFactory.java,v 1.1.2.5 2001/10/11 08:56:09 cziegeler
Exp $
*/
public interface SourceFactory extends ThreadSafe {
1.1.2.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.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SourceHandler.java 2001/10/08 20:18:55 1.1.2.5
+++ SourceHandler.java 2001/10/11 08:56:09 1.1.2.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.1.2.5 2001/10/08 20:18:55 bloritsch
Exp $
+ * @version $Id: SourceHandler.java,v 1.1.2.6 2001/10/11 08:56:09 cziegeler
Exp $
*/
public interface SourceHandler extends Component {
1.1.2.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.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SourceHandlerImpl.java 2001/10/08 20:18:55 1.1.2.5
+++ SourceHandlerImpl.java 2001/10/11 08:56:09 1.1.2.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.1.2.5 2001/10/08 20:18:55
bloritsch Exp $
+ * @version $Id: SourceHandlerImpl.java,v 1.1.2.6 2001/10/11 08:56:09
cziegeler Exp $
*/
public final class SourceHandlerImpl
extends AbstractLoggable
1.1.2.16 +15 -15
xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- URLSource.java 2001/10/08 20:18:55 1.1.2.15
+++ URLSource.java 2001/10/11 08:56:09 1.1.2.16
@@ -8,27 +8,27 @@
package org.apache.cocoon.components.source;
-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 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.1.2.15 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/10/11 08:56:09 $
*/
public final class URLSource implements ModifiableSource {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- FilesystemStore.java 2001/10/08 20:18:55 1.1.1.1.2.5
+++ FilesystemStore.java 2001/10/11 08:56:09 1.1.1.1.2.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.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- MemoryStore.java 2001/10/08 20:18:55 1.1.1.1.2.3
+++ MemoryStore.java 2001/10/11 08:56:09 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:09 $
*/
public class MemoryStore implements Store, ThreadSafe {
/* WARNING: Hashtable is threadsafe, whereas HashMap is not.
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- Store.java 2001/10/08 20:18:55 1.1.1.1.2.4
+++ Store.java 2001/10/11 08:56:09 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:55 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:09 $
*/
public interface Store extends Component {
1.1.2.5 +8 -8
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.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- StoreJanitorImpl.java 2001/10/08 20:18:55 1.1.2.4
+++ StoreJanitorImpl.java 2001/10/11 08:56:09 1.1.2.5
@@ -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;
/**
@@ -247,4 +247,4 @@
this.getLogger().debug("Reseting index");
this.index = -1;
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- ExtendableTranscoderFactory.java 2001/10/08 20:18:56 1.1.1.1.2.2
+++ ExtendableTranscoderFactory.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.2 $, $Date: 2001/10/08 20:18:56 $
+ * @version $Revision: 1.1.1.1.2.3 $, $Date: 2001/10/11 08:56:10 $
*/
public class ExtendableTranscoderFactory implements TranscoderFactory {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ContextURLFactory.java 2001/10/08 20:18:56 1.1.1.1.2.3
+++ ContextURLFactory.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.3 2001/10/08 20:18:56
bloritsch Exp $
+ * @version $Id: ContextURLFactory.java,v 1.1.1.1.2.4 2001/10/11 08:56:10
cziegeler Exp $
*/
public class ContextURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- ResourceURLFactory.java 2001/10/08 20:18:56 1.1.1.1.2.2
+++ ResourceURLFactory.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.2 2001/10/08 20:18:56
bloritsch Exp $
+ * @version $Id: ResourceURLFactory.java,v 1.1.1.1.2.3 2001/10/11 08:56:10
cziegeler Exp $
*/
public class ResourceURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- URLFactory.java 2001/10/08 20:18:56 1.1.1.1.2.3
+++ URLFactory.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.3 2001/10/08 20:18:56 bloritsch
Exp $
+ * @version $Id: URLFactory.java,v 1.1.1.1.2.4 2001/10/11 08:56:10 cziegeler
Exp $
*/
public interface URLFactory extends ThreadSafe {
1.2.2.9 +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.2.2.8
retrieving revision 1.2.2.9
diff -u -r1.2.2.8 -r1.2.2.9
--- URLFactoryImpl.java 2001/10/08 20:18:56 1.2.2.8
+++ URLFactoryImpl.java 2001/10/11 08:56:10 1.2.2.9
@@ -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.2.2.8 2001/10/08 20:18:56 bloritsch
Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.2.2.9 2001/10/11 08:56:10 cziegeler
Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
No revision
No revision
1.4.2.3 +7 -7
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.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- XSLTProcessor.java 2001/10/08 20:18:56 1.4.2.2
+++ XSLTProcessor.java 2001/10/11 08:56:10 1.4.2.3
@@ -7,13 +7,13 @@
*****************************************************************************/
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 org.xml.sax.XMLFilter;
-
-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;
/**
No revision
No revision
1.6.2.14 +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.6.2.13
retrieving revision 1.6.2.14
diff -u -r1.6.2.13 -r1.6.2.14
--- AbstractEnvironment.java 2001/10/08 20:18:56 1.6.2.13
+++ AbstractEnvironment.java 2001/10/11 08:56:10 1.6.2.14
@@ -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.6.2.13 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.6.2.14 $ $Date: 2001/10/11 08:56:10 $
*/
public abstract class AbstractEnvironment extends AbstractLoggable
implements Environment {
1.1.1.1.2.4 +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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- Context.java 2001/10/08 20:18:56 1.1.1.1.2.3
+++ Context.java 2001/10/11 08:56:10 1.1.1.1.2.4
@@ -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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:10 $
*
*/
1.2.2.11 +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.2.2.10
retrieving revision 1.2.2.11
diff -u -r1.2.2.10 -r1.2.2.11
--- Environment.java 2001/10/08 20:18:56 1.2.2.10
+++ Environment.java 2001/10/11 08:56:10 1.2.2.11
@@ -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.2.2.10 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.2.2.11 $ $Date: 2001/10/11 08:56:10 $
*/
public interface Environment extends SourceResolver {
1.1.1.1.2.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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- Request.java 2001/10/08 20:18:56 1.1.1.1.2.5
+++ Request.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.5 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:10 $
*
*/
1.6.2.7 +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.6.2.6
retrieving revision 1.6.2.7
diff -u -r1.6.2.6 -r1.6.2.7
--- Source.java 2001/10/08 20:18:56 1.6.2.6
+++ Source.java 2001/10/11 08:56:10 1.6.2.7
@@ -8,12 +8,12 @@
package org.apache.cocoon.environment;
-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 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;
/**
@@ -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.6.2.6 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.6.2.7 $ $Date: 2001/10/11 08:56:10 $
*/
public interface Source extends Recyclable, XMLizable {
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- SourceResolver.java 2001/10/08 20:18:56 1.2.2.3
+++ SourceResolver.java 2001/10/11 08:56:10 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:10 $
*/
public interface SourceResolver {
1.1.2.3 +9 -9
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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- URLFactorySourceResolver.java 2001/10/08 20:18:56 1.1.2.2
+++ URLFactorySourceResolver.java 2001/10/11 08:56:10 1.1.2.3
@@ -8,21 +8,21 @@
package org.apache.cocoon.environment;
-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 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;
/**
* A <code>SourceResolver</code> based on a <code>URLFactory</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:10 $
*/
public class URLFactorySourceResolver implements SourceResolver {
No revision
No revision
1.1.1.1.2.6 +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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- AbstractCommandLineEnvironment.java 2001/10/08 20:18:56
1.1.1.1.2.5
+++ AbstractCommandLineEnvironment.java 2001/10/11 08:56:10
1.1.1.1.2.6
@@ -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.1.1.1.2.5 $ $Date: 2001/10/08 20:18:56 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:10 $
*/
public abstract class AbstractCommandLineEnvironment
1.2.2.6 +7 -7
xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/CommandLineRequest.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- CommandLineRequest.java 2001/10/08 20:18:57 1.2.2.5
+++ CommandLineRequest.java 2001/10/11 08:56:10 1.2.2.6
@@ -8,19 +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.*;
/**
* Creates a specific servlet request simulation from command line usage.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/10/11 08:56:10 $
*/
/*
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- CommandLineResponse.java 2001/10/08 20:18:57 1.1.1.1.2.2
+++ CommandLineResponse.java 2001/10/11 08:56:10 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:10 $
*/
public class CommandLineResponse implements Response {
1.1.2.3 +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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CommandLineSession.java 2001/10/08 20:18:57 1.1.2.2
+++ CommandLineSession.java 2001/10/11 08:56:10 1.1.2.3
@@ -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.2.2 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:10 $
*/
public final class CommandLineSession
implements Session {
1.1.2.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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CommandlineContext.java 2001/10/08 20:18:57 1.1.2.3
+++ CommandlineContext.java 2001/10/11 08:56:10 1.1.2.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.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- FileSavingEnvironment.java 2001/10/08 20:18:57 1.2.2.3
+++ FileSavingEnvironment.java 2001/10/11 08:56:10 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:10 $
*/
public class FileSavingEnvironment extends AbstractCommandLineEnvironment {
1.2.2.4 +8 -8
xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
Index: LinkSamplingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- LinkSamplingEnvironment.java 2001/10/08 20:18:57 1.2.2.3
+++ LinkSamplingEnvironment.java 2001/10/11 08:56:10 1.2.2.4
@@ -7,20 +7,20 @@
*****************************************************************************/
package org.apache.cocoon.environment.commandline;
-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 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.2.2.3 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:10 $
*/
public class LinkSamplingEnvironment extends AbstractCommandLineEnvironment {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- HttpContext.java 2001/10/08 20:18:57 1.1.1.1.2.4
+++ HttpContext.java 2001/10/11 08:56:11 1.1.1.1.2.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.4.2.5 +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.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- HttpEnvironment.java 2001/10/08 20:18:57 1.4.2.4
+++ HttpEnvironment.java 2001/10/11 08:56:11 1.4.2.5
@@ -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.1.1.1.2.8 +10 -10
xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java
Index: HttpRequest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpRequest.java,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8
--- HttpRequest.java 2001/10/08 20:18:57 1.1.1.1.2.7
+++ HttpRequest.java 2001/10/11 08:56:11 1.1.1.1.2.8
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.environment.http;
-import org.apache.cocoon.environment.Cookie;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
+import 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.*;
/**
@@ -23,7 +23,7 @@
* to provide request information for HTTP servlets.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Id: HttpRequest.java,v 1.1.1.1.2.7 2001/10/08 20:18:57
bloritsch Exp $
+ * @version CVS $Id: HttpRequest.java,v 1.1.1.1.2.8 2001/10/11 08:56:11
cziegeler Exp $
*/
public class HttpRequest implements Request {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- HttpResponse.java 2001/10/08 20:18:57 1.1.1.1.2.3
+++ HttpResponse.java 2001/10/11 08:56:11 1.1.1.1.2.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.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- HttpSession.java 2001/10/08 20:18:57 1.1.1.1.2.2
+++ HttpSession.java 2001/10/11 08:56:11 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:11 $
*
*/
1.1.1.1.2.5 +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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- RequestWrapper22.java 2001/10/08 20:18:57 1.1.1.1.2.4
+++ RequestWrapper22.java 2001/10/11 08:56:11 1.1.1.1.2.5
@@ -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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:11 $
*/
public final class RequestWrapper {
1.1.1.1.2.5 +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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- RequestWrapper23.java 2001/10/08 20:18:57 1.1.1.1.2.4
+++ RequestWrapper23.java 2001/10/11 08:56:11 1.1.1.1.2.5
@@ -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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:11 $
*/
public final class RequestWrapper {
1.1.2.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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RequestWrapperMaybeUpload22.java 2001/10/08 20:18:57 1.1.2.3
+++ RequestWrapperMaybeUpload22.java 2001/10/11 08:56:11 1.1.2.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.1.2.3 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:11 $
*/
public final class RequestWrapper extends MaybeUploadRequestWrapper {
1.1.2.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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RequestWrapperMaybeUpload23.java 2001/10/08 20:18:57 1.1.2.3
+++ RequestWrapperMaybeUpload23.java 2001/10/11 08:56:11 1.1.2.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.1.2.3 $ $Date: 2001/10/08 20:18:57 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:11 $
*/
public final class RequestWrapper extends MaybeUploadRequestWrapper
implements HttpServletRequest {
No revision
No revision
1.1.2.9 +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.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- EnvironmentWrapper.java 2001/10/08 20:18:57 1.1.2.8
+++ EnvironmentWrapper.java 2001/10/11 08:56:11 1.1.2.9
@@ -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.1.2.8 2001/10/08 20:18:57
bloritsch Exp $
+ * @version $Id: EnvironmentWrapper.java,v 1.1.2.9 2001/10/11 08:56:11
cziegeler Exp $
*/
public final class EnvironmentWrapper
extends AbstractEnvironment
1.1.2.5 +2 -2
xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java
Index: RequestParameters.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestParameters.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RequestParameters.java 2001/10/08 20:18:57 1.1.2.4
+++ RequestParameters.java 2001/10/11 08:56:11 1.1.2.5
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.environment.wrapper;
-import java.io.Serializable;
+import java.io.Serializable;
import java.util.*;
/**
@@ -16,7 +16,7 @@
* for the <code>Request</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: RequestParameters.java,v 1.1.2.4 2001/10/08 20:18:57
bloritsch Exp $
+ * @version $Id: RequestParameters.java,v 1.1.2.5 2001/10/11 08:56:11
cziegeler Exp $
*/
public final class RequestParameters
implements Serializable {
1.1.2.9 +7 -7
xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java
Index: RequestWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/RequestWrapper.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- RequestWrapper.java 2001/10/08 20:18:57 1.1.2.8
+++ RequestWrapper.java 2001/10/11 08:56:11 1.1.2.9
@@ -8,12 +8,12 @@
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 java.security.Principal;
+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.*;
@@ -23,7 +23,7 @@
* are different.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version $Id: RequestWrapper.java,v 1.1.2.8 2001/10/08 20:18:57 bloritsch
Exp $
+ * @version $Id: RequestWrapper.java,v 1.1.2.9 2001/10/11 08:56:11 cziegeler
Exp $
*/
public final class RequestWrapper implements Request {
No revision
No revision
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- AbstractGenerator.java 2001/10/08 20:18:58 1.2.2.2
+++ AbstractGenerator.java 2001/10/11 08:56:11 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:11 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractServerPage.java 2001/10/08 20:18:58 1.1.1.1.2.2
+++ AbstractServerPage.java 2001/10/11 08:56:11 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:11 $
*/
public abstract class AbstractServerPage
extends ServletGenerator implements CompiledComponent, Cacheable
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ComposerGenerator.java 2001/10/08 20:18:58 1.1.1.1.2.3
+++ ComposerGenerator.java 2001/10/11 08:56:12 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:12 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composable {
1.6.2.8 +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.6.2.7
retrieving revision 1.6.2.8
diff -u -r1.6.2.7 -r1.6.2.8
--- DirectoryGenerator.java 2001/10/08 20:18:58 1.6.2.7
+++ DirectoryGenerator.java 2001/10/11 08:56:12 1.6.2.8
@@ -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.6.2.7 $ $Date: 2001/10/08 20:18:58 $ */
+ * @version CVS $Revision: 1.6.2.8 $ $Date: 2001/10/11 08:56:12 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Recyclable {
private static final String FILE = "file:";
1.9.2.16 +15 -15
xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.9.2.15
retrieving revision 1.9.2.16
diff -u -r1.9.2.15 -r1.9.2.16
--- FileGenerator.java 2001/10/08 20:18:58 1.9.2.15
+++ FileGenerator.java 2001/10/11 08:56:12 1.9.2.16
@@ -7,20 +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.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 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;
/**
@@ -33,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.9.2.15 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.9.2.16 $ $Date: 2001/10/11 08:56:12 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
1.3.2.4 +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.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- FragmentExtractorGenerator.java 2001/10/08 20:18:58 1.3.2.3
+++ FragmentExtractorGenerator.java 2001/10/11 08:56:12 1.3.2.4
@@ -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.3.2.3 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/11 08:56:12 $
*/
public class FragmentExtractorGenerator extends AbstractGenerator
implements Recyclable, Cacheable {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- Generator.java 2001/10/08 20:18:58 1.1.1.1.2.3
+++ Generator.java 2001/10/11 08:56:12 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:12 $
*/
public interface Generator extends XMLProducer, SitemapModelComponent {
1.4.2.10 +28 -28
xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -r1.4.2.9 -r1.4.2.10
--- HTMLGenerator.java 2001/10/08 20:18:58 1.4.2.9
+++ HTMLGenerator.java 2001/10/11 08:56:12 1.4.2.10
@@ -7,39 +7,39 @@
*****************************************************************************/
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.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.xpath.XPathAPI;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.tidy.Tidy;
-import org.xml.sax.SAXException;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
+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.ResourceNotFoundException;
+import org.apache.cocoon.caching.CacheValidity;
+import org.apache.cocoon.caching.Cacheable;
+import org.apache.cocoon.caching.TimeStampCacheValidity;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashUtil;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.apache.xpath.XPathAPI;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
+import org.w3c.tidy.Tidy;
+import org.xml.sax.SAXException;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4.2.9 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.4.2.10 $ $Date: 2001/10/11 08:56:12 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable {
1.4.2.6 +4 -4
xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- ImageDirectoryGenerator.java 2001/10/08 20:18:58 1.4.2.5
+++ ImageDirectoryGenerator.java 2001/10/11 08:56:12 1.4.2.6
@@ -7,9 +7,9 @@
*****************************************************************************/
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.*;
/**
@@ -17,7 +17,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
- * @version $Revision: 1.4.2.5 $ $Date: 2001/10/08 20:18:58 $
+ * @version $Revision: 1.4.2.6 $ $Date: 2001/10/11 08:56:12 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
1.6.2.12 +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.6.2.11
retrieving revision 1.6.2.12
diff -u -r1.6.2.11 -r1.6.2.12
--- JspGenerator.java 2001/10/08 20:18:58 1.6.2.11
+++ JspGenerator.java 2001/10/11 08:56:12 1.6.2.12
@@ -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.6.2.11 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.6.2.12 $ $Date: 2001/10/11 08:56:12 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable,
Configurable {
1.6.2.5 +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.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- PhpGenerator.java 2001/10/08 20:18:58 1.6.2.4
+++ PhpGenerator.java 2001/10/11 08:56:12 1.6.2.5
@@ -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.6.2.4 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.6.2.5 $ $Date: 2001/10/11 08:56:12 $
*/
public class PhpGenerator extends ServletGenerator implements Recyclable {
1.3.2.4 +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.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- RequestGenerator.java 2001/10/08 20:18:58 1.3.2.3
+++ RequestGenerator.java 2001/10/11 08:56:12 1.3.2.4
@@ -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.3.2.3 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.3.2.4 $ $Date: 2001/10/11 08:56:12 $
*/
public class RequestGenerator extends ServletGenerator implements Recyclable
{
1.7.2.6 +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.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- ScriptGenerator.java 2001/10/08 20:18:58 1.7.2.5
+++ ScriptGenerator.java 2001/10/11 08:56:12 1.7.2.6
@@ -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.7.2.5 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.7.2.6 $ $Date: 2001/10/11 08:56:12 $
*/
public class ScriptGenerator extends ComposerGenerator implements
Configurable,
Recyclable {
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ServletGenerator.java 2001/10/08 20:18:58 1.2.2.3
+++ ServletGenerator.java 2001/10/11 08:56:12 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:12 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composable {
1.4.2.3 +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.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- StatusGenerator.java 2001/10/08 20:18:58 1.4.2.2
+++ StatusGenerator.java 2001/10/11 08:56:12 1.4.2.3
@@ -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.4.2.2 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.4.2.3 $ $Date: 2001/10/11 08:56:12 $
*/
public class StatusGenerator extends ComposerGenerator implements Recyclable
{
1.1.2.8 +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.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- StreamGenerator.java 2001/10/08 20:18:58 1.1.2.7
+++ StreamGenerator.java 2001/10/11 08:56:12 1.1.2.8
@@ -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.1.2.7 $ $Date: 2001/10/08 20:18:58 $
+ * @version $Revision: 1.1.2.8 $ $Date: 2001/10/11 08:56:12 $
*/
public class StreamGenerator extends ComposerGenerator {
public static final String CLASS = StreamGenerator.class.getName();
1.4.2.5 +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.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- VelocityGenerator.java 2001/10/08 20:18:58 1.4.2.4
+++ VelocityGenerator.java 2001/10/11 08:56:12 1.4.2.5
@@ -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.4.2.4 $ $Date: 2001/10/08 20:18:58 $
+ * @version CVS $Revision: 1.4.2.5 $ $Date: 2001/10/11 08:56:12 $
*/
public class VelocityGenerator extends ServletGenerator implements
Recyclable {
No revision
No revision
1.2.2.3 +15 -15
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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XMLResourceBundle.java 2001/10/08 20:18:59 1.2.2.2
+++ XMLResourceBundle.java 2001/10/11 08:56:12 1.2.2.3
@@ -9,27 +9,27 @@
package org.apache.cocoon.i18n;
/** JDK classes **/
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
-import org.apache.xpath.XPathAPI;
-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 org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.log.Logger;
+import org.apache.xpath.XPathAPI;
+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.*;
/**
* @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.2.2.2 2001/10/08 20:18:59
bloritsch Exp $
+ * @version $Id: XMLResourceBundle.java,v 1.2.2.3 2001/10/11 08:56:12
cziegeler Exp $
*/
public class XMLResourceBundle
extends ResourceBundle
1.2.2.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.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XMLResourceBundleFactory.java 2001/10/08 20:18:59 1.2.2.2
+++ XMLResourceBundleFactory.java 2001/10/11 08:56:12 1.2.2.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.2.2 2001/10/08 20:18:59
bloritsch Exp $
+ * @version $Id: XMLResourceBundleFactory.java,v 1.2.2.3 2001/10/11 08:56:12
cziegeler Exp $
*/
public class XMLResourceBundleFactory
No revision
No revision
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- BrowserMatcherFactory.java 2001/10/08 20:18:59 1.1.1.1.2.4
+++ BrowserMatcherFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:13 $
*/
public class BrowserMatcherFactory implements CodeFactory {
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Matcher.java 2001/10/08 20:18:59 1.2.2.3
+++ Matcher.java 2001/10/11 08:56:13 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:13 $
*/
public interface Matcher extends Component {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- RegexpTargetHostMatcherFactory.java 2001/10/08 20:18:59
1.1.1.1.2.2
+++ RegexpTargetHostMatcherFactory.java 2001/10/11 08:56:13
1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:13 $
*/
public class RegexpTargetHostMatcherFactory extends AbstractLoggable
implements CodeFactory {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- RegexpURIMatcherFactory.java 2001/10/08 20:18:59 1.1.1.1.2.2
+++ RegexpURIMatcherFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:13 $
*/
public class RegexpURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
1.3.2.5 +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.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- RequestParamMatcher.java 2001/10/08 20:18:59 1.3.2.4
+++ RequestParamMatcher.java 2001/10/11 08:56:13 1.3.2.5
@@ -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.3.2.4 $
+ * @version CVS $Revision: 1.3.2.5 $
*/
public class RequestParamMatcher implements Matcher, ThreadSafe {
/**
1.1.2.7 +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.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WildcardHeaderMatcherFactory.java 2001/10/08 20:18:59 1.1.2.6
+++ WildcardHeaderMatcherFactory.java 2001/10/11 08:56:13 1.1.2.7
@@ -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.1.2.6 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/10/11 08:56:13 $
*/
public class WildcardHeaderMatcherFactory extends WildcardURIMatcherFactory {
1.1.2.7 +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.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WildcardParameterValueMatcherFactory.java 2001/10/08 20:18:59 1.1.2.6
+++ WildcardParameterValueMatcherFactory.java 2001/10/11 08:56:13 1.1.2.7
@@ -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.1.2.6 $ $Date: 2001/10/08 20:18:59 $ */
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/10/11 08:56:13 $ */
public class WildcardParameterValueMatcherFactory extends
WildcardURIMatcherFactory {
1.1.2.4 +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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WildcardSessionAttributeMatcherFactory.java 2001/10/08 20:18:59
1.1.2.3
+++ WildcardSessionAttributeMatcherFactory.java 2001/10/11 08:56:13
1.1.2.4
@@ -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.1.2.3 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:13 $
*/
public class WildcardSessionAttributeMatcherFactory extends
WildcardURIMatcherFactory {
1.2.2.2 +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.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- WildcardURIMatcherFactory.java 2001/10/08 20:18:59 1.2.2.1
+++ WildcardURIMatcherFactory.java 2001/10/11 08:56:13 1.2.2.2
@@ -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.2.1 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/10/11 08:56:13 $
*/
public class WildcardURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
No revision
No revision
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- AbstractReader.java 2001/10/08 20:18:59 1.2.2.3
+++ AbstractReader.java 2001/10/11 08:56:13 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:13 $
*/
public abstract class AbstractReader extends AbstractLoggable implements
Reader, Recyclable {
/** The current <code>SourceResolver</code>. */
1.2.2.7 +26 -26
xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- DatabaseReader.java 2001/10/08 20:18:59 1.2.2.6
+++ DatabaseReader.java 2001/10/11 08:56:13 1.2.2.7
@@ -7,32 +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.*;
-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 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.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- Reader.java 2001/10/08 20:18:59 1.1.1.1.2.4
+++ Reader.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:13 $
*/
public interface Reader extends SitemapModelComponent,
SitemapOutputComponent {
1.3.2.8 +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.3.2.7
retrieving revision 1.3.2.8
diff -u -r1.3.2.7 -r1.3.2.8
--- ResourceReader.java 2001/10/08 20:18:59 1.3.2.7
+++ ResourceReader.java 2001/10/11 08:56:13 1.3.2.8
@@ -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.3.2.7 $ $Date: 2001/10/08 20:18:59 $
+ * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/10/11 08:56:13 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
No revision
No revision
1.1.2.3 +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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Configurator.java 2001/10/08 20:19:00 1.1.2.2
+++ Configurator.java 2001/10/11 08:56:13 1.1.2.3
@@ -1,10 +1,10 @@
package org.apache.cocoon.samples.parentcm;
-import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
-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;
/**
1.1.2.3 +11 -11
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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Generator.java 2001/10/08 20:19:00 1.1.2.2
+++ Generator.java 2001/10/11 08:56:13 1.1.2.3
@@ -1,16 +1,16 @@
package org.apache.cocoon.samples.parentcm;
-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 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;
/**
1.1.2.3 +12 -12
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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ParentComponentManager.java 2001/10/08 20:19:00 1.1.2.2
+++ ParentComponentManager.java 2001/10/11 08:56:13 1.1.2.3
@@ -1,17 +1,17 @@
package org.apache.cocoon.samples.parentcm;
-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 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;
/**
1.1.2.4 +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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Time.java 2001/10/08 20:19:00 1.1.2.3
+++ Time.java 2001/10/11 08:56:13 1.1.2.4
@@ -1,7 +1,7 @@
package org.apache.cocoon.samples.parentcm;
-import org.apache.avalon.framework.component.Component;
-
+import org.apache.avalon.framework.component.Component;
+
import java.util.Date;
/**
1.1.2.3 +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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TimeComponent.java 2001/10/08 20:19:00 1.1.2.2
+++ TimeComponent.java 2001/10/11 08:56:13 1.1.2.3
@@ -1,8 +1,8 @@
package org.apache.cocoon.samples.parentcm;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.Date;
/**
No revision
No revision
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- BrowserSelectorFactory.java 2001/10/08 20:19:00 1.1.1.1.2.4
+++ BrowserSelectorFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:13 $
*/
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- CodedSelectorFactory.java 2001/10/08 20:19:00 1.1.1.1.2.1
+++ CodedSelectorFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:13 $
*/
public class CodedSelectorFactory extends java.lang.Object
implements CodeFactory {
1.1.2.7 +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.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- HeaderSelectorFactory.java 2001/10/08 20:19:00 1.1.2.6
+++ HeaderSelectorFactory.java 2001/10/11 08:56:13 1.1.2.7
@@ -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.1.2.6 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/10/11 08:56:13 $
*/
public class HeaderSelectorFactory extends ParameterSelectorFactory {
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- HostSelectorFactory.java 2001/10/08 20:19:00 1.1.1.1.2.4
+++ HostSelectorFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:13 $
*/
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ParameterSelectorFactory.java 2001/10/08 20:19:00 1.1.1.1.2.3
+++ ParameterSelectorFactory.java 2001/10/11 08:56:13 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:13 $
*/
public class ParameterSelectorFactory implements CodeFactory {
1.1.2.7 +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.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RequestSelectorFactory.java 2001/10/08 20:19:00 1.1.2.6
+++ RequestSelectorFactory.java 2001/10/11 08:56:13 1.1.2.7
@@ -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.1.2.6 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/10/11 08:56:13 $
*/
public class RequestSelectorFactory extends ParameterSelectorFactory {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- Selector.java 2001/10/08 20:19:00 1.1.1.1.2.3
+++ Selector.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:14 $
*/
public interface Selector extends Component {
1.1.2.5 +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.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SessionAttributeSelectorFactory.java 2001/10/08 20:19:00 1.1.2.4
+++ SessionAttributeSelectorFactory.java 2001/10/11 08:56:14 1.1.2.5
@@ -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.1.2.4 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:14 $
*/
public class SessionAttributeSelectorFactory extends
ParameterSelectorFactory {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- CodedSelectorHelper.java 2001/10/08 20:19:00 1.1.1.1.2.2
+++ CodedSelectorHelper.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public abstract class CodedSelectorHelper
{
No revision
No revision
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- AbstractSerializer.java 2001/10/08 20:19:00 1.2.2.3
+++ AbstractSerializer.java 2001/10/11 08:56:14 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:14 $
*/
public abstract class AbstractSerializer extends AbstractXMLPipe implements
Serializer, Recyclable {
1.2.2.6 +17 -17
xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- AbstractTextSerializer.java 2001/10/08 20:19:00 1.2.2.5
+++ AbstractTextSerializer.java 2001/10/11 08:56:14 1.2.2.6
@@ -8,22 +8,22 @@
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 javax.xml.transform.OutputKeys;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.sax.SAXTransformerFactory;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.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.*;
/**
@@ -31,7 +31,7 @@
* (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.2.2.5 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/10/11 08:56:14 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
implements Configurable, Cacheable, Poolable {
1.1.1.1.2.6 +15 -15
xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/FOPSerializer.java,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- FOPSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.5
+++ FOPSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.6
@@ -8,21 +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.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 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.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- HTMLSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.2
+++ HTMLSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
1.1.1.1.2.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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- LinkSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.5
+++ LinkSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.5 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:14 $
*/
public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- SVGSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.3
+++ SVGSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:14 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable
{
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- Serializer.java 2001/10/08 20:19:00 1.1.1.1.2.2
+++ Serializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public interface Serializer extends XMLConsumer, SitemapOutputComponent {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- TextSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.2
+++ TextSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public class TextSerializer extends AbstractTextSerializer implements
Poolable {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- XMLSerializer.java 2001/10/08 20:19:00 1.1.1.1.2.2
+++ XMLSerializer.java 2001/10/11 08:56:14 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:00 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
No revision
No revision
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ParanoidClassLoader.java 2001/10/08 20:19:01 1.2.2.2
+++ ParanoidClassLoader.java 2001/10/11 08:56:14 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:14 $
*/
public class ParanoidClassLoader extends URLClassLoader {
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ParanoidCocoonServlet.java 2001/10/08 20:19:01 1.2.2.3
+++ ParanoidCocoonServlet.java 2001/10/11 08:56:14 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:14 $
*/
public class ParanoidCocoonServlet extends CocoonServlet {
No revision
No revision
1.4.2.21 +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.4.2.20
retrieving revision 1.4.2.21
diff -u -r1.4.2.20 -r1.4.2.21
--- AbstractSitemap.java 2001/10/08 20:19:01 1.4.2.20
+++ AbstractSitemap.java 2001/10/11 08:56:15 1.4.2.21
@@ -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.4.2.20 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.4.2.21 $ $Date: 2001/10/11 08:56:15 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable, ThreadSafe {
private Context context;
1.5.2.15 +23 -23
xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.5.2.14
retrieving revision 1.5.2.15
diff -u -r1.5.2.14 -r1.5.2.15
--- ContentAggregator.java 2001/10/08 20:19:01 1.5.2.14
+++ ContentAggregator.java 2001/10/11 08:56:15 1.5.2.15
@@ -8,34 +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.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
+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;
/**
* @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.5.2.14 2001/10/08 20:19:01
bloritsch Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.5.2.15 2001/10/11 08:56:15
cziegeler Exp $
*/
public class ContentAggregator extends ContentHandlerWrapper implements
Generator, Cacheable, Composable {
1.2.2.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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ErrorNotifier.java 2001/10/08 20:19:01 1.2.2.3
+++ ErrorNotifier.java 2001/10/11 08:56:15 1.2.2.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.2.2.3 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:15 $
*/
public class ErrorNotifier extends ComposerGenerator implements Recyclable {
/**
1.9.2.15 +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.9.2.14
retrieving revision 1.9.2.15
diff -u -r1.9.2.14 -r1.9.2.15
--- Handler.java 2001/10/08 20:19:01 1.9.2.14
+++ Handler.java 2001/10/11 08:56:15 1.9.2.15
@@ -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.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 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.9.2.14 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.9.2.15 $ $Date: 2001/10/11 08:56:15 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
1.2.2.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.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- LinkTranslator.java 2001/10/08 20:19:01 1.2.2.4
+++ LinkTranslator.java 2001/10/11 08:56:15 1.2.2.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.2.2.4 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/10/11 08:56:15 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
private Map links;
1.2.2.16 +20 -20 xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -u -r1.2.2.15 -r1.2.2.16
--- Manager.java 2001/10/08 20:19:01 1.2.2.15
+++ Manager.java 2001/10/11 08:56:15 1.2.2.16
@@ -8,25 +8,25 @@
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;
/**
* This class manages all sub <code>Sitemap</code>s of a <code>Sitemap</code>
@@ -34,7 +34,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.2.2.15 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.16 $ $Date: 2001/10/11 08:56:15 $
*/
public class Manager
extends AbstractLoggable
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- Sitemap.java 2001/10/08 20:19:01 1.1.1.1.2.3
+++ Sitemap.java 2001/10/11 08:56:15 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:15 $
*/
public interface Sitemap extends CompiledComponent, Configurable,
Contextualizable, Processor {
int GENERATOR = 1;
1.2.2.11 +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.2.2.10
retrieving revision 1.2.2.11
diff -u -r1.2.2.10 -r1.2.2.11
--- SitemapComponentSelector.java 2001/10/08 20:19:01 1.2.2.10
+++ SitemapComponentSelector.java 2001/10/11 08:56:15 1.2.2.11
@@ -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.2.2.10 2001/10/08
20:19:01 bloritsch Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.2.2.11 2001/10/11
08:56:15 cziegeler Exp $
*/
public class SitemapComponentSelector extends ExcaliburComponentSelector {
private Map mime_types;
1.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- SitemapModelComponent.java 2001/10/08 20:19:01 1.2.2.3
+++ SitemapModelComponent.java 2001/10/11 08:56:15 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:15 $
*/
public interface SitemapModelComponent extends Component {
/**
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- SitemapOutputComponent.java 2001/10/08 20:19:01 1.1.1.1.2.4
+++ SitemapOutputComponent.java 2001/10/11 08:56:15 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:15 $
*/
public interface SitemapOutputComponent extends Component {
/**
1.1.2.5 +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.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SitemapRedirector.java 2001/10/08 20:19:01 1.1.2.4
+++ SitemapRedirector.java 2001/10/11 08:56:15 1.1.2.5
@@ -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.1.2.4 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:15 $
*/
public class SitemapRedirector implements Redirector {
private boolean hasRedirected = false;
1.2.2.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.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- XSLTFactoryLoader.java 2001/10/08 20:19:01 1.2.2.5
+++ XSLTFactoryLoader.java 2001/10/11 08:56:15 1.2.2.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.2.2.5 $ $Date: 2001/10/08 20:19:01 $
+ * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/10/11 08:56:15 $
*/
public class XSLTFactoryLoader {
protected static Logger log;
No revision
No revision
1.3.2.4 +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.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- AbstractDOMTransformer.java 2001/10/08 20:19:01 1.3.2.3
+++ AbstractDOMTransformer.java 2001/10/11 08:56:15 1.3.2.4
@@ -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.1.2.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.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- CIncludeTransformer.java 2001/10/08 20:19:01 1.1.2.7
+++ CIncludeTransformer.java 2001/10/11 08:56:15 1.1.2.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.1.2.7 $ $Date: 2001/10/08 20:19:01 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class CIncludeTransformer extends AbstractTransformer
implements Recyclable, Composable {
1.1.2.5 +11 -11
xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java
Index: FilterTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/FilterTransformer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FilterTransformer.java 2001/10/08 20:19:02 1.1.2.4
+++ FilterTransformer.java 2001/10/11 08:56:15 1.1.2.5
@@ -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.1.2.4 $ $Date: 2001/10/08 20:19:02 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class FilterTransformer extends AbstractTransformer implements
Poolable {
@@ -160,4 +160,4 @@
}
/** END SAX ContentHandler handlers **/
-}
\ No newline at end of file
+}
1.3.2.6 +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.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- FragmentExtractorTransformer.java 2001/10/08 20:19:02 1.3.2.5
+++ FragmentExtractorTransformer.java 2001/10/11 08:56:15 1.3.2.6
@@ -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.3.2.5 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/10/11 08:56:15 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composable, Disposable, Cacheable, Poolable {
1.8.2.11 +22 -22
xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.8.2.10
retrieving revision 1.8.2.11
diff -u -r1.8.2.10 -r1.8.2.11
--- I18nTransformer.java 2001/10/08 20:19:02 1.8.2.10
+++ I18nTransformer.java 2001/10/11 08:56:15 1.8.2.11
@@ -9,28 +9,28 @@
*/
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.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 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.*;
/**
1.1.2.7 +17 -17
xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/LDAPTransformer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LDAPTransformer.java 2001/10/08 20:19:02 1.1.2.6
+++ LDAPTransformer.java 2001/10/11 08:56:15 1.1.2.7
@@ -7,23 +7,23 @@
*****************************************************************************/
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.*;
-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.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.2.2.4 +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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- LogTransformer.java 2001/10/08 20:19:02 1.2.2.3
+++ LogTransformer.java 2001/10/11 08:56:15 1.2.2.4
@@ -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.2.2.3 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/10/11 08:56:15 $
*
*/
public class LogTransformer extends AbstractTransformer implements Poolable {
1.1.2.5 +16 -16
xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
Index: ReadDOMSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ReadDOMSessionTransformer.java 2001/10/08 20:19:02 1.1.2.4
+++ ReadDOMSessionTransformer.java 2001/10/11 08:56:15 1.1.2.5
@@ -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.1.2.4 $ $Date: 2001/10/08 20:19:02 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class ReadDOMSessionTransformer extends AbstractTransformer
implements Poolable {
@@ -128,4 +128,4 @@
}
}
-}
\ No newline at end of file
+}
1.5.2.13 +21 -21
xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -r1.5.2.12 -r1.5.2.13
--- SQLTransformer.java 2001/10/08 20:19:02 1.5.2.12
+++ SQLTransformer.java 2001/10/11 08:56:15 1.5.2.13
@@ -7,26 +7,26 @@
*****************************************************************************/
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.*;
-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 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.*;
/**
@@ -35,7 +35,7 @@
* @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.5.2.12 $ $Date: 2001/10/08 20:19:02 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.5.2.13 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class SQLTransformer extends AbstractTransformer implements
Composable, Recyclable, Disposable, Configurable {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- Transformer.java 2001/10/08 20:19:02 1.1.1.1.2.2
+++ Transformer.java 2001/10/11 08:56:15 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:15 $
*/
public interface Transformer extends XMLPipe, SitemapModelComponent {
1.2.2.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.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- WriteDOMSessionTransformer.java 2001/10/08 20:19:02 1.2.2.4
+++ WriteDOMSessionTransformer.java 2001/10/11 08:56:15 1.2.2.5
@@ -8,25 +8,25 @@
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 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.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;
@@ -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.2.2.4 $ $Date: 2001/10/08 20:19:02 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class WriteDOMSessionTransformer extends AbstractTransformer
implements
1.6.2.10 +28 -28
xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -u -r1.6.2.9 -r1.6.2.10
--- XIncludeTransformer.java 2001/10/08 20:19:02 1.6.2.9
+++ XIncludeTransformer.java 2001/10/11 08:56:15 1.6.2.10
@@ -7,33 +7,33 @@
*****************************************************************************/
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.environment.SourceResolver;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.xpath.XPathAPI;
-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.*;
-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.environment.SourceResolver;
+import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.apache.xpath.XPathAPI;
+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.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
import java.util.Stack;
/**
@@ -44,7 +44,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.6.2.9 $ $Date: 2001/10/08 20:19:02 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.6.2.10 $ $Date: 2001/10/11 08:56:15 $ $Author:
cziegeler $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composable, Recyclable, Disposable {
1.4.2.5 +36 -36
xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XTTransformer.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- XTTransformer.java 2001/10/08 20:19:02 1.4.2.4
+++ XTTransformer.java 2001/10/11 08:56:15 1.4.2.5
@@ -8,48 +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.*;
-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 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.4.2.4 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.4.2.5 $ $Date: 2001/10/11 08:56:15 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composable, Loggable, Recyclable, Disposable {
No revision
No revision
1.7.2.6 +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.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- ClassUtils.java 2001/10/08 20:19:02 1.7.2.5
+++ ClassUtils.java 2001/10/11 08:56:16 1.7.2.6
@@ -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.7.2.5 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.7.2.6 $ $Date: 2001/10/11 08:56:16 $
*/
public class ClassUtils {
1.1.1.1.2.1 +2 -2 xml-cocoon2/src/org/apache/cocoon/util/HashUtil.java
Index: HashUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/HashUtil.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- HashUtil.java 2001/05/09 20:49:33 1.1.1.1
+++ HashUtil.java 2001/10/11 08:56:16 1.1.1.1.2.1
@@ -16,7 +16,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Robert Uzgalis</a>
* @author <a href="mailto:[EMAIL PROTECTED] Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:33 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/10/11 08:56:16 $
*/
public final class HashUtil {
@@ -195,4 +195,4 @@
return buzhash( arg );
}
-}
\ No newline at end of file
+}
1.2.2.8 +6 -6 xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java
Index: IOUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/IOUtils.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- IOUtils.java 2001/10/08 20:19:02 1.2.2.7
+++ IOUtils.java 2001/10/11 08:56:16 1.2.2.8
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import org.apache.log.Hierarchy;
-
-import java.io.*;
-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;
/**
@@ -20,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.2.2.7 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/10/11 08:56:16 $
*/
public class IOUtils {
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- JavaArchiveFilter.java 2001/10/08 20:19:02 1.1.1.1.2.1
+++ JavaArchiveFilter.java 2001/10/11 08:56:16 1.1.1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import java.io.File;
+import java.io.File;
import java.io.FileFilter;
/**
1.1.1.1.2.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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- NetUtils.java 2001/10/08 20:19:02 1.1.1.1.2.5
+++ NetUtils.java 2001/10/11 08:56:16 1.1.1.1.2.6
@@ -8,7 +8,7 @@
package org.apache.cocoon.util;
-import java.util.Iterator;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -16,7 +16,7 @@
* utility methods
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/08 20:19:02 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:16 $
*/
public class NetUtils {
1.1.2.4 +3 -3
xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java
Index: PostInputStream.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/util/PostInputStream.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PostInputStream.java 2001/10/08 20:19:02 1.1.2.3
+++ PostInputStream.java 2001/10/11 08:56:16 1.1.2.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.1.2.3 2001/10/08 20:19:02
bloritsch Exp $
+ * @version $Id: PostInputStream.java,v 1.1.2.4 2001/10/11 08:56:16
cziegeler Exp $
*/
public class PostInputStream extends InputStream {
@@ -239,4 +239,4 @@
public String toString() {
return getClass().getName() + "[inputStream=" + m_inputStream + ",
contentLen=" + m_contentLen + "bytesRead=" + m_bytesRead + "]";
}
-}
\ No newline at end of file
+}
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- Tokenizer.java 2001/10/08 20:19:02 1.1.1.1.2.1
+++ Tokenizer.java 2001/10/11 08:56:16 1.1.1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.util;
-import java.util.Enumeration;
+import java.util.Enumeration;
import java.util.NoSuchElementException;
/**
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- TraxErrorHandler.java 2001/10/08 20:19:02 1.1.1.1.2.2
+++ TraxErrorHandler.java 2001/10/11 08:56:16 1.1.1.1.2.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 {
No revision
No revision
1.3.2.6 +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.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- CocoonLogFormatter.java 2001/10/08 20:19:03 1.3.2.5
+++ CocoonLogFormatter.java 2001/10/11 08:56:16 1.3.2.6
@@ -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.3.2.5 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/10/11 08:56:16 $
*/
public class CocoonLogFormatter extends ExtensiblePatternFormatter
1.1.2.3 +3 -3
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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CocoonTargetFactory.java 2001/10/08 20:19:03 1.1.2.2
+++ CocoonTargetFactory.java 2001/10/11 08:56:16 1.1.2.3
@@ -7,8 +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;
/**
@@ -81,7 +81,7 @@
* </dl>
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:16 $
* @since 4.0
*/
public class CocoonTargetFactory
1.3.2.6 +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.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- ExtensiblePatternFormatter.java 2001/10/08 20:19:03 1.3.2.5
+++ ExtensiblePatternFormatter.java 2001/10/11 08:56:16 1.3.2.6
@@ -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.3.2.5 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/10/11 08:56:16 $
*/
public class ExtensiblePatternFormatter
implements Formatter
1.1.2.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.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- XMLCocoonLogFormatter.java 2001/10/08 20:19:03 1.1.2.7
+++ XMLCocoonLogFormatter.java 2001/10/11 08:56:16 1.1.2.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.1.2.7 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/10/11 08:56:16 $
*/
public class XMLCocoonLogFormatter
implements Formatter {
No revision
No revision
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractDOMFragment.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ AbstractDOMFragment.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public abstract class AbstractDOMFragment implements XMLFragment {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractSAXFragment.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ AbstractSAXFragment.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public abstract class AbstractSAXFragment implements XMLFragment {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- AbstractXMLConsumer.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ AbstractXMLConsumer.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
1.3.2.3 +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.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- AbstractXMLPipe.java 2001/10/08 20:19:03 1.3.2.2
+++ AbstractXMLPipe.java 2001/10/11 08:56:17 1.3.2.3
@@ -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.3.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public class AbstractXMLPipe extends AbstractXMLProducer implements XMLPipe,
Recyclable {
1.2.2.2 +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.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- AbstractXMLProducer.java 2001/10/08 20:19:03 1.2.2.1
+++ AbstractXMLProducer.java 2001/10/11 08:56:17 1.2.2.2
@@ -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.2.1 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.2.2.2 $ $Date: 2001/10/11 08:56:17 $
*/
public abstract class AbstractXMLProducer extends AbstractLoggable
implements XMLProducer {
1.1.1.1.2.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.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- ContentHandlerWrapper.java 2001/10/08 20:19:03 1.1.1.1.2.3
+++ ContentHandlerWrapper.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.3 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/11 08:56:17 $
*/
public class ContentHandlerWrapper extends AbstractXMLConsumer implements
Recyclable {
1.1.1.1.2.3 +6 -6
xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java
Index: DocumentHandlerAdapter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/DocumentHandlerAdapter.java,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- DocumentHandlerAdapter.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ DocumentHandlerAdapter.java 2001/10/11 08:56:17 1.1.1.1.2.3
@@ -8,11 +8,11 @@
package org.apache.cocoon.xml;
-import org.xml.sax.*;
-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;
/**
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public class DocumentHandlerAdapter extends AbstractXMLProducer
implements DocumentHandler {
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- DocumentHandlerWrapper.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ DocumentHandlerWrapper.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
Loggable /*, Recyclable*/ {
1.1.2.3 +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.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EmbeddedXMLPipe.java 2001/10/08 20:19:03 1.1.2.2
+++ EmbeddedXMLPipe.java 2001/10/11 08:56:17 1.1.2.3
@@ -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.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public class EmbeddedXMLPipe extends AbstractXMLPipe
{
1.4.2.3 +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.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- IncludeXMLConsumer.java 2001/10/08 20:19:03 1.4.2.2
+++ IncludeXMLConsumer.java 2001/10/11 08:56:17 1.4.2.3
@@ -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.4.2.2 $ $Date: 2001/10/08 20:19:03 $
+ * @version $Revision: 1.4.2.3 $ $Date: 2001/10/11 08:56:17 $
*/
public class IncludeXMLConsumer extends AbstractXMLConsumer {
final private ContentHandler contentHandler;
1.1.1.1.2.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.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- LoggingEntityResolver.java 2001/10/08 20:19:03 1.1.1.1.2.2
+++ LoggingEntityResolver.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- XMLConsumer.java 2001/10/08 20:19:03 1.1.1.1.2.1
+++ XMLConsumer.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:17 $
*/
public interface XMLConsumer extends ContentHandler, LexicalHandler {
}
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- XMLMulticaster.java 2001/10/08 20:19:03 1.1.1.1.2.1
+++ XMLMulticaster.java 2001/10/11 08:56:17 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:17 $
*/
public final class XMLMulticaster implements XMLConsumer {
1.1.2.4 +3 -3 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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLizable.java 2001/10/08 20:19:03 1.1.2.3
+++ XMLizable.java 2001/10/11 08:56:17 1.1.2.4
@@ -7,8 +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;
/**
@@ -16,7 +16,7 @@
* of their current state as SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/10/08 20:19:03 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/10/11 08:56:17 $
*/
public interface XMLizable {
No revision
No revision
1.1.1.1.2.5 +10 -10
xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMBuilder.java,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- DOMBuilder.java 2001/10/08 20:19:04 1.1.1.1.2.4
+++ DOMBuilder.java 2001/10/11 08:56:18 1.1.1.1.2.5
@@ -8,15 +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.*;
-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;
/**
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.1.1.2.4 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:18 $
*/
public class DOMBuilder implements XMLConsumer, Loggable {
protected Logger log;
1.1.1.1.2.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.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- DOMStreamer.java 2001/10/08 20:19:04 1.1.1.1.2.5
+++ DOMStreamer.java 2001/10/11 08:56:18 1.1.1.1.2.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.1.1.1.2.5 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.1.1.1.2.6 $ $Date: 2001/10/11 08:56:18 $
*/
public class DOMStreamer extends AbstractXMLProducer {
1.2.2.3 +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.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- SVGBuilder.java 2001/10/08 20:19:04 1.2.2.2
+++ SVGBuilder.java 2001/10/11 08:56:18 1.2.2.3
@@ -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.2.2.2 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/10/11 08:56:18 $
*/
public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
protected Logger log;
No revision
No revision
1.1.1.1.2.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.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- ExtendedXLinkPipe.java 2001/10/08 20:19:04 1.1.1.1.2.4
+++ ExtendedXLinkPipe.java 2001/10/11 08:56:18 1.1.1.1.2.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.1.1.1.2.4 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.1.1.1.2.5 $ $Date: 2001/10/11 08:56:18 $
*/
public abstract class ExtendedXLinkPipe extends XLinkPipe {
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- XLinkHandler.java 2001/10/08 20:19:04 1.1.1.1.2.1
+++ XLinkHandler.java 2001/10/11 08:56:18 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:18 $
*/
public interface XLinkHandler {
1.1.1.1.2.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.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- XLinkPipe.java 2001/10/08 20:19:04 1.1.1.1.2.1
+++ XLinkPipe.java 2001/10/11 08:56:18 1.1.1.1.2.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.1.1.2.1 $ $Date: 2001/10/08 20:19:04 $
+ * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/10/11 08:56:18 $
*/
public abstract class XLinkPipe extends AbstractXMLPipe implements
XLinkHandler {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
