bloritsch 01/04/05 13:15:39
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 GeneratorSelector.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java SitemapComponentSelector.java
webapp Tag: xml-cocoon2 cocoon.xconf
Removed: src/org/apache/cocoon/components Tag: xml-cocoon2
ComponentFactory.java ComponentHandler.java
ComponentManager.java ComponentPool.java
ComponentPoolController.java ComponentSelector.java
DefaultRoleInfo.java RoleInfo.java
Log:
Completed migration of Cocoon's Component Handling infrastructure to
Avalon. NOTE: this means wider audience which means more will go into
its stability and robustness.
Revision Changes Path
No revision
No revision
1.1.2.33 +258 -200 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.4.2.68 +4 -4 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.67
retrieving revision 1.4.2.68
diff -u -r1.4.2.67 -r1.4.2.68
--- Cocoon.java 2001/04/05 15:40:35 1.4.2.67
+++ Cocoon.java 2001/04/05 20:15:26 1.4.2.68
@@ -34,7 +34,7 @@
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.cocoon.components.ComponentManager;
+import org.apache.avalon.component.DefaultComponentManager;
import org.apache.avalon.AbstractLoggable;
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
@@ -48,7 +48,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.67 $ $Date: 2001/04/05 15:40:35 $
+ * @version CVS $Revision: 1.4.2.68 $ $Date: 2001/04/05 20:15:26 $
*/
public class Cocoon extends AbstractLoggable implements Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -73,7 +73,7 @@
private File workDir;
/** The component manager. */
- private ComponentManager componentManager;
+ private DefaultComponentManager componentManager;
/** flag for disposed or not */
private boolean disposed = false;
@@ -94,7 +94,7 @@
}
public void init() throws Exception {
- this.componentManager = new ComponentManager();
+ this.componentManager = new DefaultComponentManager();
this.componentManager.setLogger(getLogger());
this.componentManager.contextualize(this.context);
No revision
No revision
1.1.2.8 +3 -3
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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- GeneratorSelector.java 2001/04/05 15:40:37 1.1.2.7
+++ GeneratorSelector.java 2001/04/05 20:15:33 1.1.2.8
@@ -17,7 +17,7 @@
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.components.ComponentSelector;
+import org.apache.avalon.component.DefaultComponentSelector;
import org.apache.cocoon.util.ClassUtils;
/**
@@ -25,9 +25,9 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/05 15:40:37 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/04/05 20:15:33 $
*/
-public class GeneratorSelector extends ComponentSelector {
+public class GeneratorSelector extends DefaultComponentSelector {
private ClassLoaderManager classManager;
public void compose (ComponentManager manager) throws
ComponentManagerException {
No revision
No revision
1.1.2.29 +12 -12
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.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- AbstractSitemap.java 2001/04/05 15:40:37 1.1.2.28
+++ AbstractSitemap.java 2001/04/05 20:15:35 1.1.2.29
@@ -25,8 +25,8 @@
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.component.DefaultComponentSelector;
-import org.apache.cocoon.components.ComponentSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.Roles;
@@ -41,7 +41,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/05 15:40:37 $
+ * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/04/05 20:15:35 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap {
private Context context;
@@ -60,13 +60,13 @@
/** The creation date */
protected static long dateCreated = -1L;
- protected ComponentSelector generators;
- protected ComponentSelector transformers;
+ protected DefaultComponentSelector generators;
+ protected DefaultComponentSelector transformers;
protected SitemapComponentSelector serializers;
protected SitemapComponentSelector readers;
- protected ComponentSelector actions;
- protected ComponentSelector matchers;
- protected ComponentSelector selectors;
+ protected DefaultComponentSelector actions;
+ protected DefaultComponentSelector matchers;
+ protected DefaultComponentSelector selectors;
/**
* Set the current <code>ComponentManager</code> instance used by this
@@ -77,13 +77,13 @@
try {
this.urlFactory = (URLFactory)
this.manager.lookup(Roles.URL_FACTORY);
- this.generators = (ComponentSelector)
this.manager.lookup(Roles.GENERATORS);
- this.transformers = (ComponentSelector)
this.manager.lookup(Roles.TRANSFORMERS);
+ this.generators = (DefaultComponentSelector)
this.manager.lookup(Roles.GENERATORS);
+ this.transformers = (DefaultComponentSelector)
this.manager.lookup(Roles.TRANSFORMERS);
this.serializers = (SitemapComponentSelector)
this.manager.lookup(Roles.SERIALIZERS);
this.readers = (SitemapComponentSelector)
this.manager.lookup(Roles.READERS);
- this.actions = (ComponentSelector)
this.manager.lookup(Roles.ACTIONS);
- this.matchers = (ComponentSelector)
this.manager.lookup(Roles.MATCHERS);
- this.selectors = (ComponentSelector)
this.manager.lookup(Roles.SELECTORS);
+ this.actions = (DefaultComponentSelector)
this.manager.lookup(Roles.ACTIONS);
+ this.matchers = (DefaultComponentSelector)
this.manager.lookup(Roles.MATCHERS);
+ this.selectors = (DefaultComponentSelector)
this.manager.lookup(Roles.SELECTORS);
} catch (Exception e) {
getLogger().error("cannot obtain the Component", e);
throw new ComponentNotFoundException ("cannot obtain the
URLFactory", e);
1.1.2.7 +3 -3
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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SitemapComponentSelector.java 2001/04/05 15:40:37 1.1.2.6
+++ SitemapComponentSelector.java 2001/04/05 20:15:36 1.1.2.7
@@ -17,16 +17,16 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
-import org.apache.cocoon.components.ComponentSelector;
+import org.apache.avalon.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.6 2001/04/05
15:40:37 giacomo Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.7 2001/04/05
20:15:36 bloritsch Exp $
*/
-public class SitemapComponentSelector extends ComponentSelector {
+public class SitemapComponentSelector extends DefaultComponentSelector {
HashMap mime_types;
/** The conctructors (same as the Avalon ComponentManager)
No revision
No revision
1.1.2.31 +10 -10 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.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- cocoon.xconf 2001/04/05 16:57:13 1.1.2.30
+++ cocoon.xconf 2001/04/05 20:15:38 1.1.2.31
@@ -89,7 +89,7 @@
</datasources>
<!-- these components is used as a PoolController for the sitemap
component pools -->
- <pool-controller
class="org.apache.cocoon.components.ComponentPoolController"/>
+ <pool-controller
class="org.apache.avalon.component.DefaultComponentPoolController"/>
<sax-connector
class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
@@ -124,11 +124,11 @@
<role
name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
shorthand="markup-languages"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
shorthand="programming-languages"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role
name="org.apache.cocoon.components.language.generator.ProgramGenerator"
shorthand="program-generator"
@@ -140,7 +140,7 @@
<role name="org.apache.avalon.util.pool.PoolController"
shorthand="pool-controller"
- default-class="org.apache.cocoon.components.ComponentPoolController"/>
+
default-class="org.apache.avalon.component.DefaultComponentPoolController"/>
<role name="org.apache.cocoon.components.saxconnector.SAXConnector"
shorthand="sax-connector"
@@ -151,7 +151,7 @@
<role name="org.apache.avalon.util.datasource.DataSourceComponentSelector"
shorthand="datasources"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.components.url.URLFactory"
shorthand="url-factory"
@@ -167,23 +167,23 @@
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="action"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selector"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matcher"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generator"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformer"
- default-class="org.apache.cocoon.components.ComponentSelector"/>
+ default-class="org.apache.avalon.component.DefaultComponentSelector"/>
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializer"
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
