From ff71de8965cbe4ec958be981a1d3aee188ba5e2d Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 12 Jul 2010 09:44:50 +0000
Subject: [PATCH] =?UTF-8?q?Vervollst=C3=A4ndigung=20der=20Anpassung=20and?=
 =?UTF-8?q?=20ecdc=20und=20Anpassung=20an=20Aenderung=20infolge=20von=20fo?=
 =?UTF-8?q?rum-categorized.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@474 8810af33-2d31-482b-a856-94f89814c4df
---
 .../bundles/devel/cfg/integration.properties  |  7 +++++++
 .../content-section/www/admin/load-cat.jsp    | 20 ++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
index 298fcaacd..36308bd4e 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
@@ -35,6 +35,13 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
+; =============================================================================================
+; devel specific configurations
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+waf.runtime.jdbc_pool_size=80
+
+waf.web.server=localhost\:8080
+
 waf.admin.email=admin@example.com
 waf.admin.name.given=Administrator
 waf.admin.name.family=Account
diff --git a/ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp b/ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp
index feedab355..6e555992d 100755
--- a/ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp
+++ b/ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp
@@ -1,12 +1,22 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-          xmlns:define="/WEB-INF/bebop-define.tld" 
-          xmlns:show="/WEB-INF/bebop-show.tld"
-    version="1.2">
+<jsp:root   xmlns:jsp="http://java.sun.com/JSP/Page"
+         xmlns:define="/WEB-INF/bebop-define.tld"
+           xmlns:show="/WEB-INF/bebop-show.tld"
+              version="1.2">
 
-  <define:page name="childCategories" pageClass="com.arsdigita.cms.ui.authoring.EmptyPage" title="childCategories" cache="true">
+  <define:page name="childCategories"
+          pageClass="com.arsdigita.cms.ui.authoring.EmptyPage"
+              title="childCategories"
+              cache="true">
 
+    <!-- Class had been moved from ccm-ldn-aplaws to ccm-ldn-terms in
+         order to avoid dependencies between modules, ccm-forum-categorised
+         and a specific kind of the integration module ccm-???-aplaws.
     <define:component name="catSubtree"
       classname="com.arsdigita.aplaws.ui.CategorySubtree"/>
+    -->
+
+    <define:component name="catSubtree"
+      classname="com.arsdigita.london.terms.ui.CategorySubtree"/>
   </define:page>
 
   <show:all/>