You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/02/27 23:18:16 UTC
svn commit: r381463 - in /cocoon/trunk:
cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java
cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
Author: danielf
Date: Mon Feb 27 14:18:14 2006
New Revision: 381463
URL: http://svn.apache.org/viewcvs?rev=381463&view=rev
Log:
Adapt to that Settings is provided on its own.
Modified:
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java
cocoon/trunk/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java?rev=381463&r1=381462&r2=381463&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/ECMBlockServiceManager.java Mon Feb 27 14:18:14 2006
@@ -102,6 +102,7 @@
// The Core object is needed for the Sitemap and various other Cocoon components
Core core = new Core(newContext);
+ coreServicemanager.addInstance(Settings.ROLE, settings);
coreServicemanager.addInstance(Core.ROLE, core);
// For the first block that is setup, source factories need to be setup before
Modified: cocoon/trunk/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java?rev=381463&r1=381462&r2=381463&view=diff
==============================================================================
--- cocoon/trunk/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java (original)
+++ cocoon/trunk/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java Mon Feb 27 14:18:14 2006
@@ -89,7 +89,7 @@
try {
settings = (Settings) this.serviceManager.lookup(Settings.ROLE);
} catch (ServiceException e) {
- throw new ServletException("Could not find a Core object from the parent service manager", e);
+ throw new ServletException("Could not find a Settings object from the parent service manager", e);
}
String sitemapPath = null;