bloritsch 01/04/30 07:17:48
Modified: src Tag: xml-cocoon2 Manifest.mf
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
CodeFactory.java Main.java Notification.java
ProcessingException.java Roles.java cocoon.roles
src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractAction.java
AbstractComplementaryConfigurableAction.java
AbstractDatabaseAction.java
AbstractValidatorAction.java Action.java
ComposerAction.java DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseUpdateAction.java
FormValidatorAction.java HelloAction.java
LangSelect.java OraAddAction.java
ResourceExistsAction.java SendmailAction.java
SessionInvalidatorAction.java
SessionPropagatorAction.java
SessionValidatorAction.java
src/org/apache/cocoon/components/browser Tag: xml-cocoon2
Browser.java BrowserImpl.xsl
src/org/apache/cocoon/components/classloader Tag:
xml-cocoon2 ClassLoaderManager.java
ClassLoaderManagerImpl.java
RepositoryClassLoader.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 CompiledComponent.java
GeneratorSelector.java ProgramGenerator.java
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
Logicsheet.java LogicsheetCodeGenerator.java
MarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap
Tag: xml-cocoon2 SitemapMarkupLanguage.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
XSPMarkupLanguage.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 esql.xsl 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 Jikes.java JstyleFormatter.java
src/org/apache/cocoon/components/language/programming/javascript
Tag: xml-cocoon2 JavascriptLanguage.java
src/org/apache/cocoon/components/parser Tag: xml-cocoon2
Parser.java
src/org/apache/cocoon/components/pipeline Tag: xml-cocoon2
AbstractEventPipeline.java
AbstractStreamPipeline.java
CachingEventPipeline.java
CachingStreamPipeline.java EventPipeline.java
NonCachingEventPipeline.java StreamPipeline.java
src/org/apache/cocoon/components/sax Tag: xml-cocoon2
XMLByteStreamCompiler.java
XMLByteStreamInterpreter.java XMLTeePipe.java
src/org/apache/cocoon/components/saxconnector Tag:
xml-cocoon2 NullSAXConnector.java SAXConnector.java
XIncludeSAXConnector.java
src/org/apache/cocoon/components/store Tag: xml-cocoon2
FilesystemStore.java MRUMemoryStore.java
MemoryStore.java Store.java
src/org/apache/cocoon/components/url Tag: xml-cocoon2
ContextURLFactory.java ResourceURLFactory.java
URLFactory.java URLFactoryImpl.java
src/org/apache/cocoon/environment Tag: xml-cocoon2
AbstractEnvironment.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractGenerator.java ComposerGenerator.java
DirectoryGenerator.java FileGenerator.java
FragmentExtractorGenerator.java HTMLGenerator.java
ImageDirectoryGenerator.java JspGenerator.java
PhpGenerator.java RequestGenerator.java
ScriptGenerator.java ServerPagesGenerator.java
ServletGenerator.java StatusGenerator.java
VelocityGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
BrowserMatcherFactory.java
FileAuthenticationMatcher.java.new Matcher.java
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
AbstractReader.java DatabaseReader.java
ResourceReader.java
src/org/apache/cocoon/selection Tag: xml-cocoon2
BrowserSelectorFactory.java
CodedSelectorFactory.java HostSelectorFactory.java
Selector.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractSerializer.java AbstractTextSerializer.java
FOPSerializer.java HTMLSerializer.java
LinkSerializer.java SVGSerializer.java
TextSerializer.java XMLSerializer.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java ParanoidCocoonServlet.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java ContentAggregator.java
ErrorNotifier.java Handler.java LinkTranslator.java
Manager.java Sitemap.java
SitemapComponentSelector.java
SitemapModelComponent.java
SitemapOutputComponent.java XSLTFactoryLoader.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
AbstractDOMTransformer.java
FragmentExtractorTransformer.java
I18nTransformer.java LogTransformer.java
SQLTransformer.java TraxTransformer.java
XIncludeTransformer.java XTTransformer.java
src/org/apache/cocoon/xml Tag: xml-cocoon2
AbstractXMLConsumer.java AbstractXMLProducer.java
ContentHandlerWrapper.java
DocumentHandlerWrapper.java
LoggingEntityResolver.java
XIncludeContentHandler.java
src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
DOMBuilder.java SVGBuilder.java
webapp Tag: xml-cocoon2 cocoon.xconf
Added: lib Tag: xml-cocoon2 avalon-excalibur.jar
avalon-framework.jar
Removed: lib Tag: xml-cocoon2 avalonapi.jar
Log:
Update to Avalon using new and current packages.
Revision Changes Path
No revision
No revision
1.1.2.1 +312 -0 xml-cocoon/lib/Attic/avalon-excalibur.jar
<<Binary file>>
1.1.2.1 +111 -0 xml-cocoon/lib/Attic/avalon-framework.jar
<<Binary file>>
No revision
No revision
1.1.2.9 +3 -3 xml-cocoon/src/Manifest.mf
Index: Manifest.mf
===================================================================
RCS file: /home/cvs/xml-cocoon/src/Manifest.mf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Manifest.mf 2001/03/22 18:06:36 1.1.2.8
+++ Manifest.mf 2001/04/30 14:16:52 1.1.2.9
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Main-Class: org.apache.cocoon.Main
-Class-Path: avalonapi.jar batik-all.jar bsf.jar fop-0_17_0.jar
- jakarta-regexp-1.2.jar jstyle.jar rhino.jar xalan-2.0.1.jar
- xerces_1_3_0.jar xt.jar
+Class-Path: avalon-framework.jar avalon-excalibur.jar batik-all.jar
+ bsf.jar fop-0_17_0.jar jakarta-regexp-1.2.jar jstyle.jar rhino.jar
+ xalan-2.0.1.jar xerces_1_3_1.jar xt.jar
Name: org/apache/cocoon/components/markup/sitemap/java/sitemap.xsl
Mime-Type: application/xml
No revision
No revision
1.4.2.81 +16 -16 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.80
retrieving revision 1.4.2.81
diff -u -r1.4.2.80 -r1.4.2.81
--- Cocoon.java 2001/04/27 15:14:11 1.4.2.80
+++ Cocoon.java 2001/04/30 14:16:53 1.4.2.81
@@ -15,19 +15,19 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.SAXConfigurationHandler;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+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.Modifiable;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
@@ -42,8 +42,8 @@
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.excalibur.component.DefaultComponentManager;
-import org.apache.excalibur.component.DefaultRoleManager;
+import org.apache.avalon.excalibur.component.DefaultComponentManager;
+import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -52,7 +52,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
(Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.80 $ $Date: 2001/04/27 15:14:11 $
+ * @version CVS $Revision: 1.4.2.81 $ $Date: 2001/04/30 14:16:53 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe,
Component, Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
1.1.2.7 +2 -2 xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java
Index: CodeFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CodeFactory.java 2001/03/12 04:38:26 1.1.2.6
+++ CodeFactory.java 2001/04/30 14:16:53 1.1.2.7
@@ -8,7 +8,7 @@
package org.apache.cocoon;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/03/12 04:38:26 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:16:53 $
*/
public interface CodeFactory {
1.1.4.32 +6 -6 xml-cocoon/src/org/apache/cocoon/Attic/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Main.java,v
retrieving revision 1.1.4.31
retrieving revision 1.1.4.32
diff -u -r1.1.4.31 -r1.1.4.32
--- Main.java 2001/04/25 17:04:54 1.1.4.31
+++ Main.java 2001/04/30 14:16:53 1.1.4.32
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.avalon.context.DefaultContext;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
@@ -30,10 +30,10 @@
import org.apache.cocoon.util.JavaArchiveFilter;
import org.apache.cocoon.util.MIMEUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.excalibur.cli.CLArgsParser;
-import org.apache.excalibur.cli.CLOption;
-import org.apache.excalibur.cli.CLOptionDescriptor;
-import org.apache.excalibur.cli.CLUtil;
+import org.apache.avalon.excalibur.cli.CLArgsParser;
+import org.apache.avalon.excalibur.cli.CLOption;
+import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
+import org.apache.avalon.excalibur.cli.CLUtil;
import org.apache.log.Category;
import org.apache.log.LogKit;
import org.apache.log.LogTarget;
@@ -46,7 +46,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.4.31 $ $Date: 2001/04/25 17:04:54 $
+ * @version CVS $Revision: 1.1.4.32 $ $Date: 2001/04/30 14:16:53 $
*/
public class Main {
1.1.2.5 +1 -1 xml-cocoon/src/org/apache/cocoon/Attic/Notification.java
Index: Notification.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Notification.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Notification.java 2001/04/25 17:04:54 1.1.2.4
+++ Notification.java 2001/04/30 14:16:53 1.1.2.5
@@ -11,7 +11,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
-import org.apache.avalon.CascadingException;
+import org.apache.avalon.framework.CascadingException;
import org.xml.sax.SAXException;
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java
Index: ProcessingException.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ProcessingException.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ProcessingException.java 2001/04/25 17:04:55 1.1.2.10
+++ ProcessingException.java 2001/04/30 14:16:53 1.1.2.11
@@ -9,7 +9,7 @@
import java.io.PrintStream;
import java.io.PrintWriter;
-import org.apache.avalon.CascadingException;
+import org.apache.avalon.framework.CascadingException;
/**
* This Exception is thrown every time there is a problem in processing
@@ -17,7 +17,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:04:55 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:16:53 $
*/
public class ProcessingException extends CascadingException {
1.1.2.18 +3 -3 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- Roles.java 2001/04/27 15:14:14 1.1.2.17
+++ Roles.java 2001/04/30 14:16:54 1.1.2.18
@@ -12,7 +12,7 @@
* Created this interface to specify the Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/27 15:14:14 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/30 14:16:54 $
*/
public interface Roles {
@@ -28,10 +28,10 @@
String PROGRAMMING_LANGUAGE =
"org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector";
String PROGRAM_GENERATOR =
"org.apache.cocoon.components.language.generator.ProgramGenerator";
String CLASS_LOADER =
"org.apache.cocoon.components.classloader.ClassLoaderManager";
- String POOL_CONTROLLER = "org.apache.excalibur.pool.PoolController";
+ String POOL_CONTROLLER =
"org.apache.avalon.excalibur.pool.PoolController";
String SAX_CONNECTOR =
"org.apache.cocoon.components.saxconnector.SAXConnector";
String IMAGE_ENCODER =
"org.apache.cocoon.components.image.ImageEncoderSelector";
- String DB_CONNECTION =
"org.apache.excalibur.datasource.DataSourceComponentSelector";
+ String DB_CONNECTION =
"org.apache.avalon.excalibur.datasource.DataSourceComponentSelector";
String URL_FACTORY =
"org.apache.cocoon.components.url.URLFactory";
String ACTIONS = "org.apache.cocoon.acting.ActionSelector";
1.1.2.7 +12 -12 xml-cocoon/src/org/apache/cocoon/Attic/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/cocoon.roles,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- cocoon.roles 2001/04/20 20:49:42 1.1.2.6
+++ cocoon.roles 2001/04/30 14:16:54 1.1.2.7
@@ -26,11 +26,11 @@
<role
name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
shorthand="markup-languages"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
shorthand="programming-languages"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.generator.ProgramGenerator"
shorthand="program-generator"
@@ -40,9 +40,9 @@
shorthand="classloader"
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
- <role name="org.apache.excalibur.pool.PoolController"
+ <role name="org.apache.avalon.excalibur.pool.PoolController"
shorthand="pool-controller"
-
default-class="org.apache.excalibur.component.DefaultComponentPoolController"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentPoolController"/>
<role name="org.apache.cocoon.components.saxconnector.SAXConnector"
shorthand="sax-connector"
@@ -51,10 +51,10 @@
<role name="org.apache.cocoon.components.image.ImageEncoderSelector"
shorthand="image-encoder"/>
- <role name="org.apache.excalibur.datasource.DataSourceComponentSelector"
+ <role
name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
shorthand="datasources"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector">
- <hint shorthand="jdbc"
class="org.apache.excalibur.datasource.JdbcDataSource"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector">
+ <hint shorthand="jdbc"
class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/>
<hint shorthand="j2ee"
class="org.apache.exvalibur.datasource.J2eeDataSource"/>
</role>
@@ -72,23 +72,23 @@
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="action"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selector"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matcher"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generator"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformer"
-
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
+
default-class="org.apache.avalon.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializer"
No revision
No revision
1.1.2.9 +6 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractAction.java 2001/04/25 17:05:02 1.1.2.8
+++ AbstractAction.java 2001/04/30 14:16:55 1.1.2.9
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.Logger;
/**
@@ -19,7 +19,7 @@
* Actions. In order to get at the Logger, use getLogger().
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:05:02 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:16:55 $
*/
public abstract class AbstractAction extends AbstractLoggable
implements Action, Configurable, Disposable {
1.1.2.3 +5 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractComplementaryConfigurableAction.java 2001/04/25 17:05:03
1.1.2.2
+++ AbstractComplementaryConfigurableAction.java 2001/04/30 14:16:55
1.1.2.3
@@ -10,11 +10,10 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationBuilder;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.SAXConfigurationHandler;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
@@ -28,7 +27,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:05:03 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/30 14:16:55 $
*/
public abstract class AbstractComplementaryConfigurableAction extends
ComposerAction {
private static Map configurations = new HashMap();
1.1.2.30 +12 -12
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- AbstractDatabaseAction.java 2001/04/25 17:05:03 1.1.2.29
+++ AbstractDatabaseAction.java 2001/04/30 14:16:56 1.1.2.30
@@ -32,16 +32,16 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.SAXConfigurationHandler;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -49,7 +49,7 @@
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -172,7 +172,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/25 17:05:03 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/30 14:16:56 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
1.1.2.6 +6 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractValidatorAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractValidatorAction.java 2001/04/25 21:01:44 1.1.2.5
+++ AbstractValidatorAction.java 2001/04/30 14:16:56 1.1.2.6
@@ -1,9 +1,9 @@
-// $Id: AbstractValidatorAction.java,v 1.1.2.5 2001/04/25 21:01:44 dims Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.6 2001/04/30 14:16:56 bloritsch
Exp $
package org.apache.cocoon.acting;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.Logger;
/**
@@ -41,7 +41,7 @@
* octal values as accepted by java.Lang.decode (String s).
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 21:01:44 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:16:56 $
*/
public abstract class AbstractValidatorAction
extends AbstractComplementaryConfigurableAction
@@ -280,5 +280,5 @@
}
}
-// $Id: AbstractValidatorAction.java,v 1.1.2.5 2001/04/25 21:01:44 dims Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.6 2001/04/30 14:16:56 bloritsch
Exp $
// vim: set et ts=4 sw=4:
1.1.2.11 +4 -4 xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- Action.java 2001/04/25 17:05:05 1.1.2.10
+++ Action.java 2001/04/30 14:16:56 1.1.2.11
@@ -8,16 +8,16 @@
package org.apache.cocoon.acting;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.parameters.Parameters;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:05 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:16:56 $
*/
public interface Action extends Component, ThreadSafe {
/**
1.1.2.7 +4 -4
xml-cocoon/src/org/apache/cocoon/acting/Attic/ComposerAction.java
Index: ComposerAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/ComposerAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ComposerAction.java 2001/04/20 20:49:44 1.1.2.6
+++ ComposerAction.java 2001/04/30 14:16:56 1.1.2.7
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.Composable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.Composable;
import org.apache.cocoon.Cocoon;
/**
@@ -17,7 +17,7 @@
* that extends this to access SitemapComponents.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:44 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:16:56 $
*/
public abstract class ComposerAction extends AbstractAction implements
Composable {
1.1.2.26 +8 -8
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- DatabaseAddAction.java 2001/04/25 17:05:06 1.1.2.25
+++ DatabaseAddAction.java 2001/04/30 14:16:56 1.1.2.26
@@ -16,18 +16,18 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
/**
@@ -35,7 +35,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/25 17:05:06 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/30 14:16:56 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
1.1.2.9 +7 -7
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- DatabaseAuthenticatorAction.java 2001/04/25 21:01:46 1.1.2.8
+++ DatabaseAuthenticatorAction.java 2001/04/30 14:16:57 1.1.2.9
@@ -1,4 +1,4 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.8 2001/04/25 21:01:46 dims
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.9 2001/04/30 14:16:57
bloritsch Exp $
package org.apache.cocoon.acting;
import java.sql.Connection;
@@ -7,13 +7,13 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
@@ -50,7 +50,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 21:01:46 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:16:57 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
{
@@ -223,5 +223,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.8 2001/04/25 21:01:46 dims
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.9 2001/04/30 14:16:57
bloritsch Exp $
// vim: set et ts=4 sw=4:
1.1.2.16 +8 -8
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- DatabaseDeleteAction.java 2001/04/25 17:05:07 1.1.2.15
+++ DatabaseDeleteAction.java 2001/04/30 14:16:57 1.1.2.16
@@ -16,18 +16,18 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
/**
@@ -38,7 +38,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/25 17:05:07 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/30 14:16:57 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
1.1.2.21 +8 -8
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- DatabaseUpdateAction.java 2001/04/25 17:05:07 1.1.2.20
+++ DatabaseUpdateAction.java 2001/04/30 14:16:57 1.1.2.21
@@ -16,18 +16,18 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
/**
@@ -35,7 +35,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/25 17:05:07 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/30 14:16:57 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
1.1.2.7 +6 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/FormValidatorAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FormValidatorAction.java 2001/04/25 21:01:46 1.1.2.6
+++ FormValidatorAction.java 2001/04/30 14:16:57 1.1.2.7
@@ -1,12 +1,12 @@
-// $Id: FormValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:46 dims Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.7 2001/04/30 14:16:57 bloritsch Exp
$
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.Tokenizer;
@@ -32,7 +32,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 21:01:46 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:16:57 $
*/
public class FormValidatorAction extends AbstractValidatorAction
{
@@ -82,5 +82,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:46 dims Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.7 2001/04/30 14:16:57 bloritsch Exp
$
// vim: set et ts=4 sw=4:
1.1.2.17 +5 -5
xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- HelloAction.java 2001/04/25 17:05:09 1.1.2.16
+++ HelloAction.java 2001/04/30 14:16:58 1.1.2.17
@@ -8,10 +8,10 @@
package org.apache.cocoon.acting;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -23,7 +23,7 @@
* has been created or not.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:09 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:16:58 $
*/
public class HelloAction extends ComposerAction {
1.1.2.13 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java
Index: LangSelect.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- LangSelect.java 2001/04/25 18:20:34 1.1.2.12
+++ LangSelect.java 2001/04/30 14:16:58 1.1.2.13
@@ -14,7 +14,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.Action;
import org.apache.cocoon.environment.Cookie;
@@ -98,7 +98,7 @@
* </ol>
* @return java.lang.String
* @param objectModel java.util.Map
- * @param par org.apache.avalon.parameter.Parameters
+ * @param par org.apache.avalon.framework.parameter.Parameters
*/
public static String getLang(Map objectModel, Parameters par) {
1.1.2.17 +5 -5
xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- OraAddAction.java 2001/04/25 17:05:11 1.1.2.16
+++ OraAddAction.java 2001/04/30 14:16:58 1.1.2.17
@@ -24,14 +24,14 @@
import oracle.jdbc.OracleResultSet;
import oracle.sql.BLOB;
import oracle.sql.CLOB;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
/**
@@ -39,7 +39,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:11 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:16:58 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
1.1.2.4 +9 -9
xml-cocoon/src/org/apache/cocoon/acting/Attic/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/ResourceExistsAction.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ResourceExistsAction.java 2001/04/25 17:05:11 1.1.2.3
+++ ResourceExistsAction.java 2001/04/30 14:16:59 1.1.2.4
@@ -12,14 +12,14 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -34,7 +34,7 @@
* null otherwise. It has only been tested with context urls.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 17:05:11 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/30 14:16:59 $
*/
public class ResourceExistsAction extends ComposerAction {
1.1.2.7 +4 -4
xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SendmailAction.java 2001/04/23 17:52:07 1.1.2.6
+++ SendmailAction.java 2001/04/30 14:16:59 1.1.2.7
@@ -19,10 +19,10 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.AddressException;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.log.Logger;
1.1.2.8 +5 -5
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionInvalidatorAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- SessionInvalidatorAction.java 2001/04/25 21:01:47 1.1.2.7
+++ SessionInvalidatorAction.java 2001/04/30 14:16:59 1.1.2.8
@@ -1,11 +1,11 @@
-// $Id: SessionInvalidatorAction.java,v 1.1.2.7 2001/04/25 21:01:47 dims Exp
$
+// $Id: SessionInvalidatorAction.java,v 1.1.2.8 2001/04/30 14:16:59
bloritsch Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -17,7 +17,7 @@
* empty map if everything is ok, null otherwise.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 21:01:47 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/30 14:16:59 $
*/
public class SessionInvalidatorAction extends AbstractAction
{
@@ -49,5 +49,5 @@
}
}
-// $Id: SessionInvalidatorAction.java,v 1.1.2.7 2001/04/25 21:01:47 dims Exp
$
+// $Id: SessionInvalidatorAction.java,v 1.1.2.8 2001/04/30 14:16:59
bloritsch Exp $
// vim: set et ts=4 sw=4:
1.1.2.4 +5 -5
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionPropagatorAction.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SessionPropagatorAction.java 2001/04/25 21:01:48 1.1.2.3
+++ SessionPropagatorAction.java 2001/04/30 14:16:59 1.1.2.4
@@ -1,12 +1,12 @@
-// $Id: SessionPropagatorAction.java,v 1.1.2.3 2001/04/25 21:01:48 dims Exp $
+// $Id: SessionPropagatorAction.java,v 1.1.2.4 2001/04/30 14:16:59 bloritsch
Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -27,7 +27,7 @@
* </pre>
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/25 21:01:48 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/30 14:16:59 $
*/
public class SessionPropagatorAction extends ComposerAction
{
@@ -77,6 +77,6 @@
}
}
-// $Id: SessionPropagatorAction.java,v 1.1.2.3 2001/04/25 21:01:48 dims Exp $
+// $Id: SessionPropagatorAction.java,v 1.1.2.4 2001/04/30 14:16:59 bloritsch
Exp $
// vim: set et ts=4 sw=4:
1.1.2.7 +6 -6
xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SessionValidatorAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SessionValidatorAction.java 2001/04/25 21:01:49 1.1.2.6
+++ SessionValidatorAction.java 2001/04/30 14:16:59 1.1.2.7
@@ -1,12 +1,12 @@
-// $Id: SessionValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:49 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.7 2001/04/30 14:16:59 bloritsch
Exp $
package org.apache.cocoon.acting;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -34,7 +34,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 21:01:49 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:16:59 $
*/
public class SessionValidatorAction extends AbstractValidatorAction
{
@@ -85,5 +85,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.1.2.6 2001/04/25 21:01:49 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.7 2001/04/30 14:16:59 bloritsch
Exp $
// vim: set et ts=4 sw=4:
No revision
No revision
1.1.2.3 +2 -2
xml-cocoon/src/org/apache/cocoon/components/browser/Attic/Browser.java
Index: Browser.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/browser/Attic/Browser.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Browser.java 2001/04/20 20:49:48 1.1.2.2
+++ Browser.java 2001/04/30 14:17:02 1.1.2.3
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.browser;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import java.util.HashMap;
import org.w3c.dom.Document;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:49:48 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/30 14:17:02 $
*/
public interface Browser extends Component {
1.1.2.4 +5 -5
xml-cocoon/src/org/apache/cocoon/components/browser/Attic/BrowserImpl.xsl
Index: BrowserImpl.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/browser/Attic/BrowserImpl.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BrowserImpl.xsl 2001/04/25 17:05:23 1.1.2.3
+++ BrowserImpl.xsl 2001/04/30 14:17:02 1.1.2.4
@@ -25,11 +25,11 @@
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.Roles;
import org.apache.cocoon.xml.dom.DOMFactory;
No revision
No revision
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ClassLoaderManager.java 2001/04/25 17:05:26 1.1.2.8
+++ ClassLoaderManager.java 2001/04/30 14:17:03 1.1.2.9
@@ -9,7 +9,7 @@
import java.io.File;
import java.io.IOException;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
* A class loader manager acting as a proxy for a <b>single</b>
@@ -18,7 +18,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.2.8 $ $Date: 2001/04/25 17:05:26 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:03 $
*/
public interface ClassLoaderManager extends Component {
/**
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java
Index: ClassLoaderManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ClassLoaderManagerImpl.java 2001/04/25 17:05:27 1.1.2.9
+++ ClassLoaderManagerImpl.java 2001/04/30 14:17:04 1.1.2.10
@@ -11,14 +11,14 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.util.ClassUtils;
/**
* A singleton-like implementation of <code>ClassLoaderManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:05:27 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:04 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager,
ThreadSafe {
/**
1.1.2.25 +2 -2
xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
Index: RepositoryClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- RepositoryClassLoader.java 2001/04/25 17:05:28 1.1.2.24
+++ RepositoryClassLoader.java 2001/04/30 14:17:04 1.1.2.25
@@ -14,7 +14,7 @@
import java.net.URLClassLoader;
import java.util.Iterator;
import java.util.Vector;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/25 17:05:28 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/30 14:17:04 $
*/
public class RepositoryClassLoader extends URLClassLoader implements
Loggable {
No revision
No revision
1.1.2.9 +3 -3
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java
Index: CompiledComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- CompiledComponent.java 2001/04/25 17:05:31 1.1.2.8
+++ CompiledComponent.java 2001/04/30 14:17:05 1.1.2.9
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.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.2.8 $ $Date: 2001/04/25 17:05:31 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:05 $
*/
public interface CompiledComponent extends Component, Composable, Modifiable
{
}
1.1.2.17 +7 -7
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- GeneratorSelector.java 2001/04/25 17:05:32 1.1.2.16
+++ GeneratorSelector.java 2001/04/30 14:17:05 1.1.2.17
@@ -8,23 +8,23 @@
package org.apache.cocoon.components.language.generator;
import java.io.File;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.DefaultConfiguration;
+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.cocoon.Constants;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.excalibur.component.DefaultComponentSelector;
+import org.apache.avalon.excalibur.component.DefaultComponentSelector;
/**
* This interface is the common base of all Compiled Components. This
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:32 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:17:05 $
*/
public class GeneratorSelector extends DefaultComponentSelector implements
Disposable {
private ClassLoaderManager classManager;
1.1.2.12 +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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ProgramGenerator.java 2001/04/25 17:05:33 1.1.2.11
+++ ProgramGenerator.java 2001/04/30 14:17:05 1.1.2.12
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.generator;
import java.io.File;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.xml.sax.EntityResolver;
/**
@@ -16,7 +16,7 @@
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/25 17:05:33 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/30 14:17:05 $
*/
public interface ProgramGenerator extends Component {
/**
1.1.2.52 +16 -16
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.51
retrieving revision 1.1.2.52
diff -u -r1.1.2.51 -r1.1.2.52
--- ProgramGeneratorImpl.java 2001/04/25 17:05:33 1.1.2.51
+++ ProgramGeneratorImpl.java 2001/04/30 14:17:05 1.1.2.52
@@ -12,21 +12,21 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -47,7 +47,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.51 $ $Date: 2001/04/25 17:05:33 $
+ * @version CVS $Revision: 1.1.2.52 $ $Date: 2001/04/30 14:17:05 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
No revision
No revision
1.1.2.37 +10 -10
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.36
retrieving revision 1.1.2.37
diff -u -r1.1.2.36 -r1.1.2.37
--- AbstractMarkupLanguage.java 2001/04/25 17:05:36 1.1.2.36
+++ AbstractMarkupLanguage.java 2001/04/30 14:17:06 1.1.2.37
@@ -22,15 +22,15 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.Vector;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.store.Store;
@@ -50,7 +50,7 @@
* logicsheets as the only means of code generation. Code generation should
be decoupled from this context!!!
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.36 $ $Date: 2001/04/25 17:05:36 $
+ * @version CVS $Revision: 1.1.2.37 $ $Date: 2001/04/30 14:17:06 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable {
/** The supported language table */
1.1.2.19 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- Logicsheet.java 2001/04/25 17:05:37 1.1.2.18
+++ Logicsheet.java 2001/04/30 14:17:06 1.1.2.19
@@ -22,7 +22,7 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.util.TraxErrorHandler;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -47,7 +47,7 @@
* transformed into an equivalent XSLT stylesheet anyway... This class
should probably be based on an interface...
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:05:37 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/30 14:17:06 $
*/
public class Logicsheet extends AbstractLoggable {
/** The trax TransformerFactory */
1.1.2.17 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/LogicsheetCodeGenerator.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- LogicsheetCodeGenerator.java 2001/04/25 17:05:38 1.1.2.16
+++ LogicsheetCodeGenerator.java 2001/04/30 14:17:06 1.1.2.17
@@ -20,7 +20,7 @@
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.util.TraxErrorHandler;
import org.apache.log.Logger;
import org.xml.sax.ContentHandler;
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:05:38 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:17:06 $
*/
public class LogicsheetCodeGenerator extends AbstractLoggable implements
MarkupCodeGenerator {
1.1.2.11 +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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- MarkupLanguage.java 2001/04/25 17:05:39 1.1.2.10
+++ MarkupLanguage.java 2001/04/30 14:17:07 1.1.2.11
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -19,7 +19,7 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:39 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:07 $
*/
public interface MarkupLanguage extends Component {
/**
No revision
No revision
1.1.2.19 +3 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java
Index: SitemapMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/Attic/SitemapMarkupLanguage.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- SitemapMarkupLanguage.java 2001/04/25 21:01:58 1.1.2.18
+++ SitemapMarkupLanguage.java 2001/04/30 14:17:07 1.1.2.19
@@ -16,8 +16,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
@@ -35,7 +35,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.1.2.18 $ $Date: 2001/04/25 21:01:58 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/30 14:17:07 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.1.2.110 +7 -7
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.109
retrieving revision 1.1.2.110
diff -u -r1.1.2.109 -r1.1.2.110
--- sitemap.xsl 2001/04/27 15:14:20 1.1.2.109
+++ sitemap.xsl 2001/04/30 14:17:08 1.1.2.110
@@ -65,12 +65,12 @@
import java.util.HashMap;
import java.util.Stack;
- import org.apache.avalon.component.Component;
- import org.apache.avalon.configuration.Configurable;
- import org.apache.avalon.configuration.Configuration;
- import org.apache.avalon.configuration.ConfigurationException;
- import org.apache.avalon.configuration.DefaultConfiguration;
- import org.apache.avalon.parameters.Parameters;
+ 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.configuration.DefaultConfiguration;
+ import org.apache.avalon.framework.parameters.Parameters;
import org.apache.regexp.RE;
import org.apache.regexp.REProgram;
@@ -98,7 +98,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo
Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin
Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.1.2.109 2001/04/27 15:14:20
bloritsch Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.110 2001/04/30 14:17:08
bloritsch Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap
{
static final String LOCATION = "<xsl:value-of
select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
No revision
No revision
1.1.2.21 +6 -6
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.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- XSPGenerator.java 2001/04/25 17:05:45 1.1.2.20
+++ XSPGenerator.java 2001/04/30 14:17:09 1.1.2.21
@@ -7,21 +7,21 @@
*****************************************************************************/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
+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.Roles;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.generation.AbstractServerPage;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
/**
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/25 17:05:45 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/30 14:17:09 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Poolable {
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPMarkupLanguage.java
Index: XSPMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPMarkupLanguage.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- XSPMarkupLanguage.java 2001/04/25 17:05:46 1.1.2.14
+++ XSPMarkupLanguage.java 2001/04/30 14:17:09 1.1.2.15
@@ -16,7 +16,7 @@
import java.util.List;
import java.util.Set;
import java.util.Stack;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
import org.apache.cocoon.components.language.markup.LogicsheetCodeGenerator;
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Sahuc</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:05:46 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:09 $
*/
public class XSPMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.1.2.58 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl,v
retrieving revision 1.1.2.57
retrieving revision 1.1.2.58
diff -u -r1.1.2.57 -r1.1.2.58
--- esql.xsl 2001/04/20 20:49:56 1.1.2.57
+++ esql.xsl 2001/04/30 14:17:09 1.1.2.58
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.1.2.57 2001/04/20 20:49:56 bloritsch Exp $-->
+<!-- $Id: esql.xsl,v 1.1.2.58 2001/04/30 14:17:09 bloritsch Exp $-->
<!--
============================================================================
@@ -187,7 +187,7 @@
<xsp:include>org.apache.turbine.util.db.pool.DBConnection</xsp:include>
</xsl:when>
<xsl:when test="$environment = 'cocoon2'">
-
<xsp:include>org.apache.excalibur.datasource.DataSourceComponent</xsp:include>
+
<xsp:include>org.apache.avalon.excalibur.datasource.DataSourceComponent</xsp:include>
</xsl:when>
</xsl:choose>
</xsl:if>
1.1.2.30 +9 -9
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.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- xsp.xsl 2001/04/26 15:45:03 1.1.2.29
+++ xsp.xsl 2001/04/30 14:17:09 1.1.2.30
@@ -12,7 +12,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author <a href="[EMAIL PROTECTED]">Sylvain Wallez</a>
- * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/26 15:45:03 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/30 14:17:09 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -50,14 +50,14 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
- //import org.apache.avalon.*;
- import org.apache.avalon.component.Component;
- import org.apache.avalon.component.ComponentException;
- import org.apache.avalon.component.ComponentManager;
- import org.apache.avalon.component.ComponentSelector;
- import org.apache.avalon.context.Context;
- import org.apache.excalibur.datasource.DataSourceComponent;
- //import org.apache.avalon.util.*;
+ //import org.apache.avalon.framework.*;
+ 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.context.Context;
+ import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+ //import org.apache.avalon.framework.util.*;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
No revision
No revision
1.1.2.16 +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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- AbstractProgrammingLanguage.java 2001/04/25 17:05:52 1.1.2.15
+++ AbstractProgrammingLanguage.java 2001/04/30 14:17:10 1.1.2.16
@@ -8,11 +8,11 @@
package org.apache.cocoon.components.language.programming;
import java.io.File;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.util.ClassUtils;
@@ -22,7 +22,7 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/25 17:05:52 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/30 14:17:10 $
*/
public abstract class AbstractProgrammingLanguage extends AbstractLoggable
implements ProgrammingLanguage, Configurable
1.1.2.21 +6 -6
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.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- CompiledProgrammingLanguage.java 2001/04/25 18:20:35 1.1.2.20
+++ CompiledProgrammingLanguage.java 2001/04/30 14:17:10 1.1.2.21
@@ -8,11 +8,11 @@
package org.apache.cocoon.components.language.programming;
import java.io.File;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.parameters.Parameters;
+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.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.LanguageException;
@@ -23,7 +23,7 @@
* 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.2.20 $ $Date: 2001/04/25 18:20:35 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/30 14:17:10 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- LanguageCompiler.java 2001/04/25 17:05:54 1.1.2.7
+++ LanguageCompiler.java 2001/04/30 14:17:10 1.1.2.8
@@ -10,13 +10,13 @@
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
* 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.2.7 $ $Date: 2001/04/25 17:05:54 $
+ * @version $Revision: 1.1.2.8 $ $Date: 2001/04/30 14:17:10 $
* @since 2.0
*/
public interface LanguageCompiler extends Component {
1.1.2.11 +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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ProgrammingLanguage.java 2001/04/25 17:05:54 1.1.2.10
+++ ProgrammingLanguage.java 2001/04/30 14:17:10 1.1.2.11
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.programming;
import java.io.File;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
@@ -16,7 +16,7 @@
* This interface states the functionality of a programming language
processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:05:54 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:10 $
*/
public interface ProgrammingLanguage extends Component {
/**
No revision
No revision
1.1.2.15 +3 -3
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- AbstractJavaCompiler.java 2001/04/25 21:02:00 1.1.2.14
+++ AbstractJavaCompiler.java 2001/04/30 14:17:10 1.1.2.15
@@ -13,14 +13,14 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.components.language.programming.LanguageCompiler;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.14 $ $Date: 2001/04/25 21:02:00 $
+ * @version $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:10 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler extends AbstractLoggable
implements LanguageCompiler, Recyclable {
1.1.2.30 +9 -9
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.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- JavaLanguage.java 2001/04/25 21:02:01 1.1.2.29
+++ JavaLanguage.java 2001/04/30 14:17:10 1.1.2.30
@@ -11,14 +11,14 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.parameters.Parameters;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
@@ -34,7 +34,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/25 21:02:01 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/30 14:17:10 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Jikes.java 2001/04/27 15:38:21 1.1.2.14
+++ Jikes.java 2001/04/30 14:17:10 1.1.2.15
@@ -17,7 +17,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.components.language.programming.CompilerError;
import org.apache.log.Logger;
@@ -25,7 +25,7 @@
* 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.2.14 $ $Date: 2001/04/27 15:38:21 $
+ * @version $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:10 $
* @since 2.0
*/
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JstyleFormatter.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- JstyleFormatter.java 2001/04/25 21:02:03 1.1.2.9
+++ JstyleFormatter.java 2001/04/30 14:17:10 1.1.2.10
@@ -14,7 +14,7 @@
import java.io.UnsupportedEncodingException;
import jstyle.JSBeautifier;
import jstyle.JSFormatter;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.components.language.programming.CodeFormatter;
import org.apache.log.Logger;
@@ -24,7 +24,7 @@
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 21:02:03 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:10 $
*/
public class JstyleFormatter extends AbstractLoggable implements
CodeFormatter {
/**
No revision
No revision
1.1.2.9 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java
Index: JavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/javascript/Attic/JavascriptLanguage.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- JavascriptLanguage.java 2001/04/25 21:02:08 1.1.2.8
+++ JavascriptLanguage.java 2001/04/30 14:17:11 1.1.2.9
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.programming.javascript;
import java.io.File;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.components.language.LanguageException;
import
org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
import org.apache.cocoon.components.language.programming.java.JavaLanguage;
@@ -19,7 +19,7 @@
* The compiled Javascript (Rhino) programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 21:02:08 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:11 $
*/
public class JavascriptLanguage extends JavaLanguage
{
No revision
No revision
1.1.2.15 +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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Parser.java 2001/04/25 17:06:12 1.1.2.14
+++ Parser.java 2001/04/30 14:17:11 1.1.2.15
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.parser;
import java.io.IOException;
-import org.apache.avalon.component.Component;
+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;
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:06:12 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:11 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
No revision
No revision
1.1.2.11 +8 -8
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractEventPipeline.java 2001/04/27 15:14:25 1.1.2.10
+++ AbstractEventPipeline.java 2001/04/30 14:17:12 1.1.2.11
@@ -10,13 +10,13 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.Roles;
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED] Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/27 15:14:25 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:12 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
1.1.2.7 +9 -9
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java
Index: AbstractStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractStreamPipeline.java 2001/04/25 17:06:17 1.1.2.6
+++ AbstractStreamPipeline.java 2001/04/30 14:17:12 1.1.2.7
@@ -9,14 +9,14 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Environment;
@@ -35,7 +35,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:17 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:12 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable
implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
1.1.2.12 +7 -7
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- CachingEventPipeline.java 2001/04/27 15:14:26 1.1.2.11
+++ CachingEventPipeline.java 2001/04/30 14:17:12 1.1.2.12
@@ -12,12 +12,12 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Processor;
import org.apache.cocoon.Roles;
@@ -52,7 +52,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.1.2.11 $ $Date: 2001/04/27 15:14:26 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/30 14:17:12 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
1.1.2.8 +5 -5
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- CachingStreamPipeline.java 2001/04/25 17:06:20 1.1.2.7
+++ CachingStreamPipeline.java 2001/04/30 14:17:12 1.1.2.8
@@ -12,10 +12,10 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.caching.CacheValidity;
@@ -44,7 +44,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:06:20 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/30 14:17:12 $
*/
public final class CachingStreamPipeline extends AbstractStreamPipeline {
1.1.2.8 +5 -5
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- EventPipeline.java 2001/04/27 15:14:28 1.1.2.7
+++ EventPipeline.java 2001/04/30 14:17:12 1.1.2.8
@@ -7,18 +7,18 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Processor;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.Sitemap;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/27 15:14:28 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/30 14:17:12 $
*/
public interface EventPipeline extends Component, Composable, Recyclable,
Processor {
public void setGenerator (String role, String source, Parameters param,
Exception e) throws Exception;
1.1.2.7 +6 -6
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingEventPipeline.java
Index: NonCachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/NonCachingEventPipeline.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- NonCachingEventPipeline.java 2001/04/25 17:06:22 1.1.2.6
+++ NonCachingEventPipeline.java 2001/04/30 14:17:12 1.1.2.7
@@ -10,11 +10,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Processor;
import org.apache.cocoon.Roles;
@@ -31,7 +31,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:06:22 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:12 $
*/
public class NonCachingEventPipeline extends AbstractEventPipeline {
1.1.2.4 +5 -5
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/StreamPipeline.java
Index: StreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/StreamPipeline.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- StreamPipeline.java 2001/04/25 17:06:23 1.1.2.3
+++ StreamPipeline.java 2001/04/30 14:17:12 1.1.2.4
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Processor;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
/** A <CODE>StreamPipeline</CODE> either
* <UL>
@@ -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.1.2.3 $ $Date: 2001/04/25 17:06:23 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/30 14:17:12 $
*/
public interface StreamPipeline extends Component, Composable, Recyclable,
Processor {
No revision
No revision
1.1.2.6 +3 -3
xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamCompiler.java
Index: XMLByteStreamCompiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamCompiler.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XMLByteStreamCompiler.java 2001/04/25 17:06:30 1.1.2.5
+++ XMLByteStreamCompiler.java 2001/04/30 14:17:13 1.1.2.6
@@ -8,8 +8,8 @@
package org.apache.cocoon.components.sax;
import java.util.HashMap;
-import org.apache.avalon.component.Component;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:06:30 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:13 $
*/
public final class XMLByteStreamCompiler
1.1.2.6 +3 -3
xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLByteStreamInterpreter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XMLByteStreamInterpreter.java 2001/04/25 18:20:36 1.1.2.5
+++ XMLByteStreamInterpreter.java 2001/04/30 14:17:13 1.1.2.6
@@ -8,9 +8,9 @@
package org.apache.cocoon.components.sax;
import java.util.ArrayList;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.xml.AbstractXMLProducer;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 18:20:36 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:13 $
*/
public final class XMLByteStreamInterpreter
1.1.2.5 +2 -2
xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLTeePipe.java
Index: XMLTeePipe.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/sax/Attic/XMLTeePipe.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLTeePipe.java 2001/04/25 18:20:36 1.1.2.4
+++ XMLTeePipe.java 2001/04/30 14:17:13 1.1.2.5
@@ -10,7 +10,7 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLPipe;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -23,7 +23,7 @@
* The incoming events are forwarded to two other components.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/25 18:20:36 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/30 14:17:13 $
*/
public final class XMLTeePipe
No revision
No revision
1.1.2.9 +3 -3
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java
Index: NullSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- NullSAXConnector.java 2001/04/27 15:14:34 1.1.2.8
+++ NullSAXConnector.java 2001/04/30 14:17:14 1.1.2.9
@@ -9,18 +9,18 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
/**
* Null implementation of the SAXConnector. Simply sends events on to the
next component in the pipeline.
* @author <a href="[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/27 15:14:34 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:14 $
*/
public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
/** Set the sitemap
1.1.2.9 +2 -2
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- SAXConnector.java 2001/04/27 15:14:36 1.1.2.8
+++ SAXConnector.java 2001/04/30 14:17:15 1.1.2.9
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.saxconnector;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLPipe;
@@ -16,7 +16,7 @@
/**
* Provides a connection between SAX components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/27 15:14:36 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:15 $
*/
public interface SAXConnector extends XMLPipe, Component,
SitemapModelComponent {
/**
1.1.2.11 +8 -8
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java
Index: XIncludeSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- XIncludeSAXConnector.java 2001/04/27 15:14:37 1.1.2.10
+++ XIncludeSAXConnector.java 2001/04/30 14:17:15 1.1.2.11
@@ -13,12 +13,12 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.Stack;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.components.pipeline.EventPipeline;
@@ -29,7 +29,7 @@
import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.Locator;
@@ -40,7 +40,7 @@
/**
* Copy of code from XIncludeTransformer as a starting point for
XIncludeSAXConnector.
* @author <a href="[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/27 15:14:37 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:15 $
*/
public class XIncludeSAXConnector extends AbstractXMLPipe implements
Composable, Recyclable, SAXConnector, Disposable {
No revision
No revision
1.1.2.17 +5 -5
xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/FilesystemStore.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- FilesystemStore.java 2001/04/25 17:06:45 1.1.2.16
+++ FilesystemStore.java 2001/04/30 14:17:16 1.1.2.17
@@ -10,11 +10,11 @@
import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.thread.ThreadSafe;
+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;
1.1.2.4 +6 -6
xml-cocoon/src/org/apache/cocoon/components/store/Attic/MRUMemoryStore.java
Index: MRUMemoryStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/MRUMemoryStore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MRUMemoryStore.java 2001/04/25 17:06:46 1.1.2.3
+++ MRUMemoryStore.java 2001/04/30 14:17:16 1.1.2.4
@@ -12,12 +12,12 @@
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.parameters.Parameters;
-import org.apache.avalon.thread.ThreadSafe;
+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.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
/**
* This class provides a cache algorithm for the requested documents.
1.1.2.7 +3 -3
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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- MemoryStore.java 2001/04/20 20:50:03 1.1.2.6
+++ MemoryStore.java 2001/04/30 14:17:16 1.1.2.7
@@ -9,8 +9,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.thread.ThreadSafe;
/**
*
@@ -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.2.6 $ $Date: 2001/04/20 20:50:03 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:16 $
*/
public class MemoryStore implements Store, ThreadSafe {
/* WARNING: Hashtable is threadsafe, whereas HashMap is not.
1.1.2.11 +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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- Store.java 2001/04/25 17:06:47 1.1.2.10
+++ Store.java 2001/04/30 14:17:16 1.1.2.11
@@ -9,7 +9,7 @@
import java.io.IOException;
import java.util.Enumeration;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
*
@@ -19,7 +19,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/25 17:06:47 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:16 $
*/
public interface Store extends Component {
No revision
No revision
1.1.2.9 +6 -6
xml-cocoon/src/org/apache/cocoon/components/url/Attic/ContextURLFactory.java
Index: ContextURLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/ContextURLFactory.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ContextURLFactory.java 2001/04/25 17:06:53 1.1.2.8
+++ ContextURLFactory.java 2001/04/30 14:17:18 1.1.2.9
@@ -9,22 +9,22 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
+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;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ContextURLFactory.java,v 1.1.2.8 2001/04/25 17:06:53
donaldp Exp $
+ * @version $Id: ContextURLFactory.java,v 1.1.2.9 2001/04/30 14:17:18
bloritsch Exp $
*/
public class ContextURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
/**
* The context
*/
- protected org.apache.avalon.context.Context context;
+ protected org.apache.avalon.framework.context.Context context;
/**
* Create a URL from a location. This method supports the
@@ -62,7 +62,7 @@
/**
* Get the context
*/
- public void contextualize(org.apache.avalon.context.Context context)
throws ContextException {
+ public void contextualize(org.apache.avalon.framework.context.Context
context) throws ContextException {
if (this.context == null) {
this.context = context;
}
1.1.2.6 +5 -5
xml-cocoon/src/org/apache/cocoon/components/url/Attic/ResourceURLFactory.java
Index: ResourceURLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/ResourceURLFactory.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ResourceURLFactory.java 2001/04/25 17:06:54 1.1.2.5
+++ ResourceURLFactory.java 2001/04/30 14:17:18 1.1.2.6
@@ -9,15 +9,15 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
+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;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ResourceURLFactory.java,v 1.1.2.5 2001/04/25 17:06:54
donaldp Exp $
+ * @version $Id: ResourceURLFactory.java,v 1.1.2.6 2001/04/30 14:17:18
bloritsch Exp $
*/
public class ResourceURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.1.2.4 +2 -2
xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactory.java
Index: URLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactory.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- URLFactory.java 2001/04/25 17:06:54 1.1.2.3
+++ URLFactory.java 2001/04/30 14:17:18 1.1.2.4
@@ -9,11 +9,11 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.thread.ThreadSafe;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactory.java,v 1.1.2.3 2001/04/25 17:06:54 donaldp Exp $
+ * @version $Id: URLFactory.java,v 1.1.2.4 2001/04/30 14:17:18 bloritsch Exp
$
*/
public interface URLFactory extends ThreadSafe {
1.1.2.10 +10 -10
xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- URLFactoryImpl.java 2001/04/25 17:06:55 1.1.2.9
+++ URLFactoryImpl.java 2001/04/30 14:17:18 1.1.2.10
@@ -13,21 +13,21 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
+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.util.ClassUtils;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.1.2.9 2001/04/25 17:06:55 donaldp
Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.1.2.10 2001/04/30 14:17:18
bloritsch Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
No revision
No revision
1.1.2.18 +1 -1
xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- AbstractEnvironment.java 2001/04/25 17:06:59 1.1.2.17
+++ AbstractEnvironment.java 2001/04/30 14:17:19 1.1.2.18
@@ -14,7 +14,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.environment.Environment;
import org.apache.log.LogKit;
import org.xml.sax.InputSource;
No revision
No revision
1.1.2.14 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- AbstractGenerator.java 2001/04/25 17:07:34 1.1.2.13
+++ AbstractGenerator.java 2001/04/30 14:17:20 1.1.2.14
@@ -9,7 +9,7 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.xml.sax.EntityResolver;
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/25 17:07:34 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/30 14:17:20 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.1.2.7 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/ComposerGenerator.java
Index: ComposerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ComposerGenerator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ComposerGenerator.java 2001/04/20 20:50:06 1.1.2.6
+++ ComposerGenerator.java 2001/04/30 14:17:21 1.1.2.7
@@ -7,15 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.Cocoon;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:06 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:21 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composable {
1.1.2.25 +4 -4
xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- DirectoryGenerator.java 2001/04/25 17:07:37 1.1.2.24
+++ DirectoryGenerator.java 2001/04/30 14:17:21 1.1.2.25
@@ -15,13 +15,13 @@
import java.util.Date;
import java.util.Map;
import java.util.Stack;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.xml.sax.EntityResolver;
@@ -64,7 +64,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Conny Krappatsch</a>
* (SMB GmbH) for Virbus AG
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/25 17:07:37 $ */
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/30 14:17:21 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Poolable {
1.1.2.32 +6 -6
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- FileGenerator.java 2001/04/25 17:07:37 1.1.2.31
+++ FileGenerator.java 2001/04/30 14:17:21 1.1.2.32
@@ -10,10 +10,10 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
@@ -22,7 +22,7 @@
import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.util.HashUtil;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -37,7 +37,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.1.2.31 $ $Date: 2001/04/25 17:07:37 $
+ * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/04/30 14:17:21 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable {
1.1.2.14 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java
Index: FragmentExtractorGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FragmentExtractorGenerator.java 2001/04/25 17:07:39 1.1.2.13
+++ FragmentExtractorGenerator.java 2001/04/30 14:17:21 1.1.2.14
@@ -12,7 +12,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -23,7 +23,7 @@
import org.apache.cocoon.generation.AbstractGenerator;
import org.apache.cocoon.util.HashUtil;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -38,7 +38,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.1.2.13 $ $Date: 2001/04/25 17:07:39 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/30 14:17:21 $
*/
public class FragmentExtractorGenerator extends AbstractGenerator
implements Poolable, Cacheable {
1.1.2.19 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- HTMLGenerator.java 2001/04/25 17:07:41 1.1.2.18
+++ HTMLGenerator.java 2001/04/30 14:17:22 1.1.2.19
@@ -13,21 +13,21 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URL;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.w3c.tidy.Tidy;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:07:41 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/30 14:17:22 $
*/
public class HTMLGenerator extends ComposerGenerator implements Poolable {
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ImageDirectoryGenerator.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ImageDirectoryGenerator.java 2001/04/25 21:02:12 1.1.2.10
+++ ImageDirectoryGenerator.java 2001/04/30 14:17:22 1.1.2.11
@@ -12,7 +12,7 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.LogKit;
import org.apache.log.Logger;
import org.xml.sax.SAXException;
@@ -23,7 +23,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
- * @version $Revision: 1.1.2.10 $ $Date: 2001/04/25 21:02:12 $
+ * @version $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:22 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
1.1.2.2 +17 -17
xml-cocoon/src/org/apache/cocoon/generation/Attic/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/JspGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JspGenerator.java 2001/04/26 17:53:34 1.1.2.1
+++ JspGenerator.java 2001/04/30 14:17:22 1.1.2.2
@@ -28,16 +28,16 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -49,7 +49,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/26 17:53:34 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/30 14:17:22 $
*/
public class JspGenerator extends ServletGenerator implements Poolable {
@@ -155,10 +155,10 @@
public boolean isRequestedSessionIdFromCookie(){ return
request.isRequestedSessionIdFromCookie(); }
public boolean isRequestedSessionIdFromURL(){ return
request.isRequestedSessionIdFromURL(); }
public boolean isRequestedSessionIdFromUrl(){ return
request.isRequestedSessionIdFromUrl(); }
- public Object getAttribute(String s){
+ public Object getAttribute(String s){
if(s != null && s.equals(INC_SERVLET_PATH))
return jspFile;
- return request.getAttribute(s);
+ return request.getAttribute(s);
}
public Enumeration getAttributeNames(){ return
request.getAttributeNames(); }
public String getCharacterEncoding(){ return
request.getCharacterEncoding(); }
@@ -184,7 +184,7 @@
public RequestDispatcher getRequestDispatcher(String s){ return
request.getRequestDispatcher(s); }
public String getRealPath(String s){ return request.getRealPath(s); }
}
-
+
/**
* Stub implementation of HttpServletResponse
*/
@@ -200,8 +200,8 @@
public int getBufferSize() { return 1024; }
public String getCharacterEncoding() { return
this.response.getCharacterEncoding();}
public Locale getLocale(){ return this.response.getLocale();}
- public PrintWriter getWriter() {
- return new PrintWriter(this.output);
+ public PrintWriter getWriter() {
+ return new PrintWriter(this.output);
}
public boolean isCommitted() { return false; }
public void reset() {}
@@ -209,8 +209,8 @@
public void setContentLength(int len) {}
public void setContentType(java.lang.String type) {}
public void setLocale(java.util.Locale loc) {}
- public ServletOutputStream getOutputStream() {
- return this.output;
+ public ServletOutputStream getOutputStream() {
+ return this.output;
}
public void addCookie(Cookie cookie){ response.addCookie(cookie); }
public boolean containsHeader(String s){ return
response.containsHeader(s); }
@@ -238,18 +238,18 @@
* Stub implementation of ServletOutputStream
*/
class MyServletOutputStream extends ServletOutputStream {
- OutputStream output;
+ OutputStream output;
public MyServletOutputStream(OutputStream output) {
this.output = output;
}
- public void write(byte[] b) throws java.io.IOException {
- output.write(b);
+ public void write(byte[] b) throws java.io.IOException {
+ output.write(b);
}
public void write(byte[] b, int off, int len) throws
java.io.IOException {
- output.write(b,off,len);
+ output.write(b,off,len);
}
public void write(int b) throws java.io.IOException {
- output.write(b);
+ output.write(b);
}
}
}
1.1.2.23 +5 -5
xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- PhpGenerator.java 2001/04/25 21:18:13 1.1.2.22
+++ PhpGenerator.java 2001/04/30 14:17:23 1.1.2.23
@@ -19,16 +19,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.php.servlet;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -40,7 +40,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/25 21:18:13 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/30 14:17:23 $
*/
public class PhpGenerator extends ServletGenerator implements Poolable {
1.1.2.14 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- RequestGenerator.java 2001/04/25 17:07:44 1.1.2.13
+++ RequestGenerator.java 2001/04/30 14:17:23 1.1.2.14
@@ -11,7 +11,7 @@
import java.util.Iterator;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -20,7 +20,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.1.2.13 $ $Date: 2001/04/25 17:07:44 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/30 14:17:23 $
*/
public class RequestGenerator extends ServletGenerator implements Poolable {
1.1.2.6 +5 -5
xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ScriptGenerator.java 2001/04/25 17:07:45 1.1.2.5
+++ ScriptGenerator.java 2001/04/30 14:17:23 1.1.2.6
@@ -15,10 +15,10 @@
import java.io.FileReader;
import java.io.Reader;
import java.io.StringReader;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+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.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
@@ -30,7 +30,7 @@
* and additional interpreter (Rhino, Jython, etc.) as a Cocoon Generator
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason Foster</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:07:45 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:23 $
*/
public class ScriptGenerator extends ComposerGenerator {
1.1.2.27 +7 -7
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- ServerPagesGenerator.java 2001/04/25 17:07:47 1.1.2.26
+++ ServerPagesGenerator.java 2001/04/30 14:17:24 1.1.2.27
@@ -12,10 +12,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.LinkedList;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
+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.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
@@ -23,8 +23,8 @@
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.excalibur.pool.Poolable;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
@@ -38,7 +38,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/25 17:07:47 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/30 14:17:24 $
*/
public class ServerPagesGenerator
extends ServletGenerator
1.1.2.17 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- ServletGenerator.java 2001/04/25 17:07:48 1.1.2.16
+++ ServletGenerator.java 2001/04/30 14:17:24 1.1.2.17
@@ -9,8 +9,8 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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;
@@ -22,7 +22,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:07:48 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:17:24 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composable {
1.1.2.13 +2 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- StatusGenerator.java 2001/04/25 17:07:49 1.1.2.12
+++ StatusGenerator.java 2001/04/30 14:17:24 1.1.2.13
@@ -16,7 +16,7 @@
import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -48,7 +48,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.1.2.12 $ $Date: 2001/04/25 17:07:49 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/30 14:17:24 $
*/
public class StatusGenerator extends ComposerGenerator implements Poolable {
1.1.2.6 +4 -4
xml-cocoon/src/org/apache/cocoon/generation/Attic/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/VelocityGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- VelocityGenerator.java 2001/04/25 17:07:50 1.1.2.5
+++ VelocityGenerator.java 2001/04/30 14:17:24 1.1.2.6
@@ -12,13 +12,13 @@
import java.io.StringWriter;
import java.net.URL;
import java.util.Properties;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.xml.sax.InputSource;
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:07:50 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:24 $
*/
public class VelocityGenerator extends ServletGenerator implements Poolable {
No revision
No revision
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java
Index: BrowserMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- BrowserMatcherFactory.java 2001/04/25 17:08:02 1.1.2.14
+++ BrowserMatcherFactory.java 2001/04/30 14:17:29 1.1.2.15
@@ -8,7 +8,7 @@
package org.apache.cocoon.matching;
import java.util.Stack;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.xerces.dom.TreeWalkerImpl;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/25 17:08:02 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:29 $
*/
public class BrowserMatcherFactory implements org.apache.cocoon.CodeFactory {
1.1.2.2 +28 -28
xml-cocoon/src/org/apache/cocoon/matching/Attic/FileAuthenticationMatcher.java.new
Index: FileAuthenticationMatcher.java.new
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/FileAuthenticationMatcher.java.new,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.new 2000/09/27 16:07:23 1.1.2.1
+++ FileAuthenticationMatcher.java.new 2001/04/30 14:17:29 1.1.2.2
@@ -5,43 +5,43 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.utils.Parameters;
+import org.apache.avalon.framework.Configurable;
+import org.apache.avalon.framework.Configuration;
+import org.apache.avalon.framework.ConfigurationException;
+import org.apache.avalon.framework.utils.Parameters;
public class FileAuthenticationMatcher extends AuthenticationMatcher
implements Configurable {
- private Hashtable users = new Hashtable();
+ private Hashtable users = new Hashtable();
- public void setConfiguration(Configuration conf) throws
ConfigurationException {
- Enumeration params = conf.getConfigurations("param");
- while (params.hasMoreElements()) {
- Configuration param =
(Configuration)params.nextElement();
- String name = param.getAttribute("name");
- String value = param.getAttribute("value");
- if (!name.equals("src")) {
+ public void setConfiguration(Configuration conf) throws
ConfigurationException {
+ Enumeration params = conf.getConfigurations("param");
+ while (params.hasMoreElements()) {
+ Configuration param = (Configuration)params.nextElement();
+ String name = param.getAttribute("name");
+ String value = param.getAttribute("value");
+ if (!name.equals("src")) {
*/ /** load the file indicated by value (relative
to what?)
- fill hashtable with users/passwords
(plaintext for now)
- **/
+ fill hashtable with users/passwords (plaintext for now)
+ **/
/* }
- }
- }
+ }
+ }
- public List match(String pattern, Environment environment) {
+ public List match(String pattern, Environment environment) {
return new ArrayList();
+ }
+ public boolean match(String user, String password) {
+ if (user == null || password == null) {
+ return false;
+ }
+ String value = (String)users.get(user);
+ if (value == null || !value.equals(password)) {
+ return false;
+ } else {
+ return true;
}
- public boolean match(String user, String password) {
- if (user == null || password == null) {
- return false;
- }
- String value = (String)users.get(user);
- if (value == null || !value.equals(password)) {
- return false;
- } else {
- return true;
- }
- }
+ }
public void setup (Environment environment, String src, Parameters param)
{
}
1.1.2.12 +2 -2
xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java
Index: Matcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- Matcher.java 2001/04/25 17:08:03 1.1.2.11
+++ Matcher.java 2001/04/30 14:17:29 1.1.2.12
@@ -8,12 +8,12 @@
package org.apache.cocoon.matching;
import java.util.Map;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/25 17:08:03 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/30 14:17:29 $
*/
public interface Matcher extends Component {
/**
1.1.2.16 +3 -3
xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- RegexpTargetHostMatcherFactory.java 2001/04/25 17:08:04 1.1.2.15
+++ RegexpTargetHostMatcherFactory.java 2001/04/30 14:17:29 1.1.2.16
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+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;
@@ -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.2.15 $ $Date: 2001/04/25 17:08:04 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/30 14:17:29 $
*/
public class RegexpTargetHostMatcherFactory extends AbstractLoggable
implements CodeFactory {
1.1.2.28 +3 -3
xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- RegexpURIMatcherFactory.java 2001/04/25 17:08:05 1.1.2.27
+++ RegexpURIMatcherFactory.java 2001/04/30 14:17:30 1.1.2.28
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+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;
@@ -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.2.27 $ $Date: 2001/04/25 17:08:05 $
+ * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/30 14:17:30 $
*/
public class RegexpURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
1.1.2.36 +3 -3
xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- WildcardURIMatcherFactory.java 2001/04/25 17:08:05 1.1.2.35
+++ WildcardURIMatcherFactory.java 2001/04/30 14:17:30 1.1.2.36
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.matching;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+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.1.2.35 $ $Date: 2001/04/25 17:08:05 $
+ * @version CVS $Revision: 1.1.2.36 $ $Date: 2001/04/30 14:17:30 $
*/
public class WildcardURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
No revision
No revision
1.1.2.19 +4 -4
xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- AbstractReader.java 2001/04/25 17:08:13 1.1.2.18
+++ AbstractReader.java 2001/04/30 14:17:33 1.1.2.19
@@ -11,17 +11,17 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/25 17:08:13 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/30 14:17:33 $
*/
public abstract class AbstractReader extends AbstractLoggable implements
Reader, Recyclable {
/** The current <code>EntityResolver</code>. */
1.1.2.15 +10 -10
xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- DatabaseReader.java 2001/04/25 17:08:14 1.1.2.14
+++ DatabaseReader.java 2001/04/30 14:17:33 1.1.2.15
@@ -17,22 +17,22 @@
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.Date;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
-import org.apache.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.xml.sax.SAXException;
/**
1.1.2.32 +6 -6
xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- ResourceReader.java 2001/04/25 17:08:15 1.1.2.31
+++ ResourceReader.java 2001/04/30 14:17:33 1.1.2.32
@@ -19,11 +19,11 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -42,7 +42,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/25 17:08:15 $
+ * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/04/30 14:17:33 $
*
* 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.19 +2 -2
xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java
Index: BrowserSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- BrowserSelectorFactory.java 2001/04/25 17:08:18 1.1.2.18
+++ BrowserSelectorFactory.java 2001/04/30 14:17:34 1.1.2.19
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.CodeFactory;
import org.apache.xerces.dom.TreeWalkerImpl;
import org.w3c.dom.NamedNodeMap;
@@ -23,7 +23,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.2.18 $ $Date: 2001/04/25 17:08:18 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/30 14:17:34 $
*/
1.1.2.11 +2 -2
xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java
Index: CodedSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- CodedSelectorFactory.java 2001/04/25 17:08:19 1.1.2.10
+++ CodedSelectorFactory.java 2001/04/30 14:17:35 1.1.2.11
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.configuration.ConfigurationException;
+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.2.10 $ $Date: 2001/04/25 17:08:19 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:35 $
*/
public class CodedSelectorFactory extends java.lang.Object
implements CodeFactory {
1.1.2.6 +2 -2
xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java
Index: HostSelectorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HostSelectorFactory.java 2001/04/25 17:08:19 1.1.2.5
+++ HostSelectorFactory.java 2001/04/30 14:17:35 1.1.2.6
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.CodeFactory;
import org.apache.xerces.dom.TreeWalkerImpl;
import org.w3c.dom.NamedNodeMap;
@@ -35,7 +35,7 @@
* </map:select>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Colin Britton</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:08:19 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:35 $
*/
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java
Index: Selector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Selector.java 2001/04/25 17:08:20 1.1.2.9
+++ Selector.java 2001/04/30 14:17:35 1.1.2.10
@@ -8,12 +8,12 @@
package org.apache.cocoon.selection;
import java.util.Map;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:08:20 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:35 $
*/
public interface Selector extends Component {
/**
No revision
No revision
1.1.2.15 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- AbstractSerializer.java 2001/04/25 17:08:25 1.1.2.14
+++ AbstractSerializer.java 2001/04/30 14:17:37 1.1.2.15
@@ -11,13 +11,13 @@
import java.io.BufferedOutputStream;
import java.io.OutputStream;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
/**
* @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.1.2.14 $ $Date: 2001/04/25 17:08:25 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/30 14:17:37 $
*/
public abstract class AbstractSerializer extends AbstractXMLPipe implements
Serializer, Recyclable {
1.1.2.14 +4 -4
xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- AbstractTextSerializer.java 2001/04/25 17:08:26 1.1.2.13
+++ AbstractTextSerializer.java 2001/04/30 14:17:37 1.1.2.14
@@ -12,9 +12,9 @@
import javax.xml.transform.OutputKeys;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
@@ -24,7 +24,7 @@
* @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.1.2.13 $ $Date: 2001/04/25 17:08:26 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/30 14:17:37 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer
implements Configurable, Cacheable {
1.1.2.18 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- FOPSerializer.java 2001/04/25 17:08:27 1.1.2.17
+++ FOPSerializer.java 2001/04/30 14:17:38 1.1.2.18
@@ -14,7 +14,7 @@
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Version;
@@ -31,7 +31,7 @@
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:08:27 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/30 14:17:38 $
*
*/
public class FOPSerializer extends AbstractSerializer
1.1.2.22 +4 -4
xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- HTMLSerializer.java 2001/04/25 17:08:28 1.1.2.21
+++ HTMLSerializer.java 2001/04/30 14:17:38 1.1.2.22
@@ -12,13 +12,13 @@
import javax.xml.transform.OutputKeys;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.excalibur.pool.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/25 17:08:28 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/30 14:17:38 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java
Index: LinkSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- LinkSerializer.java 2001/04/25 17:08:29 1.1.2.9
+++ LinkSerializer.java 2001/04/30 14:17:38 1.1.2.10
@@ -13,13 +13,13 @@
import java.io.PrintStream;
import org.apache.cocoon.Constants;
import org.apache.cocoon.xml.xlink.ExtendedXLinkPipe;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:08:29 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:38 $
*/
public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
1.1.2.36 +7 -7
xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- SVGSerializer.java 2001/04/25 21:02:16 1.1.2.35
+++ SVGSerializer.java 2001/04/30 14:17:38 1.1.2.36
@@ -12,11 +12,11 @@
import java.io.BufferedOutputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+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;
@@ -30,7 +30,7 @@
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.dom.SVGBuilder;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
@@ -42,7 +42,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.1.2.35 $ $Date: 2001/04/25 21:02:16 $
+ * @version CVS $Revision: 1.1.2.36 $ $Date: 2001/04/30 14:17:38 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable
{
1.1.2.17 +4 -4
xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- TextSerializer.java 2001/04/25 17:08:30 1.1.2.16
+++ TextSerializer.java 2001/04/30 14:17:39 1.1.2.17
@@ -12,13 +12,13 @@
import javax.xml.transform.OutputKeys;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.excalibur.pool.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/25 17:08:30 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/30 14:17:39 $
*/
public class TextSerializer extends AbstractTextSerializer implements
Poolable {
1.1.2.22 +4 -4
xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- XMLSerializer.java 2001/04/25 17:08:30 1.1.2.21
+++ XMLSerializer.java 2001/04/30 14:17:39 1.1.2.22
@@ -12,13 +12,13 @@
import javax.xml.transform.OutputKeys;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.excalibur.pool.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/25 17:08:30 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/30 14:17:39 $
*/
public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
No revision
No revision
1.1.4.91 +4 -4
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.90
retrieving revision 1.1.4.91
diff -u -r1.1.4.90 -r1.1.4.91
--- CocoonServlet.java 2001/04/27 14:57:49 1.1.4.90
+++ CocoonServlet.java 2001/04/30 14:17:41 1.1.4.91
@@ -22,9 +22,9 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.DefaultContext;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Notification;
@@ -56,7 +56,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.90 $ $Date: 2001/04/27 14:57:49 $
+ * @version CVS $Revision: 1.1.4.91 $ $Date: 2001/04/30 14:17:41 $
*/
public class CocoonServlet extends HttpServlet {
1.1.2.9 +2 -2
xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java
Index: ParanoidCocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/ParanoidCocoonServlet.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ParanoidCocoonServlet.java 2001/04/25 17:08:37 1.1.2.8
+++ ParanoidCocoonServlet.java 2001/04/30 14:17:41 1.1.2.9
@@ -15,7 +15,7 @@
import java.util.Date;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.avalon.context.ContextException;
+import org.apache.avalon.framework.context.ContextException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
import org.apache.cocoon.util.IOUtils;
@@ -29,7 +29,7 @@
* of it.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/25 17:08:37 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/30 14:17:41 $
*/
public class ParanoidCocoonServlet extends CocoonServlet {
No revision
No revision
1.1.2.39 +15 -15
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -r1.1.2.38 -r1.1.2.39
--- AbstractSitemap.java 2001/04/25 17:08:41 1.1.2.38
+++ AbstractSitemap.java 2001/04/30 14:17:42 1.1.2.39
@@ -14,19 +14,19 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.thread.ThreadSafe;
+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.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.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.Processor;
import org.apache.cocoon.Roles;
@@ -37,14 +37,14 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.excalibur.component.DefaultComponentSelector;
+import org.apache.avalon.excalibur.component.DefaultComponentSelector;
import org.xml.sax.SAXException;
/**
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.38 $ $Date: 2001/04/25 17:08:41 $
+ * @version CVS $Revision: 1.1.2.39 $ $Date: 2001/04/30 14:17:42 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable, ThreadSafe {
private Context context;
1.1.2.10 +6 -6
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ContentAggregator.java 2001/04/25 17:08:43 1.1.2.9
+++ ContentAggregator.java 2001/04/30 14:17:42 1.1.2.10
@@ -11,11 +11,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.caching.CacheValidity;
@@ -38,7 +38,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Id: ContentAggregator.java,v 1.1.2.9 2001/04/25 17:08:43
donaldp Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.1.2.10 2001/04/30 14:17:42
bloritsch Exp $
*/
public class ContentAggregator extends ContentHandlerWrapper
1.1.2.7 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java
Index: ErrorNotifier.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ErrorNotifier.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ErrorNotifier.java 2001/04/25 17:08:43 1.1.2.6
+++ ErrorNotifier.java 2001/04/30 14:17:42 1.1.2.7
@@ -9,7 +9,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Notification;
import org.apache.cocoon.Notifier;
import org.apache.cocoon.generation.ComposerGenerator;
@@ -22,7 +22,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.1.2.6 $ $Date: 2001/04/25 17:08:43 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:42 $
*/
public class ErrorNotifier extends ComposerGenerator {
1.1.2.31 +11 -11
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- Handler.java 2001/04/25 17:08:44 1.1.2.30
+++ Handler.java 2001/04/30 14:17:42 1.1.2.31
@@ -11,16 +11,16 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.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.Roles;
@@ -38,7 +38,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/25 17:08:44 $
+ * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/30 14:17:42 $
*/
public class Handler extends AbstractLoggable implements Runnable,
Configurable, Composable, Contextualizable, Processor, Disposable {
private Context context;
1.1.2.18 +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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- LinkTranslator.java 2001/04/25 17:08:45 1.1.2.17
+++ LinkTranslator.java 2001/04/30 14:17:43 1.1.2.18
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.transformation.Transformer;
@@ -22,7 +22,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/25 17:08:45 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/30 14:17:43 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
1.1.2.20 +11 -11
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
Index: Manager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- Manager.java 2001/04/26 21:12:09 1.1.2.19
+++ Manager.java 2001/04/30 14:17:43 1.1.2.20
@@ -12,16 +12,16 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.thread.ThreadSafe;
+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.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.pipeline.EventPipeline;
@@ -37,7 +37,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/26 21:12:09 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/30 14:17:43 $
*/
public class Manager extends AbstractLoggable implements Component,
Configurable, Composable, Contextualizable, ThreadSafe {
1.1.4.20 +4 -4
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.19
retrieving revision 1.1.4.20
diff -u -r1.1.4.19 -r1.1.4.20
--- Sitemap.java 2001/04/25 17:08:46 1.1.4.19
+++ Sitemap.java 2001/04/30 14:17:43 1.1.4.20
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.context.Contextualizable;
+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;
@@ -20,7 +20,7 @@
* Base interface for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.4.19 $ $Date: 2001/04/25 17:08:46 $
+ * @version CVS $Revision: 1.1.4.20 $ $Date: 2001/04/30 14:17:43 $
*/
public interface Sitemap extends CompiledComponent, Configurable,
Contextualizable, Processor {
int GENERATOR = 1;
1.1.2.11 +8 -8
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java
Index: SitemapComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- SitemapComponentSelector.java 2001/04/25 17:08:47 1.1.2.10
+++ SitemapComponentSelector.java 2001/04/30 14:17:43 1.1.2.11
@@ -9,19 +9,19 @@
package org.apache.cocoon.sitemap;
import java.util.HashMap;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+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.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.excalibur.component.DefaultComponentSelector;
+import org.apache.avalon.excalibur.component.DefaultComponentSelector;
/** 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.1.2.10 2001/04/25
17:08:47 donaldp Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.11 2001/04/30
14:17:43 bloritsch Exp $
*/
public class SitemapComponentSelector extends DefaultComponentSelector {
HashMap mime_types;
1.1.2.8 +3 -3
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
Index: SitemapModelComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- SitemapModelComponent.java 2001/04/25 17:08:49 1.1.2.7
+++ SitemapModelComponent.java 2001/04/30 14:17:43 1.1.2.8
@@ -9,8 +9,8 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -19,7 +19,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/25 17:08:49 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/30 14:17:43 $
*/
public interface SitemapModelComponent extends Component {
1.1.2.6 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java
Index: SitemapOutputComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SitemapOutputComponent.java 2001/04/25 17:08:50 1.1.2.5
+++ SitemapOutputComponent.java 2001/04/30 14:17:43 1.1.2.6
@@ -9,12 +9,12 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.avalon.component.Component;
+import org.apache.avalon.framework.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/25 17:08:50 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/30 14:17:43 $
*/
public interface SitemapOutputComponent extends Component {
1.1.2.13 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XSLTFactoryLoader.java 2001/04/25 17:08:51 1.1.2.12
+++ XSLTFactoryLoader.java 2001/04/30 14:17:43 1.1.2.13
@@ -9,7 +9,7 @@
package org.apache.cocoon.sitemap;
import java.util.HashMap;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.CodeFactory;
import org.apache.cocoon.util.ClassUtils;
import org.apache.log.Logger;
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:08:51 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/30 14:17:43 $
*/
public class XSLTFactoryLoader {
No revision
No revision
1.1.2.12 +5 -5
xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/AbstractDOMTransformer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- AbstractDOMTransformer.java 2001/04/25 18:20:40 1.1.2.11
+++ AbstractDOMTransformer.java 2001/04/30 14:17:45 1.1.2.12
@@ -9,11 +9,11 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.components.parser.Parser;
1.1.2.11 +7 -7
xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/FragmentExtractorTransformer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FragmentExtractorTransformer.java 2001/04/25 17:09:00 1.1.2.10
+++ FragmentExtractorTransformer.java 2001/04/30 14:17:45 1.1.2.11
@@ -11,12 +11,12 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.caching.CacheValidity;
@@ -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.1.2.10 $ $Date: 2001/04/25 17:09:00 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/30 14:17:45 $
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements Composable, Disposable, Cacheable {
1.1.2.16 +7 -7
xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- I18nTransformer.java 2001/04/25 18:20:40 1.1.2.15
+++ I18nTransformer.java 2001/04/30 14:17:45 1.1.2.16
@@ -16,18 +16,18 @@
import java.net.URL;
import java.util.Hashtable;
import java.util.Map;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.parameters.Parameters;
+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.Roles;
import org.apache.cocoon.acting.LangSelect;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
1.1.2.20 +3 -3
xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- LogTransformer.java 2001/04/25 17:09:01 1.1.2.19
+++ LogTransformer.java 2001/04/30 14:17:45 1.1.2.20
@@ -11,9 +11,9 @@
import java.io.IOException;
import java.util.Date;
import java.util.Map;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.Locator;
@@ -43,7 +43,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/25 17:09:01 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/30 14:17:45 $
*
*/
public class LogTransformer extends AbstractTransformer implements Poolable {
1.1.2.28 +10 -10
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- SQLTransformer.java 2001/04/25 17:09:02 1.1.2.27
+++ SQLTransformer.java 2001/04/30 14:17:45 1.1.2.28
@@ -18,20 +18,20 @@
import java.util.Map;
import java.util.Properties;
import java.util.Vector;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.ComponentSelector;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.datasource.DataSourceComponent;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -46,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/25 17:09:02 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/30 14:17:45 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer implements
Composable, Poolable, Disposable {
1.1.2.29 +12 -12
xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- TraxTransformer.java 2001/04/25 17:09:02 1.1.2.28
+++ TraxTransformer.java 2001/04/30 14:17:45 1.1.2.29
@@ -24,15 +24,15 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -48,8 +48,8 @@
import org.apache.cocoon.util.TraxErrorHandler;
import org.apache.cocoon.xml.ContentHandlerWrapper;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.excalibur.pool.Poolable;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -62,7 +62,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/25 17:09:02 $
+ * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/30 14:17:45 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable {
1.1.2.31 +10 -10
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- XIncludeTransformer.java 2001/04/25 17:09:03 1.1.2.30
+++ XIncludeTransformer.java 2001/04/30 14:17:45 1.1.2.31
@@ -18,14 +18,14 @@
import java.util.Map;
import java.util.Stack;
import javax.xml.transform.TransformerException;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.parser.Parser;
@@ -33,7 +33,7 @@
import org.apache.cocoon.xml.XIncludeContentHandler;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -54,7 +54,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/25 17:09:03 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/30 14:17:45 $ $Author:
bloritsch $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composable, Poolable, Disposable {
1.1.2.24 +8 -8
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- XTTransformer.java 2001/04/25 17:09:04 1.1.2.23
+++ XTTransformer.java 2001/04/30 14:17:45 1.1.2.24
@@ -29,12 +29,12 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Modifiable;
import org.apache.cocoon.ProcessingException;
@@ -46,7 +46,7 @@
import org.apache.cocoon.xml.DocumentHandlerAdapter;
import org.apache.cocoon.xml.DocumentHandlerWrapper;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.log.Logger;
import org.xml.sax.AttributeList;
import org.xml.sax.ContentHandler;
@@ -66,7 +66,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/25 17:09:04 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/30 14:17:45 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composable, Loggable, Poolable, Disposable {
No revision
No revision
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java
Index: AbstractXMLConsumer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLConsumer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- AbstractXMLConsumer.java 2001/04/25 17:09:31 1.1.2.9
+++ AbstractXMLConsumer.java 2001/04/30 14:17:46 1.1.2.10
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:09:31 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:46 $
*/
public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
1.1.2.13 +3 -3
xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java
Index: AbstractXMLProducer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/AbstractXMLProducer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- AbstractXMLProducer.java 2001/04/25 17:09:33 1.1.2.12
+++ AbstractXMLProducer.java 2001/04/30 14:17:46 1.1.2.13
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:09:33 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/30 14:17:46 $
*/
public abstract class AbstractXMLProducer extends AbstractLoggable
implements XMLProducer, Recyclable {
1.1.2.10 +2 -2
xml-cocoon/src/org/apache/cocoon/xml/Attic/ContentHandlerWrapper.java
Index: ContentHandlerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/ContentHandlerWrapper.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ContentHandlerWrapper.java 2001/04/25 17:09:34 1.1.2.9
+++ ContentHandlerWrapper.java 2001/04/30 14:17:46 1.1.2.10
@@ -10,7 +10,7 @@
import java.util.Vector;
import org.apache.cocoon.xml.AbstractXMLConsumer;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* (Apache Software Foundation, Computer Associates)
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/25 17:09:34 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/30 14:17:46 $
*/
public class ContentHandlerWrapper extends AbstractXMLConsumer implements
Recyclable {
1.1.2.7 +3 -3
xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java
Index: DocumentHandlerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/DocumentHandlerWrapper.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- DocumentHandlerWrapper.java 2001/04/25 17:09:37 1.1.2.6
+++ DocumentHandlerWrapper.java 2001/04/30 14:17:46 1.1.2.7
@@ -9,10 +9,10 @@
package org.apache.cocoon.xml;
import java.util.Vector;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.xml.AbstractXMLConsumer;
import org.apache.cocoon.xml.NamespacesTable;
-import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.log.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.DocumentHandler;
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:09:37 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:46 $
*/
public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
Loggable /*, Recyclable*/ {
1.1.2.4 +1 -1
xml-cocoon/src/org/apache/cocoon/xml/Attic/LoggingEntityResolver.java
Index: LoggingEntityResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/LoggingEntityResolver.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LoggingEntityResolver.java 2001/04/25 17:09:38 1.1.2.3
+++ LoggingEntityResolver.java 2001/04/30 14:17:46 1.1.2.4
@@ -4,7 +4,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
1.1.2.3 +2 -2
xml-cocoon/src/org/apache/cocoon/xml/Attic/XIncludeContentHandler.java
Index: XIncludeContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/XIncludeContentHandler.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XIncludeContentHandler.java 2001/04/25 17:09:39 1.1.2.2
+++ XIncludeContentHandler.java 2001/04/30 14:17:46 1.1.2.3
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.xml;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -18,7 +18,7 @@
* Extracted class from XIncludeTransformer for use in XIncludeSAXConnector.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/25 17:09:39 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/30 14:17:46 $ $Author:
bloritsch $
*/
public class XIncludeContentHandler extends AbstractLoggable implements
ContentHandler, LexicalHandler {
No revision
No revision
1.1.2.13 +2 -2
xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DOMBuilder.java 2001/04/25 17:09:54 1.1.2.12
+++ DOMBuilder.java 2001/04/30 14:17:47 1.1.2.13
@@ -9,7 +9,7 @@
package org.apache.cocoon.xml.dom;
import java.util.Vector;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.cocoon.xml.NamespacesTable;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.log.Logger;
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/25 17:09:54 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/30 14:17:47 $
*/
public class DOMBuilder implements XMLConsumer, Loggable {
protected Logger log;
1.1.2.7 +2 -2
xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SVGBuilder.java 2001/04/25 17:09:56 1.1.2.6
+++ SVGBuilder.java 2001/04/30 14:17:47 1.1.2.7
@@ -9,7 +9,7 @@
package org.apache.cocoon.xml.dom;
import java.util.Vector;
-import org.apache.avalon.logger.Loggable;
+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;
@@ -37,7 +37,7 @@
* SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/25 17:09:56 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/30 14:17:47 $
*/
public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
protected Logger log;
No revision
No revision
1.1.2.43 +1 -1 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -r1.1.2.42 -r1.1.2.43
--- cocoon.xconf 2001/04/25 15:39:07 1.1.2.42
+++ cocoon.xconf 2001/04/30 14:17:47 1.1.2.43
@@ -105,7 +105,7 @@
</datasources>
<!-- these components is used as a PoolController for the sitemap
component pools -->
- <pool-controller
class="org.apache.excalibur.component.DefaultComponentPoolController"/>
+ <pool-controller
class="org.apache.avalon.excalibur.component.DefaultComponentPoolController"/>
<sax-connector
class="org.apache.cocoon.components.saxconnector.XIncludeSAXConnector"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
