bloritsch 01/06/07 14:13:43
Modified: src/org/apache/cocoon Tag: cocoon_20_branch Cocoon.java
cocoon.roles
src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
AbstractSitemap.java sitemap.roles
Log:
updating so that cocoon.xconf settings are propogated to sitemap ComponentManager.
Revision Changes Path
No revision
No revision
1.9.2.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- Cocoon.java 2001/06/06 17:12:58 1.9.2.1
+++ Cocoon.java 2001/06/07 21:13:35 1.9.2.2
@@ -55,7 +55,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.9.2.1 $ $Date: 2001/06/06 17:12:58 $
+ * @version CVS $Revision: 1.9.2.2 $ $Date: 2001/06/07 21:13:35 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe, Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -223,7 +223,7 @@
sitemapRoleManager.setLogger(getLogger());
sitemapRoleManager.configure(sitemapConfig);
- AbstractSitemap.setRoleManager(sitemapRoleManager);
+ AbstractSitemap.setRoleManager(sitemapRoleManager, sitemapConfig);
try {
p = (Parser)startupManager.lookup(Roles.PARSER);
1.6.2.3 +0 -8 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- cocoon.roles 2001/06/07 16:23:32 1.6.2.2
+++ cocoon.roles 2001/06/07 21:13:37 1.6.2.3
@@ -54,14 +54,6 @@
<hint shorthand="j2ee" class="org.apache.excalibur.datasource.J2eeDataSource"/>
</role>
- <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.components.url.URLFactory"
shorthand="url-factory"
default-class="org.apache.cocoon.components.url.URLFactoryImpl"/>
No revision
No revision
1.4.2.2 +6 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- AbstractSitemap.java 2001/06/06 17:13:15 1.4.2.1
+++ AbstractSitemap.java 2001/06/07 21:13:40 1.4.2.2
@@ -50,7 +50,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.4.2.1 $ $Date: 2001/06/06 17:13:15 $
+ * @version CVS $Revision: 1.4.2.2 $ $Date: 2001/06/07 21:13:40 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap,
Disposable, ThreadSafe {
private Context context;
@@ -58,6 +58,7 @@
private static final int BYTE_ARRAY_SIZE = 1024;
private static RoleManager roleManager;
+ private static Configuration defaultConfig;
/** The component manager instance */
protected ExcaliburComponentManager manager;
@@ -82,9 +83,10 @@
/**
* Set the role manager
*/
- public static void setRoleManager(RoleManager roles) {
+ public static void setRoleManager(RoleManager roles, Configuration config) {
if (AbstractSitemap.roleManager == null) {
AbstractSitemap.roleManager = roles;
+ AbstractSitemap.defaultConfig = config;
}
}
@@ -99,6 +101,8 @@
this.manager.setRoleManager(AbstractSitemap.roleManager);
try {
+ this.manager.configure(AbstractSitemap.defaultConfig);
+
this.urlFactory = (URLFactory) manager.lookup(Roles.URL_FACTORY);
this.generators = new ExcaliburComponentSelector();
1.1.2.3 +8 -0 xml-cocoon2/src/org/apache/cocoon/sitemap/Attic/sitemap.roles
Index: sitemap.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Attic/sitemap.roles,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- sitemap.roles 2001/06/07 16:24:02 1.1.2.2
+++ sitemap.roles 2001/06/07 21:13:41 1.1.2.3
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<role-list>
+ <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.avalon.excalibur.component.ExcaliburComponentSelector"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
