giacomo 01/04/05 08:40:38
Modified: . Tag: xml-cocoon2 changes.xml
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
Added: src/org/apache/cocoon/components Tag: xml-cocoon2
ComponentHandler.java ComponentManager.java
ComponentSelector.java DefaultRoleInfo.java
RoleInfo.java
Removed: src/org/apache/cocoon/components Tag: xml-cocoon2
CocoonComponentHandler.java
CocoonComponentManager.java
CocoonComponentSelector.java
src/org/apache/cocoon/util Tag: xml-cocoon2 RoleUtils.java
Log:
Throwing stones :)
Decoupled the component management system from the implementation
specific RoleUtils class using the RoleInfo interface and the
DefaultRoleInfo class proposed by Ricardo Rocha.
Revision Changes Path
No revision
No revision
1.9.2.29 +5 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.9.2.28
retrieving revision 1.9.2.29
diff -u -r1.9.2.28 -r1.9.2.29
--- changes.xml 2001/04/05 13:44:51 1.9.2.28
+++ changes.xml 2001/04/05 15:40:35 1.9.2.29
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.9.2.28 2001/04/05 13:44:51 bloritsch Exp $
+ $Id: changes.xml,v 1.9.2.29 2001/04/05 15:40:35 giacomo Exp $
-->
<changes title="History of Changes">
@@ -23,6 +23,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="GP" type="update">
+ Decoupled the RoleUtils class from the component management system.
+ Implemented RoleInfo proposed by Ricardo Rocha
+ </action>
<action dev="GP" type="update">
Split up ResourcePipeline into the Component EventPipeline and
StreamPipeline
and put them in the components package.
No revision
No revision
1.4.2.67 +5 -5 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.66
retrieving revision 1.4.2.67
diff -u -r1.4.2.66 -r1.4.2.67
--- Cocoon.java 2001/03/19 17:08:31 1.4.2.66
+++ Cocoon.java 2001/04/05 15:40:35 1.4.2.67
@@ -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.CocoonComponentManager;
+import org.apache.cocoon.components.ComponentManager;
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.66 $ $Date: 2001/03/19 17:08:31 $
+ * @version CVS $Revision: 1.4.2.67 $ $Date: 2001/04/05 15:40:35 $
*/
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 CocoonComponentManager componentManager;
+ private ComponentManager componentManager;
/** flag for disposed or not */
private boolean disposed = false;
@@ -94,9 +94,9 @@
}
public void init() throws Exception {
- this.componentManager = new CocoonComponentManager();
- this.componentManager.contextualize(this.context);
+ this.componentManager = new ComponentManager();
this.componentManager.setLogger(getLogger());
+ this.componentManager.contextualize(this.context);
getLogger().debug("New Cocoon object.");
// Setup the default parser, for parsing configuration.
No revision
No revision
1.1.2.1 +224 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentHandler.java
1.1.2.1 +259 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentManager.java
1.1.2.1 +235 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentSelector.java
1.1.2.1 +66 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/DefaultRoleInfo.java
1.1.2.1 +22 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/RoleInfo.java
No revision
No revision
1.1.2.7 +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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- GeneratorSelector.java 2001/03/21 18:40:55 1.1.2.6
+++ GeneratorSelector.java 2001/04/05 15:40:37 1.1.2.7
@@ -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.CocoonComponentSelector;
+import org.apache.cocoon.components.ComponentSelector;
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.6 $ $Date: 2001/03/21 18:40:55 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/05 15:40:37 $
*/
-public class GeneratorSelector extends CocoonComponentSelector {
+public class GeneratorSelector extends ComponentSelector {
private ClassLoaderManager classManager;
public void compose (ComponentManager manager) throws
ComponentManagerException {
No revision
No revision
1.1.2.28 +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.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- AbstractSitemap.java 2001/03/12 05:55:23 1.1.2.27
+++ AbstractSitemap.java 2001/04/05 15:40:37 1.1.2.28
@@ -26,7 +26,7 @@
import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.AbstractLoggable;
-import org.apache.cocoon.components.CocoonComponentSelector;
+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.27 $ $Date: 2001/03/12 05:55:23 $
+ * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/04/05 15:40:37 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap {
private Context context;
@@ -60,13 +60,13 @@
/** The creation date */
protected static long dateCreated = -1L;
- protected CocoonComponentSelector generators;
- protected CocoonComponentSelector transformers;
+ protected ComponentSelector generators;
+ protected ComponentSelector transformers;
protected SitemapComponentSelector serializers;
protected SitemapComponentSelector readers;
- protected CocoonComponentSelector actions;
- protected CocoonComponentSelector matchers;
- protected CocoonComponentSelector selectors;
+ protected ComponentSelector actions;
+ protected ComponentSelector matchers;
+ protected ComponentSelector 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 = (CocoonComponentSelector)
this.manager.lookup(Roles.GENERATORS);
- this.transformers = (CocoonComponentSelector)
this.manager.lookup(Roles.TRANSFORMERS);
+ this.generators = (ComponentSelector)
this.manager.lookup(Roles.GENERATORS);
+ this.transformers = (ComponentSelector)
this.manager.lookup(Roles.TRANSFORMERS);
this.serializers = (SitemapComponentSelector)
this.manager.lookup(Roles.SERIALIZERS);
this.readers = (SitemapComponentSelector)
this.manager.lookup(Roles.READERS);
- this.actions = (CocoonComponentSelector)
this.manager.lookup(Roles.ACTIONS);
- this.matchers = (CocoonComponentSelector)
this.manager.lookup(Roles.MATCHERS);
- this.selectors = (CocoonComponentSelector)
this.manager.lookup(Roles.SELECTORS);
+ this.actions = (ComponentSelector)
this.manager.lookup(Roles.ACTIONS);
+ this.matchers = (ComponentSelector)
this.manager.lookup(Roles.MATCHERS);
+ this.selectors = (ComponentSelector)
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.6 +4 -4
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SitemapComponentSelector.java 2001/04/04 15:42:46 1.1.2.5
+++ SitemapComponentSelector.java 2001/04/05 15:40:37 1.1.2.6
@@ -17,19 +17,19 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
-import org.apache.cocoon.components.CocoonComponentSelector;
+import org.apache.cocoon.components.ComponentSelector;
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.5 2001/04/04
15:42:46 giacomo Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.6 2001/04/05
15:40:37 giacomo Exp $
*/
-public class SitemapComponentSelector extends CocoonComponentSelector {
+public class SitemapComponentSelector extends ComponentSelector {
HashMap mime_types;
- /** The conctructors (same as the Avalon CocoonComponentManager)
+ /** The conctructors (same as the Avalon ComponentManager)
*/
public SitemapComponentSelector () {
super();
No revision
No revision
1.1.2.29 +95 -0 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.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- cocoon.xconf 2001/04/05 15:18:43 1.1.2.28
+++ cocoon.xconf 2001/04/05 15:40:37 1.1.2.29
@@ -94,5 +94,100 @@
<event-pipeline
class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
+<!-- ======================== The sitemap ============================== -->
+
<sitemap file="sitemap.xmap"/>
+
+<!-- ====================== Component Roles ============================= -->
+
+ <role name="org.apache.cocoon.components.parser.Parser"
+ shorthand="parser"
+ default-class="org.apache.cocoon.components.parser.JaxpParser"/>
+
+ <role name="org.apache.cocoon.Processor"
+ shorthand="processor"/>
+
+ <role name="org.apache.cocoon.components.store.Store"
+ shorthand="store"
+ default-class="org.apache.cocoon.components.store.MemoryStore"/>
+
+ <role name="org.apache.cocoon.components.store.Repository"
+ shorthand="repository"
+ default-class="org.apache.cocoon.components.store.FilesystemStore"/>
+
+ <role
name="org.apache.cocoon.components.language.generator.ServerPagesSelector"
+ shorthand="server-pages"
+
default-class="org.apache.cocoon.components.language.generator.GeneratorSelector"/>
+
+ <role
name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
+ shorthand="markup-languages"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role
name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
+ shorthand="programming-languages"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role
name="org.apache.cocoon.components.language.generator.ProgramGenerator"
+ shorthand="program-generator"
+
default-class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl"/>
+
+ <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
+ shorthand="classloader"
+
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+
+ <role name="org.apache.avalon.util.pool.PoolController"
+ shorthand="pool-controller"
+ default-class="org.apache.cocoon.components.ComponentPoolController"/>
+
+ <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
+ shorthand="sax-connector"
+
default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
+
+ <role name="org.apache.cocoon.components.image.ImageEncoderSelector"
+ shorthand="image-encoder"/>
+
+ <role name="org.apache.avalon.util.datasource.DataSourceComponentSelector"
+ shorthand="datasources"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.components.url.URLFactory"
+ shorthand="url-factory"
+ default-class="org.apache.cocoon.components.url.URLFactoryImpl"/>
+
+ <role name="org.apache.cocoon.components.pipeline.StreamPipeline"
+ shorthand="stream-pipeline"
+
default-class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
+
+ <role name="org.apache.cocoon.components.pipeline.EventPipeline"
+ shorthand="event-pipeline"
+
default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
+
+ <role name="org.apache.cocoon.acting.ActionSelector"
+ shorthand="action"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.selection.SelectorSelector"
+ shorthand="selector"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.matching.MatcherSelector"
+ shorthand="matcher"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.generation.GeneratorSelector"
+ shorthand="generator"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.transformation.TransformerSelector"
+ shorthand="transformer"
+ default-class="org.apache.cocoon.components.ComponentSelector"/>
+
+ <role name="org.apache.cocoon.serialization.SerializerSelector"
+ shorthand="serializer"
+ default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
+
+ <role name="org.apache.cocoon.reading.ReaderSelector"
+ shorthand="reader"
+ default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
+
</cocoon>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
