You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/02 19:52:14 UTC
svn commit: r418628 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon:
components/treeprocessor/sitemap/SitemapLanguage.java core/CoreUtil.java
core/PropertyProvider.java
Author: cziegeler
Date: Sun Jul 2 10:52:13 2006
New Revision: 418628
URL: http://svn.apache.org/viewvc?rev=418628&view=rev
Log:
Pass running mode into property provider
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/PropertyProvider.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?rev=418628&r1=418627&r2=418628&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java Sun Jul 2 10:52:13 2006
@@ -1177,7 +1177,7 @@
final Environment env = EnvironmentHelper.getCurrentEnvironment();
PropertyProvider provider = (PropertyProvider)parentBeanFactory.getBean(PropertyProvider.ROLE);
// TODO - add the name of the sitemap file to the path
- s.fill(provider.getProperties(env.getURIPrefix()));
+ s.fill(provider.getProperties(mode, env.getURIPrefix()));
} catch (Exception ignore) {
this.getLogger().warn("Unable to get properties from provider.", ignore);
this.getLogger().warn("Continuing initialization.");
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java?rev=418628&r1=418627&r2=418628&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java Sun Jul 2 10:52:13 2006
@@ -388,7 +388,7 @@
if (rootContext != null && rootContext.containsBean(PropertyProvider.ROLE) ) {
try {
PropertyProvider provider = (PropertyProvider)rootContext.getBean(PropertyProvider.ROLE);
- s.fill(provider.getProperties(null));
+ s.fill(provider.getProperties(mode, null));
} catch (Exception ignore) {
this.environmentContext.log("Unable to get properties from provider.", ignore);
this.environmentContext.log("Continuing initialization.");
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/PropertyProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/PropertyProvider.java?rev=418628&r1=418627&r2=418628&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/PropertyProvider.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/PropertyProvider.java Sun Jul 2 10:52:13 2006
@@ -31,5 +31,5 @@
String ROLE = PropertyProvider.class.getName();
- Properties getProperties(String path);
+ Properties getProperties(String runningMode, String path);
}