From a51dfbebe698d62f1b272775314a9222992b6ffb Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 4 May 2013 15:56:23 +0000
Subject: [PATCH] Minor enhancements, added documentation.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2150 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle/bundles/base/cfg/integration.properties  | 6 +-----
 ccm-bundle/bundles/base/cfg/project.xml             | 3 ++-
 ccm-bundle/bundles/demo/cfg/integration.properties  | 6 +-----
 ccm-bundle/bundles/demo/cfg/project.xml             | 3 ++-
 ccm-bundle/bundles/devel/cfg/integration.properties | 6 +-----
 ccm-bundle/bundles/devel/cfg/project.xml            | 5 ++++-
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/ccm-bundle/bundles/base/cfg/integration.properties b/ccm-bundle/bundles/base/cfg/integration.properties
index e4e88f567..a7287dd44 100644
--- a/ccm-bundle/bundles/base/cfg/integration.properties
+++ b/ccm-bundle/bundles/base/cfg/integration.properties
@@ -207,13 +207,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# LDN Dublin Core configuration parameters
-# ##############################################################################
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
-
 # ccm-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-sci-bundle (Loader only)
+# ccm-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-bundle/bundles/base/cfg/project.xml b/ccm-bundle/bundles/base/cfg/project.xml
index 0ca7ba55c..11f2e4000 100644
--- a/ccm-bundle/bundles/base/cfg/project.xml
+++ b/ccm-bundle/bundles/base/cfg/project.xml
@@ -127,8 +127,8 @@
 -->
 <!--
         <ccm:application name="ccm-portalserver"/>
--->
         <ccm:application name="ccm-portalworkspace-homepage"/>
+-->
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
@@ -164,6 +164,7 @@
 
 <!--   LDN extension  -->
 <!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-bundle/bundles/demo/cfg/integration.properties
index 4ea3b3f7e..1b204ecfe 100644
--- a/ccm-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-bundle/bundles/demo/cfg/integration.properties
@@ -206,13 +206,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# LDN Dublin Core configuration parameters
-# ##############################################################################
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
-
 # ccm-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-sci-bundle (Loader only)
+# ccm-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-bundle/bundles/demo/cfg/project.xml b/ccm-bundle/bundles/demo/cfg/project.xml
index 741f32d44..1f10b7c3a 100644
--- a/ccm-bundle/bundles/demo/cfg/project.xml
+++ b/ccm-bundle/bundles/demo/cfg/project.xml
@@ -154,7 +154,8 @@
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    and includes very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties
index 0463fe819..a6b0fb45e 100644
--- a/ccm-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-bundle/bundles/devel/cfg/integration.properties
@@ -206,13 +206,9 @@ com.arsdigita.london.search.num_threads=0
 auth.http.admin_email=webmaster@aplaws.org
 auth.http.admin_identifier=webmaster
 
-# LDN Dublin Core configuration parameters
-# ##############################################################################
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
-
 # ccm-bundle integration package configuration parameter
 # ##############################################################################
-# ccm-sci-bundle (Loader only)
+# ccm-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
 #com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml
index ccc35f1f9..f35585921 100644
--- a/ccm-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-bundle/bundles/devel/cfg/project.xml
@@ -70,6 +70,8 @@
         <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-notes"/>
 -->
+        <ccm:application name="ccm-cms-assets-dublincore"/>
+
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-bookmark"/>
 <!--
@@ -164,7 +166,8 @@
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    Conflicts with ccm-bundle (this package)                     -->
+<!--    and contains very ldn specific meta tags (esd)               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>