bloritsch 01/04/20 13:50:21
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java Main.java
cocoon.roles
src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractAction.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
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
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 JstyleFormatter.java
src/org/apache/cocoon/components/parser Tag: xml-cocoon2
JaxpParser.java 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
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
PhpGenerator.java RequestGenerator.java
ScriptGenerator.java ServerPagesGenerator.java
ServletGenerator.java StatusGenerator.java
VelocityGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2 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
Selector.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractSerializer.java FOPSerializer.java
HTMLSerializer.java LinkSerializer.java
SVGSerializer.java TextSerializer.java
XMLSerializer.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.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/util/url Tag: xml-cocoon2
CocoonURLStreamHandlerFactory.java
src/org/apache/cocoon/util/url/resource Tag: xml-cocoon2
Handler.java
src/org/apache/cocoon/xml Tag: xml-cocoon2
AbstractXMLConsumer.java AbstractXMLProducer.java
ContentHandlerWrapper.java
DocumentHandlerWrapper.java
LoggingEntityResolver.java
src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
DOMBuilder.java SVGBuilder.java
webapp Tag: xml-cocoon2 cocoon.xconf
Added: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractComplementaryConfigurableAction.java
Removed: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractComplimentaryConfigurableAction.java
Log:
Massive updates for current Avalon CVS which is much nearer beta than before.
Includes some Interface resolution errors.
Revision Changes Path
No revision
No revision
1.1.2.47 +529 -557 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.4.2.75 +8 -8 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.74
retrieving revision 1.4.2.75
diff -u -r1.4.2.74 -r1.4.2.75
--- Cocoon.java 2001/04/19 19:05:23 1.4.2.74
+++ Cocoon.java 2001/04/20 20:49:42 1.4.2.75
@@ -16,10 +16,10 @@
import java.util.HashMap;
import java.util.Enumeration;
import java.util.Iterator;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
import org.apache.avalon.Disposable;
import org.apache.avalon.Modifiable;
import org.apache.avalon.configuration.Configurable;
@@ -37,9 +37,9 @@
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.avalon.component.DefaultComponentManager;
-import org.apache.avalon.component.DefaultRoleManager;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.excalibur.component.DefaultComponentManager;
+import org.apache.excalibur.component.DefaultRoleManager;
+import org.apache.avalon.logger.AbstractLoggable;
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
@@ -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.74 $ $Date: 2001/04/19 19:05:23 $
+ * @version CVS $Revision: 1.4.2.75 $ $Date: 2001/04/20 20:49:42 $
*/
public class Cocoon extends AbstractLoggable implements Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
1.1.4.30 +4 -4 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.29
retrieving revision 1.1.4.30
diff -u -r1.1.4.29 -r1.1.4.30
--- Main.java 2001/04/17 03:55:01 1.1.4.29
+++ Main.java 2001/04/20 20:49:42 1.1.4.30
@@ -29,7 +29,7 @@
import org.apache.excalibur.cli.CLOption;
import org.apache.excalibur.cli.CLOptionDescriptor;
import org.apache.excalibur.cli.CLUtil;
-import org.apache.avalon.DefaultContext;
+import org.apache.avalon.context.DefaultContext;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
@@ -51,7 +51,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.4.29 $ $Date: 2001/04/17 03:55:01 $
+ * @version CVS $Revision: 1.1.4.30 $ $Date: 2001/04/20 20:49:42 $
*/
public class Main {
@@ -330,7 +330,7 @@
while (i.hasNext()) {
if(xspOnly)
this.processXSP(NetUtils.normalize((String) i.next()));
- else
+ else
this.processURI(NetUtils.normalize((String) i.next()), 0);
nCount++;
}
@@ -393,7 +393,7 @@
String translatedRelativeLink = NetUtils.relativize(path,
translatedAbsoluteLink);
translatedLinks.put(relativeLink, translatedRelativeLink);
}
-
+
String filename = mangle(uri);
File file = IOUtils.createFile(destDir, filename);
OutputStream output = new BufferedOutputStream(new
FileOutputStream(file));
1.1.2.6 +9 -9 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- cocoon.roles 2001/04/17 16:04:13 1.1.2.5
+++ cocoon.roles 2001/04/20 20:49:42 1.1.2.6
@@ -26,11 +26,11 @@
<role
name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
shorthand="markup-languages"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
shorthand="programming-languages"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.generator.ProgramGenerator"
shorthand="program-generator"
@@ -42,7 +42,7 @@
<role name="org.apache.excalibur.pool.PoolController"
shorthand="pool-controller"
-
default-class="org.apache.avalon.component.DefaultComponentPoolController"/>
+
default-class="org.apache.excalibur.component.DefaultComponentPoolController"/>
<role name="org.apache.cocoon.components.saxconnector.SAXConnector"
shorthand="sax-connector"
@@ -53,7 +53,7 @@
<role name="org.apache.excalibur.datasource.DataSourceComponentSelector"
shorthand="datasources"
- default-class="org.apache.avalon.component.DefaultComponentSelector">
+
default-class="org.apache.excalibur.component.DefaultComponentSelector">
<hint shorthand="jdbc"
class="org.apache.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.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selector"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matcher"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generator"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformer"
- default-class="org.apache.avalon.component.DefaultComponentSelector"/>
+
default-class="org.apache.excalibur.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializer"
No revision
No revision
1.1.2.7 +2 -2
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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractAction.java 2001/04/13 16:02:17 1.1.2.6
+++ AbstractAction.java 2001/04/20 20:49:43 1.1.2.7
@@ -11,7 +11,7 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.log.Logger;
@@ -20,7 +20,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.6 $ $Date: 2001/04/13 16:02:17 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/20 20:49:43 $
*/
public abstract class AbstractAction extends AbstractLoggable
implements Action, Configurable, Disposable {
1.1.2.28 +9 -10
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.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- AbstractDatabaseAction.java 2001/04/17 03:55:05 1.1.2.27
+++ AbstractDatabaseAction.java 2001/04/20 20:49:44 1.1.2.28
@@ -36,16 +36,15 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Disposable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentSelector;
import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.Disposable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.SAXConfigurationHandler;
import org.apache.excalibur.datasource.DataSourceComponent;
@@ -176,9 +175,9 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/17 03:55:05 $
+ * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/20 20:49:44 $
*/
-public abstract class AbstractDatabaseAction extends
AbstractComplimentaryConfigurableAction implements Configurable, Disposable {
+public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
private static final Map typeConstants;
protected ComponentSelector dbselector;
@@ -211,7 +210,7 @@
/**
* Compose the Actions so that we can select our databases.
*/
- public void compose(ComponentManager manager) throws
ComponentManagerException {
+ public void compose(ComponentManager manager) throws ComponentException {
this.dbselector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
super.compose(manager);
@@ -219,7 +218,7 @@
/**
* Get the Datasource we need.
*/
- protected final DataSourceComponent getDataSource(Configuration conf)
throws ComponentManagerException {
+ protected final DataSourceComponent getDataSource(Configuration conf)
throws ComponentException {
Configuration dsn = conf.getChild("connection");
return (DataSourceComponent)
this.dbselector.select(dsn.getValue(""));
1.1.2.3 +8 -8
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractValidatorAction.java 2001/04/17 18:18:04 1.1.2.2
+++ AbstractValidatorAction.java 2001/04/20 20:49:44 1.1.2.3
@@ -1,11 +1,11 @@
-// $Id: AbstractValidatorAction.java,v 1.1.2.2 2001/04/17 18:18:04 dims Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch
Exp $
package org.apache.cocoon.acting;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -49,12 +49,12 @@
* Default value takes place only when specified parameter is nullable and
* really is null or empty. Long numbers may be specified in decimal, hex or
* octal values as accepted by java.Lang.decode (String s).
- *
+ *
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/17 18:18:04 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:49:44 $
*/
-public abstract class AbstractValidatorAction
-extends AbstractComplimentaryConfigurableAction
+public abstract class AbstractValidatorAction
+extends AbstractComplementaryConfigurableAction
implements Configurable
{
/**
@@ -86,7 +86,7 @@
}
if (!found) {
- getLogger ().debug ("VALIDATOR: description for parameter "
+ getLogger ().debug ("VALIDATOR: description for parameter "
+ name + " not found");
return null;
}
@@ -290,5 +290,5 @@
}
}
-// $Id: AbstractValidatorAction.java,v 1.1.2.2 2001/04/17 18:18:04 dims Exp $
+// $Id: AbstractValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch
Exp $
// vim: set et ts=4 sw=4:
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Action.java 2001/03/30 17:14:08 1.1.2.8
+++ Action.java 2001/04/20 20:49:44 1.1.2.9
@@ -9,9 +9,9 @@
import java.util.Map;
-import org.apache.avalon.Component;
-import org.apache.avalon.ThreadSafe;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.parameters.Parameters;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -19,7 +19,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/30 17:14:08 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:44 $
*/
public interface Action extends Component, ThreadSafe {
/**
1.1.2.6 +7 -7
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ComposerAction.java 2001/04/11 12:41:12 1.1.2.5
+++ ComposerAction.java 2001/04/20 20:49:44 1.1.2.6
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Composable;
import org.apache.cocoon.Cocoon;
/**
@@ -17,18 +17,18 @@
* that extends this to access SitemapComponents.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/11 12:41:12 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:44 $
*/
-public abstract class ComposerAction extends AbstractAction implements
Composer {
+public abstract class ComposerAction extends AbstractAction implements
Composable {
/** The component manager instance */
protected ComponentManager manager;
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
- public void compose(ComponentManager manager) throws
ComponentManagerException {
+ public void compose(ComponentManager manager) throws ComponentException {
this.manager=manager;
}
}
1.1.2.24 +3 -4
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.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- DatabaseAddAction.java 2001/04/18 01:11:53 1.1.2.23
+++ DatabaseAddAction.java 2001/04/20 20:49:44 1.1.2.24
@@ -20,13 +20,12 @@
import org.xml.sax.EntityResolver;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentSelector;
+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.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
@@ -40,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.23 $ $Date: 2001/04/18 01:11:53 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/20 20:49:44 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
1.1.2.5 +4 -4
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DatabaseAuthenticatorAction.java 2001/04/18 12:05:46 1.1.2.4
+++ DatabaseAuthenticatorAction.java 2001/04/20 20:49:44 1.1.2.5
@@ -1,11 +1,11 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.4 2001/04/18 12:05:46
cziegeler Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.5 2001/04/20 20:49:44
bloritsch Exp $
package org.apache.cocoon.acting;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.excalibur.datasource.DataSourceComponent;
@@ -53,7 +53,7 @@
* expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/18 12:05:46 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:49:44 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
{
@@ -205,5 +205,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.4 2001/04/18 12:05:46
cziegeler Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.5 2001/04/20 20:49:44
bloritsch Exp $
// vim: set et ts=4 sw=4:
1.1.2.14 +3 -4
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.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- DatabaseDeleteAction.java 2001/04/17 03:55:10 1.1.2.13
+++ DatabaseDeleteAction.java 2001/04/20 20:49:44 1.1.2.14
@@ -20,13 +20,12 @@
import org.xml.sax.EntityResolver;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentSelector;
+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.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
@@ -43,7 +42,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/17 03:55:10 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/20 20:49:44 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
1.1.2.19 +3 -4
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.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- DatabaseUpdateAction.java 2001/04/17 03:55:10 1.1.2.18
+++ DatabaseUpdateAction.java 2001/04/20 20:49:44 1.1.2.19
@@ -20,13 +20,12 @@
import org.xml.sax.EntityResolver;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentSelector;
+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.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
@@ -40,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.18 $ $Date: 2001/04/17 03:55:10 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/20 20:49:44 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FormValidatorAction.java 2001/04/17 18:18:09 1.1.2.2
+++ FormValidatorAction.java 2001/04/20 20:49:44 1.1.2.3
@@ -1,11 +1,11 @@
-// $Id: FormValidatorAction.java,v 1.1.2.2 2001/04/17 18:18:09 dims Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch Exp
$
package org.apache.cocoon.acting;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -35,7 +35,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/17 18:18:09 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:49:44 $
*/
public class FormValidatorAction extends AbstractValidatorAction
{
@@ -44,11 +44,11 @@
*/
public Map act (EntityResolver resolver, Map objectModel, String src,
Parameters parameters) throws Exception {
- Request req = (Request)
+ Request req = (Request)
objectModel.get (Constants.REQUEST_OBJECT);
/* check request validity */
- if (req == null)
+ if (req == null)
return null;
try {
@@ -83,5 +83,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.1.2.2 2001/04/17 18:18:09 dims Exp $
+// $Id: FormValidatorAction.java,v 1.1.2.3 2001/04/20 20:49:44 bloritsch Exp
$
// vim: set et ts=4 sw=4:
1.1.2.15 +3 -3
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- HelloAction.java 2001/04/18 12:05:47 1.1.2.14
+++ HelloAction.java 2001/04/20 20:49:44 1.1.2.15
@@ -10,10 +10,10 @@
import java.util.Map;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -27,7 +27,7 @@
* has been created or not.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/18 12:05:47 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:49:44 $
*/
public class HelloAction extends ComposerAction {
1.1.2.10 +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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- LangSelect.java 2001/04/18 12:05:47 1.1.2.9
+++ LangSelect.java 2001/04/20 20:49:45 1.1.2.10
@@ -23,7 +23,7 @@
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Session;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.xml.sax.EntityResolver;
@@ -103,7 +103,7 @@
* </ol>
* @return java.lang.String
* @param objectModel java.util.Map
- * @param par org.apache.avalon.configuration.Parameters
+ * @param par org.apache.avalon.parameter.Parameters
*/
public static String getLang(Map objectModel, Parameters par) {
1.1.2.15 +2 -2
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- OraAddAction.java 2001/04/17 16:46:04 1.1.2.14
+++ OraAddAction.java 2001/04/20 20:49:45 1.1.2.15
@@ -10,7 +10,7 @@
import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
@@ -43,7 +43,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/17 16:46:04 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:49:45 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
1.1.2.2 +7 -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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ResourceExistsAction.java 2001/04/16 20:24:30 1.1.2.1
+++ ResourceExistsAction.java 2001/04/20 20:49:45 1.1.2.2
@@ -14,16 +14,14 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.ComponentManagerException;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.Disposable;
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.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
@@ -38,18 +36,18 @@
* This action simply checks to see if a given resource exists. It takes a
* single parameter named 'url' and returns an empty map if it exists and
* 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.1 $ $Date: 2001/04/16 20:24:30 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:49:45 $
*/
public class ResourceExistsAction extends ComposerAction {
-
+
protected URLFactory urlFactory;
public void configure(Configuration conf) throws ConfigurationException {
try {
urlFactory = (URLFactory)this.manager.lookup(Roles.URL_FACTORY);
- } catch (ComponentManagerException e) {
+ } catch (ComponentException e) {
throw new ConfigurationException("Could not lookup url
factory",e);
}
}
1.1.2.5 +2 -2
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SendmailAction.java 2001/03/30 17:14:12 1.1.2.4
+++ SendmailAction.java 2001/04/20 20:49:45 1.1.2.5
@@ -22,8 +22,8 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
import org.apache.log.Logger;
1.1.2.4 +4 -4
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SessionInvalidatorAction.java 2001/04/18 12:05:47 1.1.2.3
+++ SessionInvalidatorAction.java 2001/04/20 20:49:45 1.1.2.4
@@ -1,11 +1,11 @@
-// $Id: SessionInvalidatorAction.java,v 1.1.2.3 2001/04/18 12:05:47
cziegeler Exp $
+// $Id: SessionInvalidatorAction.java,v 1.1.2.4 2001/04/20 20:49:45
bloritsch Exp $
package org.apache.cocoon.acting;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -23,7 +23,7 @@
* empty map if everything is ok, null otherwise.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/18 12:05:47 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:49:45 $
*/
public class SessionInvalidatorAction extends AbstractAction
{
@@ -49,5 +49,5 @@
}
}
-// $Id: SessionInvalidatorAction.java,v 1.1.2.3 2001/04/18 12:05:47
cziegeler Exp $
+// $Id: SessionInvalidatorAction.java,v 1.1.2.4 2001/04/20 20:49:45
bloritsch Exp $
// vim: set et ts=4 sw=4:
1.1.2.4 +4 -4
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SessionValidatorAction.java 2001/04/18 12:05:47 1.1.2.3
+++ SessionValidatorAction.java 2001/04/20 20:49:46 1.1.2.4
@@ -1,4 +1,4 @@
-// $Id: SessionValidatorAction.java,v 1.1.2.3 2001/04/18 12:05:47 cziegeler
Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.4 2001/04/20 20:49:46 bloritsch
Exp $
package org.apache.cocoon.acting;
import java.util.Map;
@@ -6,7 +6,7 @@
import java.util.Collections;
import java.util.Iterator;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -38,7 +38,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/18 12:05:47 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:49:46 $
*/
public class SessionValidatorAction extends AbstractValidatorAction
{
@@ -89,5 +89,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.1.2.3 2001/04/18 12:05:47 cziegeler
Exp $
+// $Id: SessionValidatorAction.java,v 1.1.2.4 2001/04/20 20:49:46 bloritsch
Exp $
// vim: set et ts=4 sw=4:
No revision
No revision
1.1.2.1 +96 -0
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplementaryConfigurableAction.java
No revision
No revision
1.1.2.2 +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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Browser.java 2001/04/13 17:39:52 1.1.2.1
+++ Browser.java 2001/04/20 20:49:48 1.1.2.2
@@ -7,14 +7,14 @@
*****************************************************************************/
package org.apache.cocoon.components.browser;
-import org.apache.avalon.Component;
+import org.apache.avalon.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.1 $ $Date: 2001/04/13 17:39:52 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:49:48 $
*/
public interface Browser extends Component {
1.1.2.2 +12 -13
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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BrowserImpl.xsl 2001/04/13 17:39:52 1.1.2.1
+++ BrowserImpl.xsl 2001/04/20 20:49:48 1.1.2.2
@@ -25,12 +25,11 @@
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Disposable;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentManager;
import org.apache.cocoon.Roles;
import org.apache.cocoon.xml.dom.DOMFactory;
@@ -48,7 +47,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @version 2.0
* @since April 13, 2001 */
-public class BrowserImpl implements Component, Browser, Composer, Disposable
+public class BrowserImpl implements Component, Browser, Composable,
Disposable
{
/**
* <code>byMimeType</code> describes how to map from a generic MIME
@@ -122,15 +121,15 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
]]>
- public void compose(ComponentManager manager)
- throws ComponentManagerException {
+ public void compose(ComponentManager manager)
+ throws ComponentException {
this.manager=manager;
parser = (Parser)this.manager.lookup(Roles.PARSER);
-
+
HashMap browser0 = new HashMap();
Document document;
@@ -182,7 +181,7 @@
StringTokenizer tokenizer = new StringTokenizer(acceptHeader, ", ");
while (tokenizer.hasMoreElements()) {
String mediaType = ((String)tokenizer.nextElement()).trim();
-
+
if (currentType.equals(mediaType)) {
exactMatch = currentType;
break loop;
@@ -195,7 +194,7 @@
}
String type = null;
-
+
if (exactMatch != null)
type = exactMatch;
else if (partialMatch != null)
@@ -293,7 +292,7 @@
<xsl:template match="browser-category//*[name() != 'browser'
- and name() != 'user-agent']
+ and name() != 'user-agent']
| browser-category//@*">
<xsl:param name="depth" select="0"/>
browser<xsl:value-of select="$depth"/>.put("<xsl:value-of
select="name()"/>", "<xsl:value-of select="."/>");
No revision
No revision
1.1.2.7 +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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ClassLoaderManager.java 2000/12/11 16:06:30 1.1.2.6
+++ ClassLoaderManager.java 2001/04/20 20:49:49 1.1.2.7
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.classloader;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import java.io.IOException;
import java.io.File;
@@ -19,7 +19,7 @@
* that it can be safely reinstantiated for dynamic class reloading
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/11 16:06:30 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/20 20:49:49 $
*/
public interface ClassLoaderManager extends Component {
/**
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ClassLoaderManagerImpl.java 2001/01/31 05:21:39 1.1.2.7
+++ ClassLoaderManagerImpl.java 2001/04/20 20:49:49 1.1.2.8
@@ -13,13 +13,13 @@
import java.net.MalformedURLException;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.thread.ThreadSafe;
/**
* A singleton-like implementation of <code>ClassLoaderManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/01/31 05:21:39 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:49:49 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager,
ThreadSafe {
/**
1.1.2.23 +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.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- RepositoryClassLoader.java 2001/03/12 05:55:19 1.1.2.22
+++ RepositoryClassLoader.java 2001/04/20 20:49:49 1.1.2.23
@@ -22,7 +22,7 @@
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
/**
@@ -33,7 +33,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.22 $ $Date: 2001/03/12 05:55:19 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/20 20:49:49 $
*/
public class RepositoryClassLoader extends URLClassLoader implements
Loggable {
No revision
No revision
1.1.2.6 +4 -4
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CompiledComponent.java 2001/02/22 17:10:25 1.1.2.5
+++ CompiledComponent.java 2001/04/20 20:49:50 1.1.2.6
@@ -7,16 +7,16 @@
*****************************************************************************/
package org.apache.cocoon.components.language.generator;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Modifiable;
-import org.apache.avalon.Poolable;
/**
* 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.5 $ $Date: 2001/02/22 17:10:25 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:50 $
*/
-public interface CompiledComponent extends Composer, Poolable, Modifiable {
+public interface CompiledComponent extends Component, Composable, Modifiable
{
}
1.1.2.15 +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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- GeneratorSelector.java 2001/04/14 21:13:24 1.1.2.14
+++ GeneratorSelector.java 2001/04/20 20:49:50 1.1.2.15
@@ -9,9 +9,8 @@
import java.io.File;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.Disposable;
import org.apache.avalon.configuration.DefaultConfiguration;
@@ -19,7 +18,7 @@
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
-import org.apache.avalon.component.DefaultComponentSelector;
+import org.apache.excalibur.component.DefaultComponentSelector;
import org.apache.cocoon.util.ClassUtils;
/**
@@ -27,7 +26,7 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/14 21:13:24 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:49:50 $
*/
public class GeneratorSelector extends DefaultComponentSelector implements
Disposable {
private ClassLoaderManager classManager;
@@ -35,13 +34,13 @@
/** The component manager */
protected ComponentManager manager = null;
- public void compose (ComponentManager manager) throws
ComponentManagerException {
+ public void compose (ComponentManager manager) throws ComponentException
{
super.compose(manager);
this.manager = manager;
try {
this.classManager = (ClassLoaderManager)
manager.lookup(Roles.CLASS_LOADER);
- } catch (ComponentManagerException cme) {
+ } catch (ComponentException cme) {
throw new ComponentException("GeneratorSelector", cme);
}
@@ -80,5 +79,6 @@
public void dispose() {
this.manager.release((Component)this.classManager);
+ super.dispose();
}
}
1.1.2.10 +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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ProgramGenerator.java 2001/02/22 17:10:26 1.1.2.9
+++ ProgramGenerator.java 2001/04/20 20:49:50 1.1.2.10
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.language.generator;
import java.io.File;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.xml.sax.EntityResolver;
@@ -17,7 +17,7 @@
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/22 17:10:26 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/20 20:49:50 $
*/
public interface ProgramGenerator extends Component {
/**
1.1.2.48 +14 -14
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.47
retrieving revision 1.1.2.48
diff -u -r1.1.2.47 -r1.1.2.48
--- ProgramGeneratorImpl.java 2001/04/13 16:02:20 1.1.2.47
+++ ProgramGeneratorImpl.java 2001/04/20 20:49:50 1.1.2.48
@@ -12,22 +12,22 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentSelector;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.avalon.Modifiable;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.thread.ThreadSafe;
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.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
@@ -48,10 +48,10 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.47 $ $Date: 2001/04/13 16:02:20 $
+ * @version CVS $Revision: 1.1.2.48 $ $Date: 2001/04/20 20:49:50 $
*/
-public class ProgramGeneratorImpl extends AbstractLoggable
- implements ProgramGenerator, Contextualizable, Composer, Configurable,
ThreadSafe, Disposable {
+public class ProgramGeneratorImpl extends AbstractLoggable
+ implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
/** The auto-reloading option */
protected boolean autoReload = false;
@@ -134,7 +134,7 @@
public CompiledComponent load(File file,
String markupLanguageName,
String programmingLanguageName,
- EntityResolver resolver)
+ EntityResolver resolver)
throws Exception {
// Create filesystem store
No revision
No revision
1.1.2.34 +9 -9
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.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- AbstractMarkupLanguage.java 2001/04/18 15:14:22 1.1.2.33
+++ AbstractMarkupLanguage.java 2001/04/20 20:49:51 1.1.2.34
@@ -32,15 +32,15 @@
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+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.configuration.Parameters;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
@@ -53,9 +53,9 @@
* 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.33 $ $Date: 2001/04/18 15:14:22 $
+ * @version CVS $Revision: 1.1.2.34 $ $Date: 2001/04/20 20:49:51 $
*/
-public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composer, Configurable {
+public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composable, Configurable {
/** The supported language table */
protected Hashtable languages;
@@ -75,7 +75,7 @@
* Set the global component manager.
* @param manager The sitemap-specified component manager
*/
- public void compose(ComponentManager manager) throws
ComponentManagerException {
+ public void compose(ComponentManager manager) throws ComponentException {
this.manager = manager;
// Initialize logicsheet cache
1.1.2.16 +8 -8
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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Logicsheet.java 2001/04/20 14:48:26 1.1.2.15
+++ Logicsheet.java 2001/04/20 20:49:51 1.1.2.16
@@ -36,7 +36,7 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.util.TraxErrorHandler;
@@ -48,7 +48,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.15 $ $Date: 2001/04/20 14:48:26 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:49:51 $
*/
public class Logicsheet extends AbstractLoggable {
/** The trax TransformerFactory */
@@ -82,13 +82,13 @@
tfactory =
(SAXTransformerFactory)TransformerFactory.newInstance();
tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
- // Create a Templates ContentHandler to handle parsing of the
+ // Create a Templates ContentHandler to handle parsing of the
// stylesheet.
- javax.xml.transform.sax.TemplatesHandler templatesHandler =
+ javax.xml.transform.sax.TemplatesHandler templatesHandler =
tfactory.newTemplatesHandler();
// Create an XMLReader and set its ContentHandler.
- org.xml.sax.XMLReader reader =
+ org.xml.sax.XMLReader reader =
org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
reader.setFeature("http://xml.org/sax/features/namespace-prefixes";, true);
@@ -98,8 +98,8 @@
saveNSFilter.setContentHandler(templatesHandler);
//reader.setContentHandler(templatesHandler);
-
- // Parse the stylesheet.
+
+ // Parse the stylesheet.
reader.parse(inputSource);
// Get the Templates object (generated during the parsing of the
stylesheet)
@@ -170,7 +170,7 @@
}
public void startElement (String namespaceURI, String localName,
- String qName, Attributes atts) throws
SAXException {
+ String qName, Attributes atts) throws SAXException
{
super.startElement(namespaceURI, localName, qName, atts);
}
}
1.1.2.14 +3 -3
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.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- LogicsheetCodeGenerator.java 2001/04/20 14:48:27 1.1.2.13
+++ LogicsheetCodeGenerator.java 2001/04/20 20:49:52 1.1.2.14
@@ -28,7 +28,7 @@
import javax.xml.transform.TransformerException;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.cocoon.util.TraxErrorHandler;
@@ -37,7 +37,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.13 $ $Date: 2001/04/20 14:48:27 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/20 20:49:52 $
*/
public class LogicsheetCodeGenerator implements MarkupCodeGenerator,
Loggable {
@@ -72,7 +72,7 @@
// Set the output properties
format.put(OutputKeys.METHOD,"text");
// FIXME (SSA) remove the nice identing. For debug purpose only.
- format.put(OutputKeys.INDENT,"yes");
+ format.put(OutputKeys.INDENT,"yes");
handler.getTransformer().setOutputProperties(format);
this.writer = new StringWriter();
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- MarkupLanguage.java 2000/12/11 16:06:41 1.1.2.8
+++ MarkupLanguage.java 2001/04/20 20:49:52 1.1.2.9
@@ -10,7 +10,7 @@
import org.xml.sax.XMLReader;
import org.xml.sax.InputSource;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
@@ -22,7 +22,7 @@
* document augmenting it with dynamic content
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/11 16:06:41 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:52 $
*/
public interface MarkupLanguage extends Component {
/**
No revision
No revision
1.1.2.16 +2 -2
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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- SitemapMarkupLanguage.java 2001/04/13 12:09:36 1.1.2.15
+++ SitemapMarkupLanguage.java 2001/04/20 20:49:53 1.1.2.16
@@ -29,7 +29,7 @@
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import java.io.IOException;
import org.xml.sax.SAXException;
@@ -39,7 +39,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.15 $ $Date: 2001/04/13 12:09:36 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:49:53 $
*/
public class SitemapMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.1.2.99 +4 -4
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.98
retrieving revision 1.1.2.99
diff -u -r1.1.2.98 -r1.1.2.99
--- sitemap.xsl 2001/04/19 11:30:35 1.1.2.98
+++ sitemap.xsl 2001/04/20 20:49:53 1.1.2.99
@@ -65,12 +65,12 @@
import java.util.HashMap;
import java.util.Stack;
- import org.apache.avalon.Component;
+ 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.configuration.Parameters;
+ import org.apache.avalon.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.98 2001/04/19 11:30:35 giacomo
Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.99 2001/04/20 20:49:53
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"/>";
@@ -406,7 +406,7 @@
/**
* Process to producing the output to the specified
<code>OutputStream</code>.
*/
- private final boolean process(Environment environment, StreamPipeline
pipeline,
+ private final boolean process(Environment environment, StreamPipeline
pipeline,
EventPipeline eventPipeline, boolean
internalRequest)
throws Exception {
/* the <code>List</code> objects to hold the replacement
values
No revision
No revision
1.1.2.18 +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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- XSPGenerator.java 2001/04/02 13:53:08 1.1.2.17
+++ XSPGenerator.java 2001/04/20 20:49:54 1.1.2.18
@@ -8,14 +8,14 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Roles;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.ComponentManager;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Context;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.Context;
import org.apache.cocoon.generation.AbstractServerPage;
@@ -23,9 +23,9 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/02 13:53:08 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/20 20:49:54 $
*/
-public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable {
+public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Poolable {
/** Contextualize this class */
public void contextualize(Context context) {
1.1.2.13 +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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XSPMarkupLanguage.java 2001/04/13 12:09:36 1.1.2.12
+++ XSPMarkupLanguage.java 2001/04/20 20:49:54 1.1.2.13
@@ -30,7 +30,7 @@
import org.apache.cocoon.Constants;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import java.io.IOException;
import org.xml.sax.SAXException;
@@ -41,7 +41,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.12 $ $Date: 2001/04/13 12:09:36 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:49:54 $
*/
public class XSPMarkupLanguage extends AbstractMarkupLanguage {
No revision
No revision
1.1.2.57 +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.56
retrieving revision 1.1.2.57
diff -u -r1.1.2.56 -r1.1.2.57
--- esql.xsl 2001/04/17 16:46:11 1.1.2.56
+++ esql.xsl 2001/04/20 20:49:56 1.1.2.57
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.1.2.56 2001/04/17 16:46:11 bloritsch Exp $-->
+<!-- $Id: esql.xsl,v 1.1.2.57 2001/04/20 20:49:56 bloritsch Exp $-->
<!--
============================================================================
@@ -206,7 +206,7 @@
if (_esql_selector == null) {
try {
_esql_selector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
- } catch (ComponentManagerException cme) {
+ } catch (ComponentException cme) {
getLogger().error("Could not look up the datasource
component", cme);
}
}
No revision
No revision
1.1.2.13 +3 -3
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- AbstractProgrammingLanguage.java 2001/03/19 21:20:26 1.1.2.12
+++ AbstractProgrammingLanguage.java 2001/04/20 20:49:57 1.1.2.13
@@ -13,13 +13,13 @@
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* Base implementation of <code>ProgrammingLanguage</code>. This class sets
the
@@ -27,7 +27,7 @@
* unloading.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/19 21:20:26 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:49:57 $
*/
public abstract class AbstractProgrammingLanguage
implements ProgrammingLanguage, Configurable, Loggable
1.1.2.17 +5 -5
xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- CompiledProgrammingLanguage.java 2001/03/19 21:20:27 1.1.2.16
+++ CompiledProgrammingLanguage.java 2001/04/20 20:49:57 1.1.2.17
@@ -10,10 +10,10 @@
package org.apache.cocoon.components.language.programming;
import java.io.File;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
@@ -24,7 +24,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.16 $ $Date: 2001/03/19 21:20:27 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/20 20:49:57 $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
/** The compiler */
1.1.2.6 +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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LanguageCompiler.java 2000/08/21 17:41:45 1.1.2.5
+++ LanguageCompiler.java 2001/04/20 20:49:57 1.1.2.6
@@ -9,7 +9,7 @@
package org.apache.cocoon.components.language.programming;
import java.util.List;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import java.io.IOException;
@@ -17,7 +17,7 @@
* This interface defines a compiler's functionality for all
* (Java-based) compiled languages
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.5 $ $Date: 2000/08/21 17:41:45 $
+ * @version $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:57 $
* @since 2.0
*/
public interface LanguageCompiler extends Component {
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ProgrammingLanguage.java 2001/02/16 15:38:29 1.1.2.8
+++ ProgrammingLanguage.java 2001/04/20 20:49:57 1.1.2.9
@@ -9,7 +9,7 @@
import java.io.File;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.LanguageException;
@@ -18,7 +18,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.8 $ $Date: 2001/02/16 15:38:29 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:49:57 $
*/
public interface ProgrammingLanguage extends Component {
/**
No revision
No revision
1.1.2.11 +9 -4
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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractJavaCompiler.java 2001/01/22 21:56:38 1.1.2.10
+++ AbstractJavaCompiler.java 2001/04/20 20:49:58 1.1.2.11
@@ -8,10 +8,15 @@
package org.apache.cocoon.components.language.programming.java;
-import java.io.*;
-import java.util.*;
-import org.apache.avalon.*;
+import java.util.List;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import org.apache.avalon.logger.Loggable;
+import org.apache.excalibur.pool.Recyclable;
+
import org.apache.cocoon.components.language.programming.*;
import org.apache.log.Logger;
@@ -19,7 +24,7 @@
/**
* This class implements the functionality common to all Java compilers.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.10 $ $Date: 2001/01/22 21:56:38 $
+ * @version $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:49:58 $
* @since 2.0
*/
public abstract class AbstractJavaCompiler implements LanguageCompiler,
Recyclable, Loggable {
1.1.2.26 +8 -8
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.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- JavaLanguage.java 2001/04/13 16:02:21 1.1.2.25
+++ JavaLanguage.java 2001/04/20 20:49:59 1.1.2.26
@@ -13,14 +13,14 @@
import java.io.IOException;
import java.util.List;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.Disposable;
-import org.apache.avalon.ThreadSafe;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.logger.Loggable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.util.ClassUtils;
@@ -34,9 +34,9 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/13 16:02:21 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/20 20:49:59 $
*/
-public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composer, Disposable {
+public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
/** The class loader */
private ClassLoaderManager classLoaderManager;
1.1.2.6 +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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- JstyleFormatter.java 2001/01/22 21:56:39 1.1.2.5
+++ JstyleFormatter.java 2001/04/20 20:49:59 1.1.2.6
@@ -19,7 +19,7 @@
import org.apache.cocoon.components.language.programming.*;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class implements <code>CodeFormatter</code> based on
@@ -27,7 +27,7 @@
* beautifier. This implementation is very improvised...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/22 21:56:39 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:49:59 $
*/
public class JstyleFormatter implements CodeFormatter, Loggable {
protected Logger log;
No revision
No revision
1.1.2.5 +1 -2
xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java
Index: JaxpParser.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/JaxpParser.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JaxpParser.java 2001/04/19 16:59:47 1.1.2.4
+++ JaxpParser.java 2001/04/20 20:49:59 1.1.2.5
@@ -10,7 +10,6 @@
import java.io.IOException;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.cocoon.xml.dom.DOMFactory;
-import org.apache.avalon.ThreadSafe;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -29,7 +28,7 @@
* If only we can get rid of the need for the Document...
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/19 16:59:47 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:49:59 $
*/
public class JaxpParser extends AbstractXMLProducer
implements Parser, ErrorHandler {
1.1.2.12 +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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- Parser.java 2000/12/11 16:06:44 1.1.2.11
+++ Parser.java 2001/04/20 20:49:59 1.1.2.12
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.parser;
import java.io.IOException;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cocoon.xml.XMLProducer;
import org.apache.cocoon.xml.dom.DOMFactory;
import org.xml.sax.InputSource;
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/12/11 16:06:44 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/20 20:49:59 $
*/
public interface Parser extends Component, XMLProducer, DOMFactory {
No revision
No revision
1.1.2.5 +12 -12
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractEventPipeline.java 2001/04/19 11:30:37 1.1.2.4
+++ AbstractEventPipeline.java 2001/04/20 20:49:59 1.1.2.5
@@ -11,13 +11,13 @@
import java.util.Iterator;
import java.io.IOException;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentSelector;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -38,7 +38,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.4 $ $Date: 2001/04/19 11:30:37 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:49:59 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -58,7 +58,7 @@
protected ComponentManager manager;
public void compose (ComponentManager manager)
- throws ComponentManagerException {
+ throws ComponentException {
this.manager = manager;
generatorSelector = (ComponentSelector)
this.manager.lookup(Roles.GENERATORS);
transformerSelector =
(ComponentSelector)this.manager.lookup(Roles.TRANSFORMERS);
@@ -88,7 +88,7 @@
public Generator getGenerator() {
return this.generator;
}
-
+
public void addTransformer (String role, String source, Parameters param)
throws Exception {
this.transformers.add
((Transformer)transformerSelector.select(role));
@@ -221,7 +221,7 @@
"Could not connect pipeline.",
e
);
- } catch ( ComponentManagerException e ) {
+ } catch ( ComponentException e ) {
throw new ProcessingException(
"Could not connect pipeline.",
e
@@ -231,9 +231,9 @@
}
public void dispose() {
- if(generatorSelector != null)
+ if(generatorSelector != null)
manager.release((Component)generatorSelector);
- if(transformerSelector != null)
+ if(transformerSelector != null)
manager.release((Component)transformerSelector);
}
1.1.2.5 +12 -12
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractStreamPipeline.java 2001/04/20 11:27:05 1.1.2.4
+++ AbstractStreamPipeline.java 2001/04/20 20:50:00 1.1.2.5
@@ -10,14 +10,14 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentSelector;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -38,7 +38,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 11:27:05 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:00 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable
implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -60,14 +60,14 @@
/**
* Pass the <code>ComponentManager</code> to the <code>composer</code>.
- * The <code>Composer</code> implementation should use the specified
+ * The <code>Composable</code> implementation should use the specified
* <code>ComponentManager</code> to acquire the components it needs for
* execution.
*
* @param manager The <code>ComponentManager</code> which this
- * <code>Composer</code> uses.
- * @throws ComponentManagerException */
- public void compose (ComponentManager manager) throws
ComponentManagerException {
+ * <code>Composable</code> uses.
+ * @throws ComponentException */
+ public void compose (ComponentManager manager) throws ComponentException
{
this.manager = manager;
readerSelector = (SitemapComponentSelector)
this.manager.lookup(Roles.READERS);
serializerSelector = (SitemapComponentSelector)
this.manager.lookup(Roles.SERIALIZERS);
1.1.2.7 +8 -9
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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CachingEventPipeline.java 2001/04/19 11:30:38 1.1.2.6
+++ CachingEventPipeline.java 2001/04/20 20:50:00 1.1.2.7
@@ -13,13 +13,12 @@
import java.util.HashMap;
import java.io.IOException;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -57,7 +56,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.6 $ $Date: 2001/04/19 11:30:38 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/20 20:50:00 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -78,7 +77,7 @@
private int firstNotCacheableTransformerIndex;
public void compose (ComponentManager manager)
- throws ComponentManagerException {
+ throws ComponentException {
super.compose(manager);
this.eventCache = (EventCache)this.manager.lookup(Roles.EVENT_CACHE);
}
@@ -358,7 +357,7 @@
"Could not connect pipeline.",
e
);
- } catch ( ComponentManagerException e ) {
+ } catch ( ComponentException e ) {
throw new ProcessingException(
"Could not connect pipeline.",
e
1.1.2.6 +6 -6
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CachingStreamPipeline.java 2001/04/20 11:27:06 1.1.2.5
+++ CachingStreamPipeline.java 2001/04/20 20:50:00 1.1.2.6
@@ -16,10 +16,10 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.caching.Cacheable;
@@ -46,7 +46,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 11:27:06 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:00 $
*/
public final class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -60,7 +60,7 @@
private StreamCache streamCache;
public void compose (ComponentManager manager)
- throws ComponentManagerException {
+ throws ComponentException {
super.compose(manager);
this.streamCache =
(StreamCache)this.manager.lookup(Roles.STREAM_CACHE);
}
1.1.2.3 +6 -6
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EventPipeline.java 2001/04/19 11:30:39 1.1.2.2
+++ EventPipeline.java 2001/04/20 20:50:00 1.1.2.3
@@ -8,10 +8,10 @@
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Recyclable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
+import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Processor;
import org.apache.cocoon.environment.Environment;
@@ -19,9 +19,9 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/19 11:30:39 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:00 $
*/
-public interface EventPipeline extends Component, Composer, Recyclable,
Processor {
+public interface EventPipeline extends Component, Composable, Recyclable,
Processor {
public void setGenerator (String role, String source, Parameters param,
Exception e) throws Exception;
public void setGenerator (String role, String source, Parameters param)
throws Exception;
public Generator getGenerator ();
1.1.2.5 +5 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NonCachingEventPipeline.java 2001/04/11 12:41:21 1.1.2.4
+++ NonCachingEventPipeline.java 2001/04/20 20:50:00 1.1.2.5
@@ -11,12 +11,11 @@
import java.util.Iterator;
import java.io.IOException;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
@@ -36,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/11 12:41:21 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:00 $
*/
public class NonCachingEventPipeline extends AbstractEventPipeline {
1.1.2.2 +6 -6
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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StreamPipeline.java 2001/04/04 15:42:43 1.1.2.1
+++ StreamPipeline.java 2001/04/20 20:50:00 1.1.2.2
@@ -7,10 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.components.pipeline;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Recyclable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.Composable;
+import org.apache.excalibur.pool.Recyclable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Processor;
@@ -21,9 +21,9 @@
* <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.1 $ $Date: 2001/04/04 15:42:43 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:50:00 $
*/
-public interface StreamPipeline extends Component, Composer, Recyclable,
Processor {
+public interface StreamPipeline extends Component, Composable, Recyclable,
Processor {
public void setEventPipeline (EventPipeline eventPipeline) throws
Exception;
public EventPipeline getEventPipeline ();
No revision
No revision
1.1.2.4 +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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLByteStreamCompiler.java 2001/04/12 12:13:26 1.1.2.3
+++ XMLByteStreamCompiler.java 2001/04/20 20:50:01 1.1.2.4
@@ -9,8 +9,8 @@
import java.util.HashMap;
-import org.apache.avalon.Component;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.component.Component;
+import org.apache.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -24,7 +24,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.3 $ $Date: 2001/04/12 12:13:26 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:01 $
*/
public final class XMLByteStreamCompiler
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLByteStreamInterpreter.java 2001/04/12 12:13:26 1.1.2.2
+++ XMLByteStreamInterpreter.java 2001/04/20 20:50:02 1.1.2.3
@@ -11,8 +11,8 @@
import java.util.ArrayList;
-import org.apache.avalon.Component;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.component.Component;
+import org.apache.excalibur.pool.Recyclable;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
@@ -26,7 +26,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.2 $ $Date: 2001/04/12 12:13:26 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:02 $
*/
public final class XMLByteStreamInterpreter
1.1.2.2 +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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLTeePipe.java 2001/04/11 10:52:55 1.1.2.1
+++ XMLTeePipe.java 2001/04/20 20:50:02 1.1.2.2
@@ -10,7 +10,7 @@
package org.apache.cocoon.components.sax;
-import org.apache.avalon.Recyclable;
+import org.apache.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -28,7 +28,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.1 $ $Date: 2001/04/11 10:52:55 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:50:02 $
*/
public final class XMLTeePipe
No revision
No revision
1.1.2.3 +6 -6
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NullSAXConnector.java 2001/04/09 21:25:55 1.1.2.2
+++ NullSAXConnector.java 2001/04/20 20:50:02 1.1.2.3
@@ -3,8 +3,8 @@
package org.apache.cocoon.components.saxconnector;
import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -16,11 +16,11 @@
/**
* 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.2 $ $Date: 2001/04/09 21:25:55 $
+ * @author <a href="[EMAIL PROTECTED]">Paul Russell</a>
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:02 $
*/
-public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
-
+public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
+
/** Setup this SAXConnector.
*/
public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters params)
1.1.2.3 +3 -3
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SAXConnector.java 2001/04/09 21:25:55 1.1.2.2
+++ SAXConnector.java 2001/04/20 20:50:02 1.1.2.3
@@ -3,14 +3,14 @@
package org.apache.cocoon.components.saxconnector;
import org.xml.sax.XMLFilter;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLPipe;
/**
* Provides a connection between SAX components.
- * @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/09 21:25:55 $
+ * @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:02 $
*/
public interface SAXConnector extends XMLPipe, Component,
SitemapModelComponent {
}
No revision
No revision
1.1.2.14 +4 -4
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.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FilesystemStore.java 2001/03/16 22:02:37 1.1.2.13
+++ FilesystemStore.java 2001/04/20 20:50:03 1.1.2.14
@@ -5,10 +5,10 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.IOUtils;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.ThreadSafe;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Context;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.Context;
import java.io.IOException;
1.1.2.2 +37 -37
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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MRUMemoryStore.java 2001/04/18 15:14:27 1.1.2.1
+++ MRUMemoryStore.java 2001/04/20 20:50:03 1.1.2.2
@@ -5,18 +5,18 @@
import java.util.HashMap;
import java.util.Map;
import java.util.LinkedList;
-import org.apache.avalon.Component;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.thread.ThreadSafe;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.configuration.Configurable;
/**
* This class provides a cache algorithm for the requested documents.
* It combines a HashMap and a LinkedList to create a so called MRU
* (Most Recently Used) cache.
- * The cached objects also have a "lifecycle". If the "lifecycle" of a
+ * The cached objects also have a "lifecycle". If the "lifecycle" of a
* object is over, it "dies" like in real life :-) and a new object will
* be born.
* Also could the number of objects in the cache be limited. If the Limit is
@@ -27,8 +27,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Gerhard Froehlich</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- */
-
+ */
+
public class MRUMemoryStore implements Store, Configurable, ThreadSafe,
Runnable {
/**
* Indicates how much memory should be left free in the JVM for
@@ -44,9 +44,9 @@
/**
* Indicates the time in seconds to sleep between memory checks.
- */
+ */
private long interval;
-
+
/**
* Indicates whether we use a cleanup thread or not.
*/
@@ -56,26 +56,26 @@
* Indicates the daemon thread priority.
*/
private int priority;
-
+
/**
* Indicates the object lifetime
*/
private int ObjectLifeTime;
-
+
/**
* Indicates the max. object in the cache
*/
private int maxobjects;
-
-
+
+
/**
* The heart of the cache
*/
private HashMap cache;
private LinkedList mrulist;
-
+
private Runtime jvm;
-
+
public MRUMemoryStore() {
this.jvm = Runtime.getRuntime();
this.cache = new HashMap();
@@ -83,14 +83,14 @@
}
/**
- * Initialize the MRUMemoryStore.
+ * Initialize the MRUMemoryStore.
* A few options can be used :
* <UL>
* <LI>freememory = How much memory to keep free for normal jvm
operation. (Default: 1 Mb)</LI>
* <LI>heapsize = The size of the heap before cleanup starts. (Default:
60 Mb)</LI>
* <LI>usethread = use a cleanup daemon thread. (Default: true)</LI>
* <LI>threadpriority = priority to run cleanup thread (1-10). (Default:
10)</LI>
- * <LI>interval = time in seconds to sleep between memory checks
(Default: 10 seconds)</LI>
+ * <LI>interval = time in seconds to sleep between memory checks
(Default: 10 seconds)</LI>
* <LI>objectlifetime = Object lifetime in seconds
* </UL>
*/
@@ -104,11 +104,11 @@
this.interval = params.getParameterAsInteger("interval",10);
this.maxobjects = params.getParameterAsInteger("maxobjects",100);
this.priority =
params.getParameterAsInteger("threadpriority",Thread.currentThread().getPriority());
-
+
if ((this.priority < 1) || (this.priority > 10)) {
throw new ConfigurationException("Thread priority must be between
1 and 10");
}
-
+
this.useThread =
params.getParameter("usethread","true").equals("true");
if (this.useThread) {
Thread checker = new Thread(this);
@@ -117,9 +117,9 @@
checker.start();
}
}
-
- /**
- * Background memory check.
+
+ /**
+ * Background memory check.
* Checks that memory is not running too low in the JVM because of the
Store.
* It will try to keep overall memory usage below the requested levels.
*/
@@ -139,7 +139,7 @@
} catch (InterruptedException ignore) {}
}
}
-
+
/**
* Store the given object in a persistent state. It is up to the
* caller to ensure that the key has a persistent state across
@@ -148,7 +148,7 @@
public void store(Object key, Object value) {
this.hold(key,value);
}
-
+
/**
* This method holds the requested object in a HashMap combined with a
LinkedList to
* create the MRU.
@@ -161,9 +161,9 @@
}
/** ..put the new object in the cache, on the top of course ... */
this.cache.put(key, new CacheObject(value,System.currentTimeMillis()));
- this.mrulist.addFirst(key);
+ this.mrulist.addFirst(key);
}
-
+
/**
* Get the object associated to the given unique key.
*/
@@ -173,17 +173,17 @@
/** ...check if the object life time is reached... */
if(TimeDiff >= (this.ObjectLifeTime * 1000)) {
this.remove(key);
- return null;
+ return null;
}
/** put the accessed key on top of the linked list */
this.mrulist.remove(key);
- this.mrulist.addFirst(key);
+ this.mrulist.addFirst(key);
return ((CacheObject)this.cache.get(key)).getCacheObject();
} catch(NullPointerException e) {
- return null;
+ return null;
}
}
-
+
/**
* Remove the object associated to the given key and returns
* the object associated to the given key or null if not found.
@@ -192,7 +192,7 @@
this.cache.remove(key);
this.mrulist.remove(key);
}
-
+
/**
* Indicates if the given key is associated to a contained object.
*/
@@ -207,34 +207,34 @@
/* Not yet implemented */
return null;
}
-
+
/**
* Frees some of the fast memory used by this store.
* It removes the last element in the cache.
*/
- public void free() {
+ public void free() {
this.cache.remove(this.mrulist.getLast());
this.mrulist.removeLast();
}
-
+
/**
* Container object for the documents.
*/
class CacheObject {
private long time = -1;
private Object cacheObject;
-
+
public CacheObject(Object ToCacheObject, long lTime) {
this.cacheObject = ToCacheObject;
this.time = lTime;
}
-
+
public Object getCacheObject() {
return cacheObject;
}
-
+
public long getCreateTime() {
- return time;
+ return time;
}
}
}
1.1.2.6 +11 -11
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MemoryStore.java 2000/11/29 12:17:49 1.1.2.5
+++ MemoryStore.java 2001/04/20 20:50:03 1.1.2.6
@@ -9,8 +9,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.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.5 $ $Date: 2000/11/29 12:17:49 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:03 $
*/
public class MemoryStore implements Store, ThreadSafe {
/* WARNING: Hashtable is threadsafe, whereas HashMap is not.
@@ -28,10 +28,10 @@
* use Collections.synchronizedMap(Map map) to ensure
* accesses are synchronized.
*/
-
+
/** The shared store */
private static Hashtable table=null;
-
+
public MemoryStore() {
if (table==null) table=new Hashtable();
}
@@ -42,12 +42,12 @@
public Object get(Object key) {
return(table.get(key));
}
-
+
/**
* Store the given object in a persistent state. It is up to the
* caller to ensure that the key has a persistent state across
* different JVM executions.
- */
+ */
public void store(Object key, Object value) {
this.hold(key,value);
}
@@ -56,25 +56,25 @@
* Holds the given object in a volatile state. This means
* the object store will discard held objects if the
* virtual machine is restarted or some error happens.
- */
+ */
public void hold(Object key, Object value) {
table.put(key,value);
}
-
+
/**
* Remove the object associated to the given key.
*/
public void remove(Object key) {
table.remove(key);
}
-
+
/**
* Indicates if the given key is associated to a contained object.
*/
public boolean containsKey(Object key) {
return(table.containsKey(key));
}
-
+
/**
* Returns the list of used keys as an Enumeration of Objects.
*/
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Store.java 2001/02/16 15:38:31 1.1.2.8
+++ Store.java 2001/04/20 20:50:03 1.1.2.9
@@ -8,7 +8,7 @@
package org.apache.cocoon.components.store;
import java.util.Enumeration;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import java.io.IOException;
/**
@@ -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.8 $ $Date: 2001/02/16 15:38:31 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:50:03 $
*/
public interface Store extends Component {
No revision
No revision
1.1.2.6 +5 -5
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ContextURLFactory.java 2001/04/20 13:05:00 1.1.2.5
+++ ContextURLFactory.java 2001/04/20 20:50:04 1.1.2.6
@@ -10,22 +10,22 @@
import java.net.URL;
import java.net.MalformedURLException;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.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.5 2001/04/20 13:05:00
cziegeler Exp $
+ * @version $Id: ContextURLFactory.java,v 1.1.2.6 2001/04/20 20:50:04
bloritsch Exp $
*/
public class ContextURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
/**
* The context
*/
- protected org.apache.avalon.Context context;
+ protected org.apache.avalon.context.Context context;
/**
* Create a URL from a location. This method supports the
@@ -58,7 +58,7 @@
/**
* Get the context
*/
- public void contextualize(org.apache.avalon.Context context) {
+ public void contextualize(org.apache.avalon.context.Context context) {
if (this.context == null) {
this.context = context;
}
1.1.2.3 +4 -4
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ResourceURLFactory.java 2001/02/12 13:50:23 1.1.2.2
+++ ResourceURLFactory.java 2001/04/20 20:50:04 1.1.2.3
@@ -10,15 +10,15 @@
import java.net.URL;
import java.net.MalformedURLException;
-import org.apache.avalon.Context;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.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.2 2001/02/12 13:50:23
bloritsch Exp $
+ * @version $Id: ResourceURLFactory.java,v 1.1.2.3 2001/04/20 20:50:04
bloritsch Exp $
*/
public class ResourceURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
1.1.2.2 +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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- URLFactory.java 2001/02/12 13:33:16 1.1.2.1
+++ URLFactory.java 2001/04/20 20:50:04 1.1.2.2
@@ -10,11 +10,11 @@
import java.net.URL;
import java.net.MalformedURLException;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.thread.ThreadSafe;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactory.java,v 1.1.2.1 2001/02/12 13:33:16 giacomo Exp $
+ * @version $Id: URLFactory.java,v 1.1.2.2 2001/04/20 20:50:04 bloritsch Exp
$
*/
public interface URLFactory extends ThreadSafe {
1.1.2.7 +8 -8
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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- URLFactoryImpl.java 2001/03/12 04:38:50 1.1.2.6
+++ URLFactoryImpl.java 2001/04/20 20:50:04 1.1.2.7
@@ -14,14 +14,14 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.Component;
+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;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
//import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.Constants;
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.1.2.6 2001/03/12 04:38:50 bloritsch
Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.1.2.7 2001/04/20 20:50:04 bloritsch
Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
@@ -79,10 +79,10 @@
}
public URL getURL(URL base, String location) throws
MalformedURLException {
- if ( base != null ) {
+ if ( base != null ) {
return getURL(base.toExternalForm() + location);
} else {
- return getURL(location);
+ return getURL(location);
}
}
No revision
No revision
1.1.2.16 +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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- AbstractEnvironment.java 2001/04/20 11:27:10 1.1.2.15
+++ AbstractEnvironment.java 2001/04/20 20:50:05 1.1.2.16
@@ -18,7 +18,7 @@
import org.apache.cocoon.environment.Environment;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
No revision
No revision
1.1.2.12 +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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- AbstractGenerator.java 2001/04/04 15:42:44 1.1.2.11
+++ AbstractGenerator.java 2001/04/20 20:50:06 1.1.2.12
@@ -10,7 +10,7 @@
import java.util.Map;
import java.io.IOException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.cocoon.ProcessingException;
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/04 15:42:44 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/20 20:50:06 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
1.1.2.6 +5 -5
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ComposerGenerator.java 2000/10/19 14:43:47 1.1.2.5
+++ ComposerGenerator.java 2001/04/20 20:50:06 1.1.2.6
@@ -7,25 +7,25 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.Composer;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.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.5 $ $Date: 2000/10/19 14:43:47 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:06 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
-implements Composer {
+implements Composable {
/** The component manager instance */
protected ComponentManager manager=null;
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) {
this.manager=manager;
1.1.2.23 +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.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- DirectoryGenerator.java 2001/04/12 12:30:34 1.1.2.22
+++ DirectoryGenerator.java 2001/04/20 20:50:06 1.1.2.23
@@ -21,9 +21,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.avalon.Component;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -68,7 +68,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.22 $ $Date: 2001/04/12 12:30:34 $ */
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/20 20:50:06 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Poolable {
1.1.2.30 +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.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- FileGenerator.java 2001/04/13 16:02:23 1.1.2.29
+++ FileGenerator.java 2001/04/20 20:50:06 1.1.2.30
@@ -21,11 +21,11 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Component;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.component.Component;
/**
*
@@ -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.29 $ $Date: 2001/04/13 16:02:23 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/20 20:50:06 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable {
@@ -49,7 +49,7 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) {
super.compose(manager);
1.1.2.12 +4 -4
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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FragmentExtractorGenerator.java 2001/04/17 15:33:08 1.1.2.11
+++ FragmentExtractorGenerator.java 2001/04/20 20:50:06 1.1.2.12
@@ -17,8 +17,8 @@
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.HashUtil;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.pool.Poolable;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -41,9 +41,9 @@
* 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.11 $ $Date: 2001/04/17 15:33:08 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/20 20:50:06 $
*/
-public class FragmentExtractorGenerator extends AbstractGenerator
+public class FragmentExtractorGenerator extends AbstractGenerator
implements Poolable, Cacheable {
/** The fragment store. */
1.1.2.17 +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.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- HTMLGenerator.java 2001/04/12 12:30:34 1.1.2.16
+++ HTMLGenerator.java 2001/04/20 20:50:06 1.1.2.17
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.Component;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.component.Component;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.ProcessingException;
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/12 12:30:34 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/20 20:50:06 $
*/
public class HTMLGenerator extends ComposerGenerator implements Poolable {
1.1.2.20 +3 -3
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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- PhpGenerator.java 2001/04/20 12:03:25 1.1.2.19
+++ PhpGenerator.java 2001/04/20 20:50:07 1.1.2.20
@@ -18,8 +18,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import org.apache.avalon.Component;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.component.Component;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -35,7 +35,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/20 12:03:25 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/20 20:50:07 $
*/
public class PhpGenerator extends ServletGenerator implements Poolable {
1.1.2.12 +3 -3
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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- RequestGenerator.java 2001/03/30 17:14:33 1.1.2.11
+++ RequestGenerator.java 2001/04/20 20:50:07 1.1.2.12
@@ -13,7 +13,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
@@ -23,7 +23,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.11 $ $Date: 2001/03/30 17:14:33 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/20 20:50:07 $
*/
public class RequestGenerator extends ServletGenerator implements Poolable {
@@ -35,7 +35,7 @@
*/
public void generate()
throws SAXException {
-
+
Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
this.contentHandler.startDocument();
this.contentHandler.startPrefixMapping("",URI);
1.1.2.4 +3 -3
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ScriptGenerator.java 2001/04/12 12:30:34 1.1.2.3
+++ ScriptGenerator.java 2001/04/20 20:50:07 1.1.2.4
@@ -16,7 +16,7 @@
// Avalon imports
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -44,10 +44,10 @@
* 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.3 $ $Date: 2001/04/12 12:30:34 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:07 $
*/
public class ScriptGenerator extends ComposerGenerator {
-
+
public void configure(Configuration conf) throws ConfigurationException {
// TODO: figure out what configure might be good for
// void configure
1.1.2.23 +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.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- ServerPagesGenerator.java 2001/04/13 16:02:23 1.1.2.22
+++ ServerPagesGenerator.java 2001/04/20 20:50:07 1.1.2.23
@@ -19,13 +19,13 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
@@ -44,7 +44,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/13 16:02:23 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/20 20:50:07 $
*/
public class ServerPagesGenerator
extends ServletGenerator
1.1.2.15 +4 -4
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- ServletGenerator.java 2001/04/02 13:53:09 1.1.2.14
+++ ServletGenerator.java 2001/04/20 20:50:07 1.1.2.15
@@ -10,8 +10,8 @@
import java.util.Map;
import java.io.IOException;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Composer;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.component.Composable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
@@ -25,10 +25,10 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/02 13:53:09 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:50:07 $
*/
public abstract class ServletGenerator extends ComposerGenerator
-implements Composer {
+implements Composable {
protected Request request=null;
protected Response response=null;
1.1.2.11 +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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- StatusGenerator.java 2001/02/22 17:10:35 1.1.2.10
+++ StatusGenerator.java 2001/04/20 20:50:07 1.1.2.11
@@ -23,7 +23,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
/** Generates an XML representation of the current status of Cocoon.
* Potted DTD:
@@ -51,7 +51,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.10 $ $Date: 2001/02/22 17:10:35 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:50:07 $
*/
public class StatusGenerator extends ComposerGenerator implements Poolable {
1.1.2.4 +7 -6
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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- VelocityGenerator.java 2001/04/17 15:33:12 1.1.2.3
+++ VelocityGenerator.java 2001/04/20 20:50:07 1.1.2.4
@@ -7,8 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.Component;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentException;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -28,7 +29,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/17 15:33:12 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:07 $
*/
public class VelocityGenerator extends ServletGenerator implements Poolable {
@@ -70,8 +71,8 @@
/* lets render a template */
StringWriter w = new StringWriter();
Velocity.mergeTemplate(super.source, context, w );
-
- InputSource xmlInput =
+
+ InputSource xmlInput =
new InputSource(new StringReader(w.toString()));
parser.setContentHandler(this.contentHandler);
parser.setLexicalHandler(this.lexicalHandler);
@@ -82,7 +83,7 @@
} catch (SAXException e){
getLogger().error("VelocityGenerator.generate()", e);
throw(e);
- } catch (org.apache.avalon.ComponentManagerException e){
+ } catch (ComponentException e){
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
VelocityGenerator.generate()",e);
} catch (Exception e){
No revision
No revision
1.1.2.10 +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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Matcher.java 2000/12/15 20:35:12 1.1.2.9
+++ Matcher.java 2001/04/20 20:50:08 1.1.2.10
@@ -9,12 +9,12 @@
import java.util.Map;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/12/15 20:35:12 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/04/20 20:50:08 $
*/
public interface Matcher extends Component {
/**
1.1.2.13 +2 -2
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- RegexpTargetHostMatcherFactory.java 2001/03/23 19:38:17 1.1.2.12
+++ RegexpTargetHostMatcherFactory.java 2001/04/20 20:50:08 1.1.2.13
@@ -17,7 +17,7 @@
import org.w3c.dom.NodeList;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
/**
@@ -27,7 +27,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.12 $ $Date: 2001/03/23 19:38:17 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:50:08 $
*/
public class RegexpTargetHostMatcherFactory implements CodeFactory, Loggable
{
1.1.2.25 +2 -2
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.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- RegexpURIMatcherFactory.java 2001/03/23 19:38:18 1.1.2.24
+++ RegexpURIMatcherFactory.java 2001/04/20 20:50:08 1.1.2.25
@@ -18,7 +18,7 @@
import org.w3c.dom.NodeList;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class generates source code which represents a specific pattern
matcher
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/23 19:38:18 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/20 20:50:08 $
*/
public class RegexpURIMatcherFactory implements CodeFactory, Loggable {
1.1.2.33 +2 -2
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.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- WildcardURIMatcherFactory.java 2001/03/23 19:38:18 1.1.2.32
+++ WildcardURIMatcherFactory.java 2001/04/20 20:50:08 1.1.2.33
@@ -15,7 +15,7 @@
import org.w3c.dom.NodeList;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class generates source code which represents a specific pattern
matcher
@@ -24,7 +24,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.32 $ $Date: 2001/03/23 19:38:18 $
+ * @version CVS $Revision: 1.1.2.33 $ $Date: 2001/04/20 20:50:08 $
*/
public class WildcardURIMatcherFactory implements CodeFactory, Loggable {
No revision
No revision
1.1.2.17 +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.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- AbstractReader.java 2001/04/20 11:27:20 1.1.2.16
+++ AbstractReader.java 2001/04/20 20:50:09 1.1.2.17
@@ -17,14 +17,14 @@
import org.apache.cocoon.ProcessingException;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.excalibur.pool.Recyclable;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 11:27:20 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/20 20:50:09 $
*/
public abstract class AbstractReader extends AbstractLoggable implements
Reader, Recyclable {
/** The current <code>EntityResolver</code>. */
1.1.2.13 +7 -7
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DatabaseReader.java 2001/04/18 12:06:01 1.1.2.12
+++ DatabaseReader.java 2001/04/20 20:50:09 1.1.2.13
@@ -7,11 +7,11 @@
*****************************************************************************/
package org.apache.cocoon.reading;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentSelector;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
import org.apache.avalon.Disposable;
import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.configuration.Configurable;
@@ -46,7 +46,7 @@
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
*/
-public class DatabaseReader extends AbstractReader implements Composer,
Configurable, Disposable {
+public class DatabaseReader extends AbstractReader implements Composable,
Configurable, Disposable {
ComponentSelector dbselector;
String dsn;
@@ -56,7 +56,7 @@
* Compose the object so that we get the <code>Component</code>s we need
from
* the <code>ComponentManager</code>.
*/
- public void compose(ComponentManager manager) throws
ComponentManagerException {
+ public void compose(ComponentManager manager) throws ComponentException {
this.manager = manager;
this.dbselector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
}
1.1.2.30 +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.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- ResourceReader.java 2001/04/20 11:27:22 1.1.2.29
+++ ResourceReader.java 2001/04/20 20:50:10 1.1.2.30
@@ -33,11 +33,11 @@
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.util.HashUtil;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -45,7 +45,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/20 11:27:22 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/04/20 20:50:10 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
@@ -62,7 +62,7 @@
* </dl>
*/
public class ResourceReader extends AbstractReader
- implements Composer, Cacheable {
+ implements Composable, Cacheable {
private ComponentManager manager;
No revision
No revision
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Selector.java 2000/12/11 16:06:54 1.1.2.7
+++ Selector.java 2001/04/20 20:50:11 1.1.2.8
@@ -9,12 +9,12 @@
import java.util.Map;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:54 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:11 $
*/
public interface Selector extends Component {
/**
No revision
No revision
1.1.2.13 +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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- AbstractSerializer.java 2001/03/15 22:08:49 1.1.2.12
+++ AbstractSerializer.java 2001/04/20 20:50:11 1.1.2.13
@@ -10,14 +10,14 @@
import java.io.OutputStream;
import java.io.BufferedOutputStream;
-import org.apache.avalon.Recyclable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.AbstractXMLPipe;
/**
* @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.12 $ $Date: 2001/03/15 22:08:49 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/20 20:50:11 $
*/
public abstract class AbstractSerializer extends AbstractXMLPipe implements
Serializer, Recyclable {
1.1.2.16 +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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FOPSerializer.java 2001/04/17 10:33:19 1.1.2.15
+++ FOPSerializer.java 2001/04/20 20:50:11 1.1.2.16
@@ -12,7 +12,7 @@
import java.io.OutputStream;
import java.io.PrintWriter;
-import org.apache.avalon.Recyclable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Version;
@@ -34,7 +34,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.15 $ $Date: 2001/04/17 10:33:19 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:50:11 $
*
*/
public class FOPSerializer extends AbstractSerializer
1.1.2.19 +3 -3
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.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- HTMLSerializer.java 2001/04/17 15:33:20 1.1.2.18
+++ HTMLSerializer.java 2001/04/20 20:50:11 1.1.2.19
@@ -10,9 +10,9 @@
import java.io.OutputStream;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/17 15:33:20 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/20 20:50:11 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- LinkSerializer.java 2001/02/22 17:10:44 1.1.2.7
+++ LinkSerializer.java 2001/04/20 20:50:11 1.1.2.8
@@ -13,7 +13,7 @@
import java.io.IOException;
import org.apache.cocoon.Constants;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -22,7 +22,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/22 17:10:44 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:11 $
*/
public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
1.1.2.32 +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.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- SVGSerializer.java 2001/04/17 13:21:04 1.1.2.31
+++ SVGSerializer.java 2001/04/20 20:50:12 1.1.2.32
@@ -18,9 +18,9 @@
import org.apache.cocoon.components.transcoder.ExtendableTranscoderFactory;
import org.apache.cocoon.xml.*;
import org.apache.cocoon.xml.dom.*;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Composer;
-import org.apache.avalon.ComponentManager;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
@@ -41,10 +41,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/04/17 13:21:04 $
+ * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/04/20 20:50:12 $
*/
-public class SVGSerializer extends SVGBuilder
- implements Composer, Serializer, Configurable, Poolable, Cacheable {
+public class SVGSerializer extends SVGBuilder
+ implements Composable, Serializer, Configurable, Poolable, Cacheable
{
/** The <code>ContentHandler</code> receiving SAX events. */
private ContentHandler contentHandler=null;
@@ -158,7 +158,7 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) {
this.manager = manager;
1.1.2.14 +2 -2
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.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- TextSerializer.java 2001/03/12 10:57:22 1.1.2.13
+++ TextSerializer.java 2001/04/20 20:50:12 1.1.2.14
@@ -16,11 +16,11 @@
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/12 10:57:22 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/20 20:50:12 $
*/
public class TextSerializer extends AbstractTextSerializer implements
Poolable {
1.1.2.19 +2 -2
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.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- XMLSerializer.java 2001/03/15 22:08:50 1.1.2.18
+++ XMLSerializer.java 2001/04/20 20:50:12 1.1.2.19
@@ -16,11 +16,11 @@
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Poolable;
+import org.apache.excalibur.pool.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/03/15 22:08:50 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/04/20 20:50:12 $
*/
public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
No revision
No revision
1.1.4.86 +2 -2
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.85
retrieving revision 1.1.4.86
diff -u -r1.1.4.85 -r1.1.4.86
--- CocoonServlet.java 2001/04/20 17:32:16 1.1.4.85
+++ CocoonServlet.java 2001/04/20 20:50:13 1.1.4.86
@@ -32,7 +32,7 @@
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.DefaultContext;
+import org.apache.avalon.context.DefaultContext;
import org.apache.cocoon.Cocoon;
import org.apache.cocoon.Constants;
@@ -65,7 +65,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.85 $ $Date: 2001/04/20 17:32:16 $
+ * @version CVS $Revision: 1.1.4.86 $ $Date: 2001/04/20 20:50:13 $
*/
public class CocoonServlet extends HttpServlet {
No revision
No revision
1.1.2.34 +11 -10
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.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- AbstractSitemap.java 2001/04/17 18:18:50 1.1.2.33
+++ AbstractSitemap.java 2001/04/20 20:50:13 1.1.2.34
@@ -15,18 +15,19 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Context;
-import org.apache.avalon.Component;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.thread.ThreadSafe;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.Context;
+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.component.ComponentException;
import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.component.DefaultComponentSelector;
+import org.apache.excalibur.component.DefaultComponentSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
@@ -45,9 +46,9 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.33 $ $Date: 2001/04/17 18:18:50 $
+ * @version CVS $Revision: 1.1.2.34 $ $Date: 2001/04/20 20:50:13 $
*/
-public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable {
+public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable, ThreadSafe {
private Context context;
private static final int BYTE_ARRAY_SIZE = 1024;
@@ -74,7 +75,7 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) throws ComponentException
{
this.manager = manager;
1.1.2.3 +36 -36
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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ContentAggregator.java 2001/04/19 16:06:16 1.1.2.2
+++ ContentAggregator.java 2001/04/20 20:50:14 1.1.2.3
@@ -19,11 +19,11 @@
import org.xml.sax.Attributes;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -41,29 +41,29 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Id: ContentAggregator.java,v 1.1.2.2 2001/04/19 16:06:16
giacomo Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.1.2.3 2001/04/20 20:50:14
bloritsch Exp $
*/
-public class ContentAggregator extends ContentHandlerWrapper
- implements Generator, Cacheable, Composer {
+public class ContentAggregator extends ContentHandlerWrapper
+ implements Generator, Cacheable, Composable {
/** the current sitemap */
protected Sitemap sitemap;
-
+
/** the root sitemap */
protected Sitemap rootSitemap;
-
+
/** the root element of the aggregated content */
protected String rootElement;
-
+
/** the namespace of the root element */
protected String rootElementNS;
-
+
/** the elements of the parts */
protected ArrayList partElements = new ArrayList();
-
+
/** the namespaces of the parts */
protected ArrayList partNSs = new ArrayList();
-
+
/** the URIs of the parts */
protected ArrayList partURIs = new ArrayList();
@@ -102,24 +102,24 @@
/**
* Pass the <code>ComponentManager</code> to the <code>composer</code>.
- * The <code>Composer</code> implementation should use the specified
+ * The <code>Composable</code> implementation should use the specified
* <code>ComponentManager</code> to acquire the components it needs for
* execution.
*
* @param manager The <code>ComponentManager</code> which this
- * <code>Composer</code> uses.
+ * <code>Composable</code> uses.
*/
- public void compose(ComponentManager manager) throws
ComponentManagerException {
+ public void compose(ComponentManager manager) throws ComponentException {
if (this.manager == null) {
this.manager = manager;
}
}
-
+
/**
* generates the content
*/
public void generate() throws IOException, SAXException,
ProcessingException {
- getLogger().debug("ContentAggregator: generating aggregated
content");
+ getLogger().debug("ContentAggregator: generating aggregated
content");
collectParts();
this.documentHandler.startDocument();
this.startElem(this.rootElementNS, this.rootElement);
@@ -156,13 +156,13 @@
EventPipeline eventPipeline = null;
StreamPipeline pipeline = null;
for (int i = 0; i < this.partElements.size(); i++) {
- getLogger().debug("ContentAggregator: collecting internal
resource "
+ getLogger().debug("ContentAggregator: collecting internal
resource "
+ (String)this.partURIs.get(i));
try {
eventPipeline =
(EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
this.partEventPipelines.add(eventPipeline);
pipeline =
(StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
- } catch (ComponentManagerException cme) {
+ } catch (ComponentException cme) {
getLogger().error("ContentAggregator: could not lookup
pipeline components", cme);
throw new ProcessingException ("could not lookup
pipeline components", cme);
}
@@ -185,7 +185,7 @@
}
}
}
-
+
/**
* Generate the unique key.
* This key must be unique inside the space of this component.
@@ -217,19 +217,19 @@
//}
return null;
}
-
+
public void setEnvironment(Environment environment) {
this.environment = environment;
}
-
+
public void setSitemap(Sitemap sitemap) {
this.sitemap = sitemap;
}
-
+
public void setRootSitemap(Sitemap sitemap) {
this.rootSitemap = sitemap;
}
-
+
public void setRootElement(String element, String namespace) {
this.rootElement = element;
if (namespace == null) {
@@ -239,7 +239,7 @@
}
getLogger().debug("ContentAggregator: root element='" + element + "'
ns='" + namespace + "'");
}
-
+
public void addPart(String uri, String element, String namespace) {
if (namespace == null) {
this.partNSs.add("");
@@ -319,7 +319,7 @@
currentNS.add(ns);
return ns;
}
-
+
private String popNS() {
int last = currentNS.size()-1;
String ns = (String)currentNS.get(last);
@@ -327,12 +327,12 @@
currentNS.remove(last);
return ns;
}
-
+
private String getNS() {
int last = currentNS.size()-1;
return (String)currentNS.get(last);
}
-
+
private void startElem(String namespaceURI, String name) throws
SAXException {
this.pushNS(namespaceURI);
AttributesImpl attrs = new AttributesImpl();
@@ -342,7 +342,7 @@
}
this.documentHandler.startElement(namespaceURI, name, name, attrs);
}
-
+
private void endElem(String name) throws SAXException {
String ns = this.popNS();
this.documentHandler.endElement(ns, name, name);
@@ -350,27 +350,27 @@
this.documentHandler.endPrefixMapping("");
}
}
-
+
/**
* Ignore start and end document events
*/
public void startDocument () throws SAXException {
}
-
+
public void endDocument () throws SAXException {
}
public void startElement (String namespaceURI, String localName,
- String qName, Attributes atts) throws
SAXException {
+ String qName, Attributes atts) throws SAXException {
String ns = namespaceURI;
if (ns.equals("")) {
ns = (String)this.getNS();
- }
+ }
this.documentHandler.startElement(this.pushNS(ns), localName, qName,
atts);
}
public void endElement (String namespaceURI, String localName,
- String qName) throws SAXException {
+ String qName) throws SAXException {
this.documentHandler.endElement((String)this.popNS(), localName,
qName);
}
}
1.1.2.5 +3 -3
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ErrorNotifier.java 2001/03/02 15:55:13 1.1.2.4
+++ ErrorNotifier.java 2001/04/20 20:50:14 1.1.2.5
@@ -19,7 +19,7 @@
import org.apache.cocoon.generation.ComposerGenerator;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.thread.ThreadSafe;
/**
* Generates an XML representation of the current notification.
@@ -27,9 +27,9 @@
* @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.4 $ $Date: 2001/03/02 15:55:13 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:14 $
*/
-
+
public class ErrorNotifier extends ComposerGenerator {
/**
1.1.2.25 +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.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- Handler.java 2001/04/16 16:04:43 1.1.2.24
+++ Handler.java 2001/04/20 20:50:14 1.1.2.25
@@ -29,23 +29,23 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.Composer;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Context;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.Context;
+import org.apache.avalon.component.Component;
import org.apache.avalon.Disposable;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
/**
* Handles the manageing and stating of one <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/16 16:04:43 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/04/20 20:50:14 $
*/
-public class Handler extends AbstractLoggable implements Runnable,
Configurable, Composer, Contextualizable, Processor, Disposable {
+public class Handler extends AbstractLoggable implements Runnable,
Configurable, Composable, Contextualizable, Processor, Disposable {
private Context context;
/** the configuration */
@@ -165,7 +165,7 @@
throw new RuntimeException("The Sitemap is null, this should
never be!");
}
}
-
+
public void setBasePath (String basePath) {
this.basePath = basePath;
}
@@ -185,7 +185,7 @@
* XSLTFactoryLoader, since it is created by the Xalan engine.
*/
XSLTFactoryLoader.setLogger(getLogger());
-
+
programGenerator = (ProgramGenerator)
this.manager.lookup(Roles.PROGRAM_GENERATOR);
smap = (Sitemap) programGenerator.load(this.sourceFile,
markupLanguage, programmingLanguage, environment);
1.1.2.16 +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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- LinkTranslator.java 2001/03/30 17:14:38 1.1.2.15
+++ LinkTranslator.java 2001/04/20 20:50:14 1.1.2.16
@@ -17,7 +17,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
@@ -27,7 +27,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/30 17:14:38 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/04/20 20:50:14 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
1.1.2.15 +8 -8
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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Manager.java 2001/04/17 15:00:15 1.1.2.14
+++ Manager.java 2001/04/20 20:50:14 1.1.2.15
@@ -14,14 +14,14 @@
import java.util.Iterator;
import java.util.HashMap;
-import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Context;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
+import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.context.Context;
+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.Loggable;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
@@ -39,9 +39,9 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/17 15:00:15 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/04/20 20:50:14 $
*/
-public class Manager extends AbstractLoggable implements Configurable,
Composer, Contextualizable {
+public class Manager extends AbstractLoggable implements Configurable,
Composable, Contextualizable {
private Context context;
1.1.4.18 +5 -5
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.17
retrieving revision 1.1.4.18
diff -u -r1.1.4.17 -r1.1.4.18
--- Sitemap.java 2001/04/19 11:30:32 1.1.4.17
+++ Sitemap.java 2001/04/20 20:50:14 1.1.4.18
@@ -8,8 +8,8 @@
package org.apache.cocoon.sitemap;
import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Contextualizable;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.context.Contextualizable;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.pipeline.StreamPipeline;
@@ -21,7 +21,7 @@
* Base interface for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.4.17 $ $Date: 2001/04/19 11:30:32 $
+ * @version CVS $Revision: 1.1.4.18 $ $Date: 2001/04/20 20:50:14 $
*/
public interface Sitemap extends CompiledComponent, Configurable,
Contextualizable, Processor {
int GENERATOR = 1;
@@ -33,12 +33,12 @@
int SELECTOR = MATCHER << 1;
/**
- * Process the given <code>Environment</code>
+ * Process the given <code>Environment</code>
*/
boolean process(Environment environment) throws Exception;
/**
- * Process the given <code>Environment</code> assebling
+ * Process the given <code>Environment</code> assebling
* a <code>StreamPipeline</code> and an <code>EventPipeline</code>
*/
boolean process(Environment environment, StreamPipeline pipeline,
EventPipeline eventPipeline)
1.1.2.9 +5 -5
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- SitemapComponentSelector.java 2001/04/11 12:41:28 1.1.2.8
+++ SitemapComponentSelector.java 2001/04/20 20:50:14 1.1.2.9
@@ -10,20 +10,20 @@
import java.util.HashMap;
-import org.apache.avalon.Composer;
-import org.apache.avalon.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.DefaultComponentSelector;
+import org.apache.excalibur.component.DefaultComponentSelector;
import org.apache.cocoon.components.url.URLFactory;
/** 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.8 2001/04/11
12:41:28 donaldp Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.9 2001/04/20
20:50:14 bloritsch Exp $
*/
public class SitemapComponentSelector extends DefaultComponentSelector {
HashMap mime_types;
1.1.2.6 +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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SitemapModelComponent.java 2001/03/19 21:20:40 1.1.2.5
+++ SitemapModelComponent.java 2001/04/20 20:50:14 1.1.2.6
@@ -10,8 +10,8 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.Component;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.xml.sax.SAXException;
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/03/19 21:20:40 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/20 20:50:14 $
*/
public interface SitemapModelComponent extends Component {
1.1.2.4 +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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SitemapOutputComponent.java 2000/12/11 16:06:57 1.1.2.3
+++ SitemapOutputComponent.java 2001/04/20 20:50:14 1.1.2.4
@@ -10,12 +10,12 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/12/11 16:06:57 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/20 20:50:14 $
*/
public interface SitemapOutputComponent extends Component {
1.1.2.11 +3 -3
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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- XSLTFactoryLoader.java 2001/02/20 13:50:30 1.1.2.10
+++ XSLTFactoryLoader.java 2001/04/20 20:50:14 1.1.2.11
@@ -16,7 +16,7 @@
import org.w3c.dom.NodeList;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class is used as a XSLT extension class. It is used by the sitemap
@@ -28,7 +28,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.10 $ $Date: 2001/02/20 13:50:30 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:50:14 $
*/
public class XSLTFactoryLoader {
@@ -71,7 +71,7 @@
if (factory instanceof CodeFactory) {
return ((CodeFactory) factory).generateParameterSource(conf);
}
-
+
throw new Exception ("Wrong class \"" + factory.getClass().getName()
+ "\". Should implement the CodeFactory
interface");
}
No revision
No revision
1.1.2.9 +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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractDOMTransformer.java 2001/04/13 16:02:26 1.1.2.8
+++ AbstractDOMTransformer.java 2001/04/20 20:50:17 1.1.2.9
@@ -15,10 +15,10 @@
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.Roles;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.parameters.Parameters;
import org.apache.avalon.Disposable;
/**
@@ -33,7 +33,7 @@
* @version CVS $Revision $Date
*/
public abstract class AbstractDOMTransformer extends DOMBuilder
- implements Transformer, DOMBuilder.Listener, Composer, Disposable {
+ implements Transformer, DOMBuilder.Listener, Composable, Disposable {
/** The SAX entity resolver */
protected EntityResolver resolver;
1.1.2.9 +10 -10
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FragmentExtractorTransformer.java 2001/04/17 15:33:29 1.1.2.8
+++ FragmentExtractorTransformer.java 2001/04/20 20:50:17 1.1.2.9
@@ -17,11 +17,11 @@
import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.generation.FragmentExtractorGenerator;
import org.apache.cocoon.ProcessingException;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Component;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Component;
import org.apache.avalon.Disposable;
import org.xml.sax.SAXException;
@@ -45,10 +45,10 @@
* <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.8 $ $Date: 2001/04/17 15:33:29 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/20 20:50:17 $
*/
-public class FragmentExtractorTransformer extends AbstractTransformer
- implements Composer, Disposable, Cacheable {
+public class FragmentExtractorTransformer extends AbstractTransformer
+ implements Composable, Disposable, Cacheable {
private static String EXTRACT_URI="http://www.w3.org/2000/svg";;
private static String EXTRACT_ELEMENT="svg";
@@ -69,8 +69,8 @@
private DOMFactory documentFactory;
- public void compose(ComponentManager manager)
- throws ComponentManagerException{
+ public void compose(ComponentManager manager)
+ throws ComponentException{
this.manager = manager;
documentFactory = (DOMFactory) manager.lookup(Roles.PARSER);
}
1.1.2.13 +11 -11
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- I18nTransformer.java 2001/04/12 12:30:36 1.1.2.12
+++ I18nTransformer.java 2001/04/20 20:50:17 1.1.2.13
@@ -15,13 +15,13 @@
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Loggable;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.logger.Loggable;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
@@ -105,7 +105,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a>
*/
-public class I18nTransformer extends AbstractTransformer implements
Composer, Poolable {
+public class I18nTransformer extends AbstractTransformer implements
Composable, Poolable {
protected ComponentManager manager;
@@ -311,7 +311,7 @@
Object object = url.getContent();
Parser parser = null;
- try
+ try
{
parser = (Parser)(manager.lookup(Roles.PARSER));
InputSource input;
@@ -340,9 +340,9 @@
} catch(IOException e) {
getLogger().error("Error in initialiseDictionary", e);
throw e;
- } catch(ComponentManagerException e) {
+ } catch(ComponentException e) {
getLogger().error("Error in initialiseDictionary", e);
- throw new SAXException("ComponentManagerException in
initialiseDictionary");
+ throw new SAXException("ComponentException in
initialiseDictionary");
} finally {
if(parser != null) this.manager.release((Component) parser);
}
1.1.2.18 +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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- LogTransformer.java 2001/03/19 21:20:46 1.1.2.17
+++ LogTransformer.java 2001/04/20 20:50:17 1.1.2.18
@@ -7,8 +7,8 @@
*****************************************************************************/
package org.apache.cocoon.transformation;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.pool.Poolable;
import org.apache.cocoon.ProcessingException;
@@ -46,7 +46,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/03/19 21:20:46 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/20 20:50:17 $
*
*/
public class LogTransformer extends AbstractTransformer implements Poolable {
1.1.2.24 +13 -13
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.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- SQLTransformer.java 2001/04/17 03:55:17 1.1.2.23
+++ SQLTransformer.java 2001/04/20 20:50:17 1.1.2.24
@@ -20,14 +20,14 @@
import java.util.Enumeration;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Component;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.ComponentSelector;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.component.Component;
+import org.apache.excalibur.pool.Poolable;
import org.apache.avalon.Disposable;
import org.apache.excalibur.datasource.DataSourceComponent;
@@ -50,10 +50,10 @@
* @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.23 $ $Date: 2001/04/17 03:55:17 $ $Author:
donaldp $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/04/20 20:50:17 $ $Author:
bloritsch $
*/
-public class SQLTransformer extends AbstractTransformer implements Composer,
Loggable, Poolable, Disposable {
+public class SQLTransformer extends AbstractTransformer implements
Composable, Loggable, Poolable, Disposable {
private Logger log;
@@ -112,7 +112,7 @@
try {
this.manager = manager;
this.dbSelector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
- } catch (ComponentManagerException cme) {
+ } catch (ComponentException cme) {
this.log.warn("Could not get the DataSource Selector", cme);
}
}
@@ -544,7 +544,7 @@
} catch (SQLException e) {
log.error("Caught a SQLException", e);
throw e;
- } catch (ComponentManagerException cme) {
+ } catch (ComponentException cme) {
log.error("Could not use connection: " + connection, cme);
} finally {
conn.close();
@@ -643,7 +643,7 @@
/**
- * dispose
+ * dispose
*/
public void dispose() {
if(this.dbSelector != null) this.manager.release((Component)
this.dbSelector);
1.1.2.23 +15 -15
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.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- TraxTransformer.java 2001/04/20 14:48:30 1.1.2.22
+++ TraxTransformer.java 2001/04/20 20:50:17 1.1.2.23
@@ -21,17 +21,17 @@
import org.apache.cocoon.environment.Request;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.logger.Loggable;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.Parameters;
+import org.apache.avalon.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
@@ -68,10 +68,10 @@
* (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.22 $ $Date: 2001/04/20 14:48:30 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/20 20:50:17 $
*/
public class TraxTransformer extends ContentHandlerWrapper
-implements Transformer, Composer, Recyclable, Configurable, Cacheable,
Disposable {
+implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable {
private static String FILE = "file:/";
/** The store service instance */
@@ -168,7 +168,7 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) {
try {
@@ -223,10 +223,10 @@
*/
public CacheValidity generateValidity() {
HashMap map = getLogicSheetParameters();
-
+
if (this.systemID.startsWith("file:") == true) {
File xslFile = new
File(this.systemID.substring("file:".length()));
- return new CompositeCacheValidity(
+ return new CompositeCacheValidity(
new ParametersCacheValidity(map),
new
TimeStampCacheValidity(xslFile.lastModified())
);
@@ -319,9 +319,9 @@
//
// /* Get the user agent; it's needed to get the browser type. */
// String agent = request.getParameter("user-Agent");
-// if (agent == null)
+// if (agent == null)
// agent = request.getHeader("user-Agent");
-//
+//
// /* add the accept param */
// transformerHandler.getTransformer().setParameter("accept",
accept);
//
@@ -395,7 +395,7 @@
return true;
}
- public void dispose()
+ public void dispose()
{
if(this.store != null)
this.manager.release((Component)this.store);
1.1.2.27 +13 -13
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.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- XIncludeTransformer.java 2001/04/13 16:02:27 1.1.2.26
+++ XIncludeTransformer.java 2001/04/20 20:50:17 1.1.2.27
@@ -27,15 +27,15 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import org.w3c.dom.Document;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Composer;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.ComponentException;
+import org.apache.avalon.component.Composable;
+import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.excalibur.pool.Poolable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Component;
+import org.apache.avalon.component.Component;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
@@ -53,9 +53,9 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/13 16:02:27 $ $Author:
dims $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/20 20:50:17 $ $Author:
bloritsch $
*/
-public class XIncludeTransformer extends AbstractTransformer implements
Composer, Poolable, Disposable {
+public class XIncludeTransformer extends AbstractTransformer implements
Composable, Poolable, Disposable {
protected URLFactory urlFactory;
@@ -226,7 +226,7 @@
} else if (parse.equals("xml")) {
getLogger().debug("Parse type is XML");
Parser parser = null;
- try
+ try
{
getLogger().debug("Looking up " + Roles.PARSER);
parser = (Parser)manager.lookup(Roles.PARSER);
@@ -278,9 +278,9 @@
} catch(IOException e) {
getLogger().error("Error in processXIncludeElement", e);
throw e;
- } catch(ComponentManagerException e) {
+ } catch(ComponentException e) {
getLogger().error("Error in processXIncludeElement", e);
- throw new SAXException("ComponentManagerException in
processXIncludeElement");
+ throw new SAXException("ComponentException in
processXIncludeElement");
} finally {
if(parser != null) this.manager.release((Component) parser);
}
1.1.2.21 +10 -10
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.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- XTTransformer.java 2001/04/13 16:02:27 1.1.2.20
+++ XTTransformer.java 2001/04/20 20:50:18 1.1.2.21
@@ -17,13 +17,13 @@
import org.apache.cocoon.environment.Request;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.Component;
-import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Composer;
+import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.component.Composable;
import org.apache.avalon.Modifiable;
-import org.apache.avalon.configuration.Parameters;
-import org.apache.avalon.Poolable;
+import org.apache.avalon.parameters.Parameters;
+import org.apache.excalibur.pool.Poolable;
import org.apache.avalon.Disposable;
import org.apache.cocoon.Constants;
@@ -72,10 +72,10 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/04/13 16:02:27 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/20 20:50:18 $
*/
public class XTTransformer extends DocumentHandlerWrapper
-implements Transformer, Composer, Loggable, Poolable, Disposable {
+implements Transformer, Composable, Loggable, Poolable, Disposable {
private Logger log;
/** The component manager */
@@ -98,7 +98,7 @@
/**
* Set the current <code>ComponentManager</code> instance used by this
- * <code>Composer</code>.
+ * <code>Composable</code>.
*/
public void compose(ComponentManager manager) {
this.manager = manager;
@@ -293,7 +293,7 @@
* The XT processor.
*/
-class XTProcessor implements Cloneable, ParameterSet, Modifiable, Loggable,
Composer {
+class XTProcessor implements Cloneable, ParameterSet, Modifiable, Loggable,
Composable {
protected Logger log;
private XMLProcessorEx sheetLoader;
No revision
No revision
1.1.2.2 +3 -3
xml-cocoon/src/org/apache/cocoon/util/url/Attic/CocoonURLStreamHandlerFactory.java
Index: CocoonURLStreamHandlerFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/Attic/CocoonURLStreamHandlerFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CocoonURLStreamHandlerFactory.java 2001/01/31 15:03:58 1.1.2.1
+++ CocoonURLStreamHandlerFactory.java 2001/04/20 20:50:18 1.1.2.2
@@ -11,15 +11,15 @@
import java.net.URLStreamHandlerFactory;
import java.net.URLStreamHandler;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class implements the Factory for URLStreamHandlers
*
* @author: <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/01/31 15:03:58 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/20 20:50:18 $
*/
public class CocoonURLStreamHandlerFactory extends AbstractLoggable
implements URLStreamHandlerFactory {
No revision
No revision
1.1.2.3 +2 -2
xml-cocoon/src/org/apache/cocoon/util/url/resource/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/resource/Attic/Handler.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Handler.java 2001/03/12 05:55:27 1.1.2.2
+++ Handler.java 2001/04/20 20:50:19 1.1.2.3
@@ -14,7 +14,7 @@
import java.io.IOException;
import java.io.FileNotFoundException;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
/**
@@ -22,7 +22,7 @@
*
* @author: <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @author: <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/12 05:55:27 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/20 20:50:19 $
*/
public class Handler extends URLStreamHandler implements Loggable {
private Logger log;
No revision
No revision
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- AbstractXMLConsumer.java 2001/02/12 14:17:47 1.1.2.7
+++ AbstractXMLConsumer.java 2001/04/20 20:50:19 1.1.2.8
@@ -14,7 +14,7 @@
import org.xml.sax.ext.LexicalHandler;
import org.apache.log.Logger;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* This abstract class provides default implementation of the methods
specified
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/12 14:17:47 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:19 $
*/
public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
1.1.2.11 +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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractXMLProducer.java 2001/04/04 15:42:47 1.1.2.10
+++ AbstractXMLProducer.java 2001/04/20 20:50:19 1.1.2.11
@@ -10,8 +10,8 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.excalibur.pool.Recyclable;
/**
* This abstract class provides default implementation of the methods
specified
@@ -19,7 +19,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/04 15:42:47 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:50:19 $
*/
public abstract class AbstractXMLProducer extends AbstractLoggable
implements XMLProducer, Recyclable {
1.1.2.8 +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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ContentHandlerWrapper.java 2001/04/19 11:30:44 1.1.2.7
+++ ContentHandlerWrapper.java 2001/04/20 20:50:19 1.1.2.8
@@ -11,7 +11,7 @@
import java.util.Vector;
import org.apache.cocoon.xml.AbstractXMLConsumer;
-import org.apache.avalon.Recyclable;
+import org.apache.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* (Apache Software Foundation, Computer Associates)
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/19 11:30:44 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/20 20:50:19 $
*/
public class ContentHandlerWrapper extends AbstractXMLConsumer implements
Recyclable {
1.1.2.5 +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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DocumentHandlerWrapper.java 2001/01/22 21:56:55 1.1.2.4
+++ DocumentHandlerWrapper.java 2001/04/20 20:50:19 1.1.2.5
@@ -10,7 +10,7 @@
import java.util.Vector;
-import org.apache.avalon.Recyclable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.AbstractXMLConsumer;
import org.apache.cocoon.xml.NamespacesTable;
@@ -21,7 +21,7 @@
import org.xml.sax.helpers.AttributeListImpl;
import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
/**
* This class is an utility class "wrapping" around a SAX version
1.0
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/22 21:56:55 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:19 $
*/
public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
Loggable /*, Recyclable*/ {
1.1.2.2 +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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LoggingEntityResolver.java 2001/04/03 20:59:47 1.1.2.1
+++ LoggingEntityResolver.java 2001/04/20 20:50:19 1.1.2.2
@@ -5,7 +5,7 @@
import org.xml.sax.SAXException;
import java.io.IOException;
import org.apache.log.Logger;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
No revision
No revision
1.1.2.11 +7 -7
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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- DOMBuilder.java 2001/02/09 11:49:40 1.1.2.10
+++ DOMBuilder.java 2001/04/20 20:50:20 1.1.2.11
@@ -31,7 +31,7 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
/**
@@ -40,7 +40,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/09 11:49:40 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/20 20:50:20 $
*/
public class DOMBuilder implements XMLConsumer, Loggable {
protected Logger log;
@@ -243,10 +243,10 @@
"'"+location());
// Recreate the document since no DTD was specified
} else {
- /* DISABLED pending us tracking down what's
causing document
- * hierachy errors when we do this. This may
well break people's
- * code, but hopefully that will provide some
enlightenment
- * anyhow.
+ /* DISABLED pending us tracking down what's causing document
+ * hierachy errors when we do this. This may well break
people's
+ * code, but hopefully that will provide some enlightenment
+ * anyhow.
// Recreate the document element
Document doc=this.factory.newDocument(n.getQName());
// Copy the old document root PIs
@@ -257,7 +257,7 @@
}
// Declare the new document as the new real document
this.document=doc;
- */
+ */
this.current=this.document;
}
// Change the state before continuing
1.1.2.5 +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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SVGBuilder.java 2001/01/22 21:56:56 1.1.2.4
+++ SVGBuilder.java 2001/04/20 20:50:20 1.1.2.5
@@ -30,7 +30,7 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.logger.Loggable;
import org.apache.log.Logger;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
@@ -42,7 +42,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.4 $ $Date: 2001/01/22 21:56:56 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/20 20:50:20 $
*/
public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
protected Logger log;
No revision
No revision
1.1.2.41 +4 -4 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.40
retrieving revision 1.1.2.41
diff -u -r1.1.2.40 -r1.1.2.41
--- cocoon.xconf 2001/04/20 10:50:02 1.1.2.40
+++ cocoon.xconf 2001/04/20 20:50:20 1.1.2.41
@@ -105,7 +105,7 @@
</datasources>
<!-- these components is used as a PoolController for the sitemap
component pools -->
- <pool-controller
class="org.apache.avalon.component.DefaultComponentPoolController"/>
+ <pool-controller
class="org.apache.excalibur.component.DefaultComponentPoolController"/>
<sax-connector
class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
@@ -120,7 +120,7 @@
it is set to "no", the sitemap is generated once at startup, if it
is set to "yes",
the sitemap is regenerated if it changes.
The reload-method specifies the method for the regeneration:
- asynchron: If the sitemap changes, the sitemap is regenerated at the
next request in
+ asynchron: If the sitemap changes, the sitemap is regenerated at the
next request in
the background and the incoming request is served
with the old sitemap.
All subsequent requests are served with the old
sitemap until the
regeneration in the background has finished.
@@ -129,8 +129,8 @@
is served with the new sitemap.
For development environment set the reload-method to synchron and the
- check-reload to yes, for production environment it is advisable to
set
- the reload-method to asynchron and for more safety the check-reload
to no.
+ check-reload to yes, for production environment it is advisable to
set
+ the reload-method to asynchron and for more safety the check-reload
to no.
-->
<sitemap file="sitemap.xmap" reload-method="asynchron" check-reload="yes"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
