bloritsch 00/07/10 20:10:12
Modified: conf Tag: xml-cocoon2 cocoon.xconf
src/org/apache/arch/config Tag: xml-cocoon2
SitemapConfigurationBuilder.java
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
src/org/apache/cocoon/components/classloader Tag:
xml-cocoon2 ClassLoaderManager.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGenerator.java
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
MarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 xsp.xsl
src/org/apache/cocoon/components/language/programming Tag:
xml-cocoon2 AbstractProgrammingLanguage.java
CompiledProgrammingLanguage.java
LanguageCompiler.java ProgrammingLanguage.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 AbstractJavaCompiler.java
JavaLanguage.java
src/org/apache/cocoon/components/parser Tag: xml-cocoon2
Parser.java
src/org/apache/cocoon/components/store Tag: xml-cocoon2
MemoryStore.java Store.java
src/org/apache/cocoon/filters Tag: xml-cocoon2
LogFilter.java SQLFilter.java XIncludeFilter.java
XalanFilter.java
src/org/apache/cocoon/generators Tag: xml-cocoon2
AbstractGenerator.java AbstractServerPage.java
ComposerGenerator.java DirectoryGenerator.java
ServerPagesGenerator.java
src/org/apache/cocoon/matcher Tag: xml-cocoon2
FileAuthenticationMatcher.java
src/org/apache/cocoon/serializers Tag: xml-cocoon2
AbstractSerializer.java FO2PDFSerializer.java
ImageSerializer.java SVGSerializer.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemapComponent.java
AbstractSitemapProcessor.java GenericProcessor.java
LinkResolver.java LinkTranslator.java Matcher.java
ResourcePipeline.java ResourceProcessor.java
Sitemap.java SitemapComponent.java
SitemapPartition.java SitemapProcessor.java
xdocs Tag: xml-cocoon2 xsp-internals.xml
Removed: src/org/apache/arch Tag: xml-cocoon2 Component.java
ComponentManager.java
ComponentNotAccessibleException.java
ComponentNotFoundException.java Composer.java
Modifiable.java package.html
src/org/apache/arch/config Tag: xml-cocoon2
AbstractConfiguration.java Configurable.java
Configuration.java ConfigurationException.java
ConfigurationImpl.java SAXConfigurationBuilder.java
src/org/apache/arch/named Tag: xml-cocoon2
AbstractNamedComponent.java NamedComponent.java
NamedComponentManager.java
NamedComponentManagerImpl.java
src/org/apache/cocoon Tag: xml-cocoon2 Parameters.java
Log:
Cocoon uses the AvalonAware.jar file to provide all the required interfaces
that Avalon provides. These comprise everything that used to belong
to org.apache.arch.* and org.apache.cocoon.Parameters. The only
remaining thing is the org.apache.arch.config.SitemapConfigurationBuilder.java
file. For some reason that is the only class that does not compile.
I will verify the AvalonAware.jar again at work, but the two things that
it complains of exist in the class. ?!?
Revision Changes Path
No revision
No revision
1.1.2.9 +1 -1 xml-cocoon/conf/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/conf/Attic/cocoon.xconf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- cocoon.xconf 2000/07/02 20:59:11 1.1.2.8
+++ cocoon.xconf 2000/07/11 03:09:30 1.1.2.9
@@ -6,7 +6,7 @@
<component role="parser" class="org.apache.cocoon.components.parser.XercesParser"/>
<component role="store" class="org.apache.cocoon.components.store.MemoryStore"/>
- <component role="factory" class="org.apache.arch.named.NamedComponentManagerImpl">
+ <component role="factory" class="org.apache.avalon.NamedComponentManagerImpl">
<component-type name="programming-language">
<component-instance name="java" class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
<parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Javac"/>
No revision
No revision
1.1.2.3 +41 -39 xml-cocoon/src/org/apache/arch/config/Attic/SitemapConfigurationBuilder.java
Index: SitemapConfigurationBuilder.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/arch/config/Attic/SitemapConfigurationBuilder.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SitemapConfigurationBuilder.java 2000/07/06 04:57:42 1.1.2.2
+++ SitemapConfigurationBuilder.java 2000/07/11 03:09:34 1.1.2.3
@@ -1,45 +1,47 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-package org.apache.arch.config;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.xml.sax.Attributes;
-import org.xml.sax.AttributeList;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-
-/**
- * This utility class will create a <code>Configuration</code> tree from an
- * XML file parsed with a SAX version 1 or 2 parser.
- *
- * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
- * (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/06 04:57:42 $
- */
-public class SitemapConfigurationBuilder {
-
- /**
- * Return a new Configuration object.
- */
- public Configuration newConfiguration(String name) {
- return(new ConfigurationImpl (name));
- }
-
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+package org.apache.arch.config;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+import org.xml.sax.Attributes;
+import org.xml.sax.AttributeList;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import org.apache.avalon.ConfigurationImpl;
+import org.apache.avalon.Configuration;
+
+/**
+ * This utility class will create a <code>Configuration</code> tree from an
+ * XML file parsed with a SAX version 1 or 2 parser.
+ *
+ * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
+ * (Apache Software Foundation, Exoffice Technologies)
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:34 $
+ */
+public class SitemapConfigurationBuilder {
+
+ /**
+ * Return a new Configuration object.
+ */
+ public Configuration newConfiguration(String name) {
+ return new ConfigurationImpl(name);
+ }
+
/**
* Add an attribute to this configuration element, returning its old
* value or <b>null</b>.
*/
- public void addAttribute(String name, String value, Configuration conf) {
- ((ConfigurationImpl)conf).addAttribute(name,value);
+ public void addAttribute(String name, String value, Configuration conf) {
+ ((ConfigurationImpl)conf).addAttribute(name,value);
}
/**
@@ -49,4 +51,4 @@
public void addConfiguration(Configuration child, Configuration conf) {
((ConfigurationImpl)conf).addConfiguration(child);
}
-}
+}
\ No newline at end of file
No revision
No revision
1.4.2.9 +11 -11 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -r1.4.2.8 -r1.4.2.9
--- Cocoon.java 2000/07/06 18:58:29 1.4.2.8
+++ Cocoon.java 2000/07/11 03:09:35 1.4.2.9
@@ -15,16 +15,16 @@
import java.net.URL;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.arch.Component;
-import org.apache.arch.Composer;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.ComponentNotFoundException;
-import org.apache.arch.ComponentNotAccessibleException;
-import org.apache.arch.Modifiable;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
-import org.apache.arch.config.SAXConfigurationBuilder;
+import org.apache.avalon.Component;
+import org.apache.avalon.Composer;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.ComponentNotFoundException;
+import org.apache.avalon.ComponentNotAccessibleException;
+import org.apache.avalon.Modifiable;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.SAXConfigurationBuilder;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.serializers.Serializer;
import org.apache.cocoon.sitemap.Sitemap;
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.4.2.8 $ $Date: 2000/07/06 18:58:29 $
+ * @version CVS $Revision: 1.4.2.9 $ $Date: 2000/07/11 03:09:35 $
*/
public class Cocoon
implements Component, Configurable, ComponentManager, Modifiable, Processor,
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java
Index: ClassLoaderManager.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ClassLoaderManager.java 2000/05/23 23:09:53 1.1.2.1
+++ ClassLoaderManager.java 2000/07/11 03:09:36 1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.classloader;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
import java.io.IOException;
@@ -18,7 +18,7 @@
* that it can be safely reinstantiated for dynamic class reloading
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:09:53 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:36 $
*/
public interface ClassLoaderManager extends Component {
/**
No revision
No revision
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java
Index: ProgramGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ProgramGenerator.java 2000/05/24 21:00:30 1.1.2.2
+++ ProgramGenerator.java 2000/07/11 03:09:37 1.1.2.3
@@ -8,14 +8,14 @@
package org.apache.cocoon.components.language.generator;
import java.io.File;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
/**
* This interface defines a loader for programs automatically built from XML
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/05/24 21:00:30 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:37 $
*/
public interface ProgramGenerator extends Component {
/**
1.1.2.4 +10 -12 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ProgramGeneratorImpl.java 2000/05/24 21:25:54 1.1.2.3
+++ ProgramGeneratorImpl.java 2000/07/11 03:09:37 1.1.2.4
@@ -10,19 +10,17 @@
import java.io.File;
import java.io.FileReader;
-import org.apache.arch.Modifiable;
+import org.apache.avalon.Modifiable;
-import org.apache.arch.Composer;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.NamedComponentManager;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.utils.Parameters;
-import org.apache.arch.named.NamedComponentManager;
-
-import org.apache.cocoon.Parameters;
-
import org.apache.cocoon.components.store.MemoryStore;
import org.apache.cocoon.components.store.FilesystemStore;
@@ -40,7 +38,7 @@
import org.xml.sax.InputSource;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
import java.io.IOException;
import org.xml.sax.SAXException;
@@ -50,7 +48,7 @@
* The default implementation of <code>ProgramGenerator</code>
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/05/24 21:25:54 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/11 03:09:37 $
*/
public class ProgramGeneratorImpl
implements ProgramGenerator, Composer, Configurable
No revision
No revision
1.1.2.2 +8 -8 xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractMarkupLanguage.java 2000/05/23 23:09:55 1.1.2.1
+++ AbstractMarkupLanguage.java 2000/07/11 03:09:38 1.1.2.2
@@ -23,15 +23,15 @@
import org.xml.sax.InputSource;
import org.xml.sax.EntityResolver;
-import org.apache.arch.Composer;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
-import org.apache.cocoon.Parameters;
-import org.apache.arch.named.AbstractNamedComponent;
+import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.AbstractNamedComponent;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.components.store.MemoryStore;
@@ -49,7 +49,7 @@
* (as opposed to Cocoon2's standard SAX events)
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:09:55 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:38 $
*/
public abstract class AbstractMarkupLanguage
extends AbstractNamedComponent
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java
Index: MarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarkupLanguage.java 2000/05/23 23:09:56 1.1.2.1
+++ MarkupLanguage.java 2000/07/11 03:09:38 1.1.2.2
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.markup;
import org.w3c.dom.Document;
-import org.apache.arch.named.NamedComponent;
+import org.apache.avalon.NamedComponent;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
@@ -18,7 +18,7 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:09:56 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:38 $
*/
public interface MarkupLanguage extends NamedComponent {
/**
No revision
No revision
1.1.2.5 +5 -5 xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- sitemap.xsl 2000/07/08 20:29:37 1.1.2.4
+++ sitemap.xsl 2000/07/11 03:09:41 1.1.2.5
@@ -23,10 +23,10 @@
import java.util.Stack;
import java.util.Vector;
- import org.apache.arch.config.Configuration;
- import org.apache.arch.config.ConfigurationException;
- import org.apache.arch.config.SitemapConfigurationBuilder;
- import org.apache.cocoon.Parameters;
+ import org.apache.avalon.Configuration;
+ import org.apache.avalon.ConfigurationException;
+ import org.apache.avalon.SitemapConfigurationBuilder;
+ import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.choosers.Chooser;
@@ -40,7 +40,7 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/08 20:29:37 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/11 03:09:41 $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemapProcessor {
No revision
No revision
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XSPGenerator.java 2000/05/25 14:27:47 1.1.2.2
+++ XSPGenerator.java 2000/07/11 03:09:44 1.1.2.3
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Cocoon;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.ComponentManager;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.generators.AbstractServerPage;
@@ -17,7 +17,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/05/25 14:27:47 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:44 $
*/
public abstract class XSPGenerator extends AbstractServerPage {
/** The XSP Object Model */
No revision
No revision
1.1.2.3 +2 -1 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- xsp.xsl 2000/05/24 22:40:08 1.1.2.2
+++ xsp.xsl 2000/07/11 03:09:44 1.1.2.3
@@ -37,7 +37,8 @@
import org.xml.sax.*;
import org.xml.sax.helpers.*;
- import org.apache.arch.*;
+ import org.apache.avalon.*;
+ import org.apache.avalon.utils.*;
import org.apache.cocoon.*;
import org.apache.cocoon.generators.*;
import org.apache.cocoon.components.parser.*;
No revision
No revision
1.1.2.2 +6 -6 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractProgrammingLanguage.java 2000/05/23 23:10:01 1.1.2.1
+++ AbstractProgrammingLanguage.java 2000/07/11 03:09:46 1.1.2.2
@@ -9,12 +9,12 @@
import java.io.File;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
-import org.apache.cocoon.Parameters;
-import org.apache.arch.named.AbstractNamedComponent;
+import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.AbstractNamedComponent;
import org.apache.cocoon.components.language.LanguageException;
@@ -24,7 +24,7 @@
* unloading.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:10:01 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:46 $
*/
public abstract class AbstractProgrammingLanguage
extends AbstractNamedComponent
1.1.2.3 +5 -5 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CompiledProgrammingLanguage.java 2000/05/24 21:25:59 1.1.2.2
+++ CompiledProgrammingLanguage.java 2000/07/11 03:09:46 1.1.2.3
@@ -9,11 +9,11 @@
import java.io.File;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
-import org.apache.arch.Composer;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
import org.apache.cocoon.components.language.LanguageException;
@@ -23,7 +23,7 @@
* and object program files
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/05/24 21:25:59 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:46 $
*/
public abstract class CompiledProgrammingLanguage
extends AbstractProgrammingLanguage
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/LanguageCompiler.java
Index: LanguageCompiler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/LanguageCompiler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LanguageCompiler.java 2000/05/23 23:10:03 1.1.2.1
+++ LanguageCompiler.java 2000/07/11 03:09:46 1.1.2.2
@@ -9,7 +9,7 @@
package org.apache.cocoon.components.language.programming;
import java.util.Vector;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
import java.io.IOException;
@@ -17,7 +17,7 @@
* This interface defines a compiler's functionality for all
* (Java-based) compiled languages
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:10:03 $
+ * @version $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:46 $
* @since 2.0
*/
public interface LanguageCompiler extends Component {
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java
Index: ProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ProgrammingLanguage.java 2000/05/23 23:10:03 1.1.2.1
+++ ProgrammingLanguage.java 2000/07/11 03:09:46 1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.language.programming;
-import org.apache.arch.named.NamedComponent;
+import org.apache.avalon.NamedComponent;
import org.apache.cocoon.components.language.LanguageException;
@@ -15,7 +15,7 @@
* This interface states the functionality of a programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:10:03 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:46 $
*/
public interface ProgrammingLanguage extends NamedComponent {
/**
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/AbstractJavaCompiler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractJavaCompiler.java 2000/05/23 23:10:04 1.1.2.1
+++ AbstractJavaCompiler.java 2000/07/11 03:09:49 1.1.2.2
@@ -11,14 +11,14 @@
import java.io.*;
import java.util.*;
-import org.apache.arch.*;
+import org.apache.avalon.*;
import org.apache.cocoon.components.language.programming.*;
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:10:04 $
+ * @version $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:49 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler implements LanguageCompiler {
1.1.2.2 +5 -5 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JavaLanguage.java 2000/05/23 23:10:05 1.1.2.1
+++ JavaLanguage.java 2000/07/11 03:09:50 1.1.2.2
@@ -10,11 +10,11 @@
import java.io.File;
import java.util.Vector;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
-import org.apache.arch.Composer;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
@@ -26,7 +26,7 @@
* The Java programming language processor
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/23 23:10:05 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:50 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage {
/** The class loader */
No revision
No revision
1.1.2.5 +2 -2 xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Parser.java 2000/05/24 23:13:14 1.1.2.4
+++ Parser.java 2000/07/11 03:09:52 1.1.2.5
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.parser;
import java.io.IOException;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
import org.apache.cocoon.xml.XMLProducer;
import org.apache.cocoon.xml.util.DOMFactory;
import org.xml.sax.InputSource;
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/05/24 23:13:14 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/11 03:09:52 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/components/store/Attic/MemoryStore.java
Index: MemoryStore.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/MemoryStore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MemoryStore.java 2000/02/27 17:47:38 1.1.2.1
+++ MemoryStore.java 2000/07/11 03:09:52 1.1.2.2
@@ -9,7 +9,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
/**
*
@@ -19,7 +19,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/27 17:47:38 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:52 $
*/
public class MemoryStore implements Store {
1.1.2.4 +2 -2 xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java
Index: Store.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Store.java 2000/02/27 17:47:39 1.1.2.3
+++ Store.java 2000/07/11 03:09:52 1.1.2.4
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.store;
import java.util.Enumeration;
-import org.apache.arch.Component;
+import org.apache.avalon.Component;
/**
*
@@ -18,7 +18,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/02/27 17:47:39 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/11 03:09:52 $
*/
public interface Store extends Component {
No revision
No revision
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/filters/Attic/LogFilter.java
Index: LogFilter.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/filters/Attic/LogFilter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LogFilter.java 2000/06/06 12:54:05 1.1.2.2
+++ LogFilter.java 2000/07/11 03:09:53 1.1.2.3
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.filters;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
@@ -44,7 +44,7 @@
*
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/06/06 12:54:05 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:53 $
*
*/
public class LogFilter extends AbstractFilter {
1.1.2.5 +2 -2 xml-cocoon/src/org/apache/cocoon/filters/Attic/SQLFilter.java
Index: SQLFilter.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/filters/Attic/SQLFilter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SQLFilter.java 2000/04/19 06:28:01 1.1.2.4
+++ SQLFilter.java 2000/07/11 03:09:53 1.1.2.5
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.filters;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.ProcessingException;
@@ -35,7 +35,7 @@
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/04/19 06:28:01 $ $Author: balld $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/11 03:09:53 $ $Author: bloritsch $
*/
public class SQLFilter extends AbstractFilter {
1.1.2.6 +4 -4 xml-cocoon/src/org/apache/cocoon/filters/Attic/XIncludeFilter.java
Index: XIncludeFilter.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/filters/Attic/XIncludeFilter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XIncludeFilter.java 2000/05/11 03:28:28 1.1.2.5
+++ XIncludeFilter.java 2000/07/11 03:09:54 1.1.2.6
@@ -25,11 +25,11 @@
import org.w3c.dom.Document;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
import org.apache.cocoon.xml.util.DOMBuilder;
import org.apache.cocoon.xml.util.DOMStreamer;
import org.apache.cocoon.xml.util.XPathAPI;
@@ -42,7 +42,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/05/11 03:28:28 $ $Author: balld $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/11 03:09:54 $ $Author: bloritsch $
*/
public class XIncludeFilter extends AbstractFilter implements Composer {
1.1.2.3 +5 -5 xml-cocoon/src/org/apache/cocoon/filters/Attic/XalanFilter.java
Index: XalanFilter.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/filters/Attic/XalanFilter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XalanFilter.java 2000/06/24 20:16:10 1.1.2.2
+++ XalanFilter.java 2000/07/11 03:09:54 1.1.2.3
@@ -10,11 +10,11 @@
import java.io.IOException;
import java.util.Enumeration;
import java.text.StringCharacterIterator;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
import org.apache.cocoon.Cocoon;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.ProcessingException;
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/06/24 20:16:10 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:09:54 $
*/
public class XalanFilter extends DocumentHandlerWrapper
implements Filter, Composer {
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/generators/Attic/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generators/Attic/AbstractGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractGenerator.java 2000/02/27 03:41:49 1.1.2.1
+++ AbstractGenerator.java 2000/07/11 03:09:56 1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.generators;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.xml.AbstractXMLProducer;
@@ -16,7 +16,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/27 03:41:49 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:56 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/generators/Attic/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generators/Attic/AbstractServerPage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractServerPage.java 2000/05/25 14:27:45 1.1.2.1
+++ AbstractServerPage.java 2000/07/11 03:09:56 1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.generators;
-import org.apache.arch.Modifiable;
+import org.apache.avalon.Modifiable;
import java.io.File;
import org.apache.cocoon.Request;
@@ -20,7 +20,7 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/05/25 14:27:45 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:56 $
*/
public abstract class AbstractServerPage
extends ComposerGenerator
1.1.2.2 +3 -3 xml-cocoon/src/org/apache/cocoon/generators/Attic/ComposerGenerator.java
Index: ComposerGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generators/Attic/ComposerGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ComposerGenerator.java 2000/02/27 03:41:49 1.1.2.1
+++ ComposerGenerator.java 2000/07/11 03:09:56 1.1.2.2
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.generators;
-import org.apache.arch.Composer;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.ComponentManager;
import org.apache.cocoon.Cocoon;
/**
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/27 03:41:49 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:09:56 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composer {
1.1.2.6 +2 -2 xml-cocoon/src/org/apache/cocoon/generators/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generators/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- DirectoryGenerator.java 2000/06/24 19:25:18 1.1.2.5
+++ DirectoryGenerator.java 2000/07/11 03:09:57 1.1.2.6
@@ -16,7 +16,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
@@ -53,7 +53,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/06/24 19:25:18 $ */
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/11 03:09:57 $ */
public class DirectoryGenerator extends ComposerGenerator {
/** The URI of the namespace of this generator. */
1.1.2.4 +3 -3 xml-cocoon/src/org/apache/cocoon/generators/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generators/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ServerPagesGenerator.java 2000/05/24 20:20:17 1.1.2.3
+++ ServerPagesGenerator.java 2000/07/11 03:09:57 1.1.2.4
@@ -19,8 +19,8 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.arch.Composer;
-import org.apache.arch.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.ComponentManager;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import java.io.IOException;
@@ -33,7 +33,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/05/24 20:20:17 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/11 03:09:57 $
*/
public class ServerPagesGenerator
extends ComposerGenerator
No revision
No revision
1.1.2.2 +3 -3 xml-cocoon/src/org/apache/cocoon/matcher/Attic/FileAuthenticationMatcher.java
Index: FileAuthenticationMatcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matcher/Attic/FileAuthenticationMatcher.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FileAuthenticationMatcher.java 2000/06/17 17:21:48 1.1.2.1
+++ FileAuthenticationMatcher.java 2000/07/11 03:09:59 1.1.2.2
@@ -2,9 +2,9 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
public class FileAuthenticationMatcher extends AuthenticationMatcher implements Configurable {
No revision
No revision
1.1.4.3 +2 -2 xml-cocoon/src/org/apache/cocoon/serializers/Attic/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serializers/Attic/AbstractSerializer.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- AbstractSerializer.java 2000/02/27 01:33:07 1.1.4.2
+++ AbstractSerializer.java 2000/07/11 03:10:00 1.1.4.3
@@ -10,7 +10,7 @@
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.sitemap.SitemapComponent;
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.4.2 $ $Date: 2000/02/27 01:33:07 $
+ * @version CVS $Revision: 1.1.4.3 $ $Date: 2000/07/11 03:10:00 $
*/
public abstract class AbstractSerializer extends AbstractXMLConsumer
implements Serializer {
1.1.2.2 +59 -60 xml-cocoon/src/org/apache/cocoon/serializers/Attic/FO2PDFSerializer.java
Index: FO2PDFSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serializers/Attic/FO2PDFSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FO2PDFSerializer.java 2000/04/01 07:42:53 1.1.2.1
+++ FO2PDFSerializer.java 2000/07/11 03:10:00 1.1.2.2
@@ -1,67 +1,66 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-package org.apache.cocoon.serializers;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import org.apache.cocoon.Parameters;
-import org.apache.cocoon.Request;
-import org.apache.cocoon.Response;
-import org.apache.cocoon.xml.util.DocumentHandlerWrapper;
-
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Version;
-
-//import org.xml.sax.Attributes;
-//import org.xml.sax.AttributeList;
-import org.xml.sax.DocumentHandler;
-//import org.xml.sax.helpers.AttributeListImpl;
-//import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- *
- * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
- * (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/04/01 07:42:53 $
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+package org.apache.cocoon.serializers;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+
+import org.apache.avalon.utils.Parameters;
+import org.apache.cocoon.Request;
+import org.apache.cocoon.Response;
+import org.apache.cocoon.xml.util.DocumentHandlerWrapper;
+
+import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.Version;
+
+//import org.xml.sax.Attributes;
+//import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+//import org.xml.sax.helpers.AttributeListImpl;
+//import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
*
- */
+ * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
+ * (PWR Organisation & Entwicklung)
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:10:00 $
+ *
+ */
public class FO2PDFSerializer extends DocumentHandlerWrapper
- implements Serializer {
+ implements Serializer {
+
+ /**
+ * The FOP driver
+ */
+ private Driver driver = null;
/**
- * The FOP driver
- */
- private Driver driver = null;
-
- /**
- * Set the <code>Request</code>, <code>Response</code> and sitemap
- * <code>Parameters</code> used to process the request.
- */
- public void setup(Request req, Response res, String src, Parameters par) {
- driver = new Driver();
- driver.setRenderer("org.apache.fop.render.pdf.PDFRenderer", Version.getVersion());
- driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
- driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ * Set the <code>Request</code>, <code>Response</code> and sitemap
+ * <code>Parameters</code> used to process the request.
+ */
+ public void setup(Request req, Response res, String src, Parameters par) {
+ driver = new Driver();
+ driver.setRenderer("org.apache.fop.render.pdf.PDFRenderer", Version.getVersion());
+ driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
+ driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
res.setContentType(par.getParameter("contentType","application/pdf"));
- this.setDocumentHandler (driver.getDocumentHandler());
- }
-
- /**
- * Set the <code>OutputStream</code> where the XML should be serialized.
- */
- public void setOutputStream(OutputStream out) {
- driver.setWriter(new PrintWriter(out));
- }
-
+ this.setDocumentHandler (driver.getDocumentHandler());
+ }
+
+ /**
+ * Set the <code>OutputStream</code> where the XML should be serialized.
+ */
+ public void setOutputStream(OutputStream out) {
+ driver.setWriter(new PrintWriter(out));
+ }
/**
* Receive notification of the end of a document.
*/
@@ -77,4 +76,4 @@
throw new SAXException (e);
}
}
-}
+}
\ No newline at end of file
1.1.2.2 +3 -2 xml-cocoon/src/org/apache/cocoon/serializers/Attic/ImageSerializer.java
Index: ImageSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serializers/Attic/ImageSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ImageSerializer.java 2000/02/28 18:41:06 1.1.2.1
+++ ImageSerializer.java 2000/07/11 03:10:00 1.1.2.2
@@ -7,7 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.serializers;
-import org.apache.arch.*;
+import org.apache.avalon.*;
+import org.apache.avalon.utils.*;
import org.apache.cocoon.*;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.*;
@@ -49,7 +50,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author Copyright 1999 © <a href="http://www.apache.org">The Apache
* Software Foundation</a>. All rights reserved.
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/28 18:41:06 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:10:00 $
*/
public class ImageSerializer extends DOMBuilder implements Serializer, Composer {
1.1.2.2 +3 -2 xml-cocoon/src/org/apache/cocoon/serializers/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serializers/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SVGSerializer.java 2000/03/30 04:53:54 1.1.2.1
+++ SVGSerializer.java 2000/07/11 03:10:01 1.1.2.2
@@ -7,7 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.serializers;
-import org.apache.arch.*;
+import org.apache.avalon.*;
+import org.apache.avalon.utils.*;
import org.apache.cocoon.*;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.*;
@@ -50,7 +51,7 @@
* @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
* @author Copyright 1999 © <a href="http://www.apache.org">The Apache
* Software Foundation</a>. All rights reserved.
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/03/30 04:53:54 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:10:01 $
*/
public class SVGSerializer extends DOMBuilder implements Serializer, Composer {
No revision
No revision
1.1.4.10 +3 -3 xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -u -r1.1.4.9 -r1.1.4.10
--- CocoonServlet.java 2000/05/31 22:42:32 1.1.4.9
+++ CocoonServlet.java 2000/07/11 03:10:02 1.1.4.10
@@ -17,8 +17,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.arch.config.ConfigurationException;
-import org.apache.arch.ComponentNotAccessibleException;
+import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.ComponentNotAccessibleException;
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.ProcessingException;
import org.xml.sax.SAXException;
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.4.9 $ $Date: 2000/05/31 22:42:32 $
+ * @version CVS $Revision: 1.1.4.10 $ $Date: 2000/07/11 03:10:02 $
*/
public class CocoonServlet extends HttpServlet {
private Cocoon cocoon=null;
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemapComponent.java
Index: AbstractSitemapComponent.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemapComponent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractSitemapComponent.java 2000/02/27 03:44:18 1.1.2.1
+++ AbstractSitemapComponent.java 2000/07/11 03:10:03 1.1.2.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
@@ -15,7 +15,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/02/27 03:44:18 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/11 03:10:03 $
*/
public abstract class AbstractSitemapComponent implements SitemapComponent {
1.1.2.3 +28 -45 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemapProcessor.java
Index: AbstractSitemapProcessor.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemapProcessor.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractSitemapProcessor.java 2000/07/06 04:57:50 1.1.2.2
+++ AbstractSitemapProcessor.java 2000/07/11 03:10:03 1.1.2.3
@@ -1,20 +1,20 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-package org.apache.cocoon.sitemap;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+package org.apache.cocoon.sitemap;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.Request;
@@ -22,16 +22,14 @@
import org.xml.sax.SAXException;
-
-/**
- * Base class for XSP-generated <code>SitemapProcessor</code> classes
- *
- * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/06 04:57:50 $
- */
-public abstract class AbstractSitemapProcessor
- implements SitemapProcessor {
-
+/**
+ * Base class for XSP-generated <code>SitemapProcessor</code> classes
+ *
+ * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:10:03 $
+ */
+public abstract class AbstractSitemapProcessor
+ implements SitemapProcessor {
/** The component manager instance */
protected ComponentManager manager=null;
@@ -81,14 +79,10 @@
public boolean hasContentChanged(Request request) {
return true;
}
-
- /**
+ /**
* Loads a class specified in a sitemap component definition
*/
- protected Object load_component (String ClassURL, Configuration conf) {
- return ("");
- }
-
+ protected Object load_component (String ClassURL, Configuration conf) { return (""); }
/**
* Resolve a link against a source into the target URI space.
*/
@@ -102,15 +96,4 @@
* This method is supplied by the generated SitemapProcessor .
*/
protected abstract ResourcePipeline constructPipeline (Request request, Response resposne);
-
- /** Following methods are for testing purposes only and should later be deleted */
- protected boolean uri_wildcard_matcher (String pattern) {
- return (true);
- }
- protected boolean uri_regexp_matcher (String pattern) {
- return (true);
- }
- protected boolean browser_matcher (String pattern) {
- return (true);
- }
-}
+ /** Following methods are for testing purposes only and should later be deleted */ protected boolean uri_wildcard_matcher (String pattern) { return (true); } protected boolean uri_regexp_matcher (String pattern) { return (true); } protected boolean browser_matcher (String pattern) { return (true); } }
\ No newline at end of file
1.1.2.11 +8 -8 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/GenericProcessor.java
Index: GenericProcessor.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/GenericProcessor.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- GenericProcessor.java 2000/07/05 20:20:53 1.1.2.10
+++ GenericProcessor.java 2000/07/11 03:10:03 1.1.2.11
@@ -11,13 +11,13 @@
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Request;
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/07/05 20:20:53 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/07/11 03:10:03 $
*/
public class GenericProcessor
implements Composer, Configurable, Processor, LinkResolver {
1.1.4.2 +2 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkResolver.java
Index: LinkResolver.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkResolver.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- LinkResolver.java 2000/02/27 14:57:26 1.1.4.1
+++ LinkResolver.java 2000/07/11 03:10:03 1.1.4.2
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.arch.config.Configurable;
+import org.apache.avalon.Configurable;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
@@ -15,7 +15,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.4.1 $ $Date: 2000/02/27 14:57:26 $
+ * @version CVS $Revision: 1.1.4.2 $ $Date: 2000/07/11 03:10:03 $
*/
public interface LinkResolver {
1.1.2.5 +2 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java
Index: LinkTranslator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- LinkTranslator.java 2000/06/06 12:54:07 1.1.2.4
+++ LinkTranslator.java 2000/07/11 03:10:04 1.1.2.5
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.arch.config.Configurable;
+import org.apache.avalon.Configurable;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.xml.AbstractXMLProducer;
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/06/06 12:54:07 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/07/11 03:10:04 $
*/
public class LinkTranslator extends AbstractXMLProducer implements XMLConsumer {
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Matcher.java
Index: Matcher.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Matcher.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Matcher.java 2000/02/27 01:33:09 1.1.2.2
+++ Matcher.java 2000/07/11 03:10:04 1.1.2.3
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.arch.config.Configurable;
+import org.apache.avalon.Configurable;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
@@ -15,7 +15,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/02/27 01:33:09 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:10:04 $
*/
public interface Matcher extends Configurable {
1.1.2.3 +91 -90 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ResourcePipeline.java 2000/07/06 16:54:46 1.1.2.2
+++ ResourcePipeline.java 2000/07/11 03:10:04 1.1.2.3
@@ -1,91 +1,92 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-package org.apache.cocoon.sitemap;
-
-import java.util.Vector;
-import java.io.IOException;
-import java.io.OutputStream;
-
-//import org.apache.arch.config.ConfigurationException;
-import org.apache.cocoon.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Request;
-import org.apache.cocoon.Response;
-import org.apache.cocoon.generators.Generator;
-import org.apache.cocoon.filters.Filter;
-import org.apache.cocoon.serializers.Serializer;
-import org.apache.cocoon.xml.XMLProducer;
-
-import org.xml.sax.SAXException;
-
-/**
- *
- * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/06 16:54:46 $
- */
-
-public class ResourcePipeline {
- private Generator generator = null;
- private Parameters generatorParam = null;
- private String generatorSource = null;
- private Vector filters = new Vector();
- private Vector filterParams = new Vector();
- private Vector filterSources = new Vector();
- private Serializer serializer = null;
- private Parameters serializerParam = null;
- private String serializerSource = null;
-
- public ResourcePipeline () {
- }
-
- public void setGenerator (Generator generator, String source, Parameters param) {
- this.generator = generator;
- this.generatorSource = source;
- this.generatorParam = param;
- }
-
- public void setSerializer (Serializer serializer, String source, Parameters param) {
- this.serializer = serializer;
- this.serializerSource = source;
- this.serializerParam = param;
- }
-
- public void addFilter (Filter filter, String source, Parameters param) {
- this.filters.add (filter);
- this.filterSources.add (source);
- this.filterParams.add (param);
- }
-
- public boolean startPipeline (Request req, Response res, OutputStream out)
- throws ProcessingException, IOException, SAXException {
- if (generator == null) {
- throw new ProcessingException ("Generator not specified");
- }
-
- if (serializer == null) {
- throw new ProcessingException ("Serializer not specified");
- }
-
- generator.setup (req, res, generatorSource, generatorParam);
- Filter filter = null;
- XMLProducer producer = generator;
- int i = filters.size();
- for (int j=0; j < i; j++) {
- filter = (Filter) filters.elementAt (j);
- filter.setup (req, res, (String)filterSources.elementAt (j),
- (Parameters)filterParams.elementAt (j));
- producer.setConsumer (filter);
- producer = filter;
- }
- serializer.setup (req, res, serializerSource, generatorParam);
- serializer.setOutputStream (out);
- producer.setConsumer (serializer);
- generator.generate();
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+package org.apache.cocoon.sitemap;
+
+import java.util.Vector;
+import java.io.IOException;
+import java.io.OutputStream;
+
+//import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.utils.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.Request;
+import org.apache.cocoon.Response;
+import org.apache.cocoon.generators.Generator;
+import org.apache.cocoon.filters.Filter;
+import org.apache.cocoon.serializers.Serializer;
+import org.apache.cocoon.xml.XMLProducer;
+
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:10:04 $
+ */
+public class ResourcePipeline {
+ private Generator generator = null;
+ private Parameters generatorParam = null;
+ private String generatorSource = null;
+ private Vector filters = new Vector();
+ private Vector filterParams = new Vector();
+ private Vector filterSources = new Vector();
+ private Serializer serializer = null;
+ private Parameters serializerParam = null;
+ private String serializerSource = null;
+
+ public ResourcePipeline () {
+ }
+
+ public void setGenerator (Generator generator, String source, Parameters param) {
+ this.generator = generator;
+ this.generatorSource = source;
+ this.generatorParam = param;
+ }
+
+ public void setSerializer (Serializer serializer, String source, Parameters param) {
+ this.serializer = serializer;
+ this.serializerSource = source;
+ this.serializerParam = param;
+ }
+
+ public void addFilter (Filter filter, String source, Parameters param) {
+ this.filters.add (filter);
+ this.filterSources.add (source);
+ this.filterParams.add (param);
+ }
+
+ public boolean startPipeline (Request req, Response res, OutputStream out)
+ throws ProcessingException, IOException, SAXException {
+ if (generator == null) {
+ throw new ProcessingException ("Generator not specified");
+ }
+
+ if (serializer == null) {
+ throw new ProcessingException ("Serializer not specified");
+ }
+
+ generator.setup (req, res, generatorSource, generatorParam);
+ Filter filter = null;
+ XMLProducer producer = generator;
+ int i = filters.size();
+
+ for (int j=0; j < i; j++) {
+ filter = (Filter) filters.elementAt (j);
+ filter.setup (req, res, (String)filterSources.elementAt (j),
+ (Parameters)filterParams.elementAt (j));
+ producer.setConsumer (filter);
+ producer = filter;
+ }
+
+ serializer.setup (req, res, serializerSource, generatorParam);
+ serializer.setOutputStream (out);
+ producer.setConsumer (serializer);
+ generator.generate();
return true;
- }
-}
+ }
+}
\ No newline at end of file
1.1.2.3 +7 -7 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourceProcessor.java
Index: ResourceProcessor.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourceProcessor.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ResourceProcessor.java 2000/02/27 01:33:09 1.1.2.2
+++ ResourceProcessor.java 2000/07/11 03:10:04 1.1.2.3
@@ -11,12 +11,12 @@
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Request;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/02/27 01:33:09 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:10:04 $
*/
public class ResourceProcessor implements Composer, Configurable, Processor {
1.1.4.6 +7 -7 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java
Index: Sitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -r1.1.4.5 -r1.1.4.6
--- Sitemap.java 2000/02/28 18:43:21 1.1.4.5
+++ Sitemap.java 2000/07/11 03:10:04 1.1.4.6
@@ -11,12 +11,12 @@
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Request;
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.4.5 $ $Date: 2000/02/28 18:43:21 $
+ * @version CVS $Revision: 1.1.4.6 $ $Date: 2000/07/11 03:10:04 $
*/
public class Sitemap
implements Composer, Configurable, Processor, LinkResolver {
1.1.2.4 +3 -3 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponent.java
Index: SitemapComponent.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponent.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SitemapComponent.java 2000/02/28 18:43:21 1.1.2.3
+++ SitemapComponent.java 2000/07/11 03:10:04 1.1.2.4
@@ -8,8 +8,8 @@
package org.apache.cocoon.sitemap;
import java.io.IOException;
-import org.apache.arch.Component;
-import org.apache.cocoon.Parameters;
+import org.apache.avalon.Component;
+import org.apache.avalon.utils.Parameters;
import org.apache.cocoon.Request;
import org.apache.cocoon.Response;
import org.apache.cocoon.ProcessingException;
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/02/28 18:43:21 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/07/11 03:10:04 $
*/
public interface SitemapComponent extends Component {
1.1.2.6 +7 -7 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapPartition.java
Index: SitemapPartition.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapPartition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SitemapPartition.java 2000/02/28 18:43:21 1.1.2.5
+++ SitemapPartition.java 2000/07/11 03:10:04 1.1.2.6
@@ -11,12 +11,12 @@
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.arch.Component;
-import org.apache.arch.ComponentManager;
-import org.apache.arch.Composer;
-import org.apache.arch.config.Configurable;
-import org.apache.arch.config.Configuration;
-import org.apache.arch.config.ConfigurationException;
+import org.apache.avalon.Component;
+import org.apache.avalon.ComponentManager;
+import org.apache.avalon.Composer;
+import org.apache.avalon.Configurable;
+import org.apache.avalon.Configuration;
+import org.apache.avalon.ConfigurationException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Request;
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/02/28 18:43:21 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/11 03:10:04 $
*/
public class SitemapPartition
implements Composer, Configurable, Processor, LinkResolver {
1.1.2.3 +22 -23 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapProcessor.java
Index: SitemapProcessor.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapProcessor.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SitemapProcessor.java 2000/07/06 04:57:50 1.1.2.2
+++ SitemapProcessor.java 2000/07/11 03:10:04 1.1.2.3
@@ -1,23 +1,22 @@
-/*****************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
-package org.apache.cocoon.sitemap;
-
-import org.apache.arch.Composer;
-import org.apache.arch.Modifiable;
-import org.apache.arch.config.Configurable;
-import org.apache.cocoon.Processor;
-
-/**
- * Base class for XSP-generated <code>SitemapProcessor</code> classes
- *
- * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/07/06 04:57:50 $
- */
-public interface SitemapProcessor
- extends Composer, Configurable, Processor, LinkResolver, Modifiable {
-}
+/*****************************************************************************
+ * Copyright (C) The Apache Software Foundation. All rights reserved. *
+ * ------------------------------------------------------------------------- *
+ * This software is published under the terms of the Apache Software License *
+ * version 1.1, a copy of which has been included with this distribution in *
+ * the LICENSE file. *
+ *****************************************************************************/
+package org.apache.cocoon.sitemap;
+
+import org.apache.avalon.Composer;
+import org.apache.avalon.Modifiable;
+import org.apache.avalon.Configurable;
+import org.apache.cocoon.Processor;
+
+/**
+ * Base class for XSP-generated <code>SitemapProcessor</code> classes
+ *
+ * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/11 03:10:04 $
+ */
+public interface SitemapProcessor
+ extends Composer, Configurable, Processor, LinkResolver, Modifiable { }
\ No newline at end of file
No revision
No revision
1.1.2.3 +1 -1 xml-cocoon/xdocs/Attic/xsp-internals.xml
Index: xsp-internals.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/xsp-internals.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- xsp-internals.xml 2000/05/26 07:13:39 1.1.2.2
+++ xsp-internals.xml 2000/07/11 03:10:10 1.1.2.3
@@ -1678,7 +1678,7 @@
<source><![CDATA[
<component role="factory"
- class="org.apache.arch.named.NamedComponentManagerImpl">
+ class="org.apache.avalon.NamedComponentManagerImpl">
<component-type name="programming-language">
|