From e228b13cf95c8f28d6b3eb846eafb02b77011cc8 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 3 Aug 2011 07:25:29 +0000
Subject: [PATCH] Weitere Anpassungen ldn-aplaws unt tools-ng.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1050 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-ldn-aplaws/bundles/custom/cfg/project.xml |  30 ++--
 ccm-ldn-aplaws/bundles/demo/cfg/project.xml   |  27 +++-
 ccm-ldn-aplaws/bundles/devel/cfg/project.xml  |  57 +++++--
 .../bundles/{complete => extended}/AUTHORS    |   0
 .../bundles/{complete => extended}/ChangeLog  |   0
 .../bundles/{complete => extended}/NEWS       |   0
 .../bundles/{complete => extended}/README     |   0
 .../bundles/{complete => extended}/bundle.in  |   0
 .../cfg/integration.properties                |   0
 .../{complete => extended}/cfg/project.xml    |  55 ++++---
 .../{complete => extended}/cfg/web.xml        |   0
 .../bundles/standard/cfg/project.xml          |   5 +-
 tools-ng/ecdc/conf/ccm.properties             |   2 +-
 tools-ng/ecdc/local.ccm.properties            | 147 +++++++++++++++++-
 14 files changed, 266 insertions(+), 57 deletions(-)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/AUTHORS (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/ChangeLog (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/NEWS (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/README (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/bundle.in (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/cfg/integration.properties (100%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/cfg/project.xml (68%)
 rename ccm-ldn-aplaws/bundles/{complete => extended}/cfg/web.xml (100%)

diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index fd734e211..9675b83f2 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml -custom- containing all modules as of aplaws 1.1.x        -->
-<!-- A set of core modules is active, others are commented out and should 
-     activated (uncomment) according to customers requirements.            -->
+<!-- project.xml -custom- containing all modules of the current aplaws
+     repository. A set of core modules is active, others are commented out 
+     and should activated (uncomment) according to customers requirements.  -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -19,6 +19,7 @@
       
         <!-- Core Modules, mandatory part of any Aplaws installation.     -->
         <!-- Do NOT edit this section!                                    -->
+
         <ccm:application name="ccm-core"/>
         <ccm:application name="ccm-cms"/>
         
@@ -26,24 +27,15 @@
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
         <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-contact"/>
-        <ccm:application name="ccm-cms-types-esdservice"/>
-        <ccm:application name="ccm-cms-types-event"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
-        <ccm:application name="ccm-cms-types-simpleaddress"/>
+        <!-- siteproxy is a prerequisite for ccm-ldn-atoz  -->
         <ccm:application name="ccm-cms-types-siteproxy"/>
-        <ccm:application name="ccm-cms-types-xmlfeed"/>
 
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
-        <ccm:application name="ccm-ldn-dublin"/>
-        <ccm:application name="ccm-ldn-exporter"/>
-        <ccm:application name="ccm-ldn-freeform"/>
-        <ccm:application name="ccm-ldn-importer"/>
         <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>
@@ -64,6 +56,9 @@
         <!-- Additional Content Types                                     -->
 <!--    <ccm:application name="ccm-cms-types-agenda"/>                -->
 <!--    <ccm:application name="ccm-cms-types-bookmark"/>              -->
+<!--    <ccm:application name="ccm-cms-types-contact"/>               -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>            -->
+<!--    <ccm:application name="ccm-cms-types-event"/>                 -->
 <!--    <ccm:application name="ccm-cms-types-faqitem"/>               -->
 <!--    <ccm:application name="ccm-cms-types-glossaryitem"/>          -->
 <!--    <ccm:application name="ccm-cms-types-htmlform"/>              -->
@@ -78,6 +73,8 @@
 <!--    <ccm:application name="ccm-cms-types-organization"/>          -->
 <!--    <ccm:application name="ccm-cms-types-pressrelease"/>          -->
 <!--    <ccm:application name="ccm-cms-types-service"/>               -->
+<!--    <ccm:application name="ccm-cms-types-simpleaddress"/>         -->
+<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>               -->
 
         <!-- Additional Content Applications                              -->
 <!--    <ccm:application name="ccm-auth-http"/>                       -->
@@ -88,6 +85,13 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                 -->
 <!--    <ccm:application name="ccm-forum"/>                           -->
 <!--    <ccm:application name="ccm-forum-categorised"/>               -->
+
+<!--    <ccm:application name="ccm-ldn-dublin"/>                      -->
+<!--    <ccm:application name="ccm-ldn-exporter"/>                    -->
+<!--    <ccm:application name="ccm-ldn-freeform"/>                    -->
+<!--    <ccm:application name="ccm-ldn-importer"/>                    -->
+<!--    <ccm:application name="ccm-ldn-rss"/>                         -->
+
 <!--    <ccm:application name="ccm-portalserver"/>                    -->
 <!--    <ccm:application name="ccm-portlet"/>                         -->
 <!--    <ccm:application name="ccm-portlet-helloworld"/>              -->
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index ee761fb3c..4da69688c 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)demo - containing those modules as of aplaws 1.1.x 
-     which are part of ccm-ldn-aplaws demo bundle                             -->
+<!-- project.xml - (ldn)demo - containing the same set of modules as the
+     extended set, with a complete, ready to run pre-configuration. 
+     Has to keep synchronized with the extended bundle!                      -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -9,7 +10,7 @@
                     name="aplaws" 
               prettyName="APLAWS plus Demo Spin"
                  version="1-1-5" 
-                 release="demo" 
+                 release="-demo" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -27,19 +28,33 @@
         <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
         <!--  Content types   -->
+        <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-article"/>
+        <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-esdservice"/>
+        <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
+        <ccm:application name="ccm-cms-types-htmlform"/>
+        <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
+        <ccm:application name="ccm-cms-types-job"/>
+        <ccm:application name="ccm-cms-types-legalnotice"/>
+        <ccm:application name="ccm-cms-types-minutes"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
+        <ccm:application name="ccm-cms-types-service"/>
+        <ccm:application name="ccm-cms-types-simpleaddress"/>
         <!-- siteproxy is a prerequisite for ccm-ldn-atoz  -->
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
@@ -48,6 +63,9 @@
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-dublin"/>
+        <ccm:application name="ccm-ldn-exporter"/>
+        <ccm:application name="ccm-ldn-freeform"/>
+        <ccm:application name="ccm-ldn-importer"/>
         <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-search"/>
@@ -57,8 +75,11 @@
         <ccm:application name="ccm-ldn-util"/>
 
         <!--  Extra apps   -->
+        <ccm:application name="ccm-docrepo"/>
+        <ccm:application name="ccm-faq"/>
         <ccm:application name="ccm-forum"/>     
         <ccm:application name="ccm-forum-categorised"/>     
+        <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 59c246c92..706735b66 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.1.x 
-     which are part of ccm-ldn-aplaws devel (and standard) bundle                               
-     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/project.xml -->
+<!-- project.xml - (ldn)devel - containing all modules of the current aplaws 
+     repository. It is specifically for developers to help them to make 
+     every module deployable and to create the distribution. 
+     It is NOT a production grade bundle!                                    -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -10,45 +11,69 @@
                     name="aplaws" 
               prettyName="APLAWS plus (devel)"
                  version="1-1-5" 
-                 release="devel" 
+                 release="-devel" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
 <ccm:databases>
         <ccm:database name="postgres"/>
+        <ccm:database name="oracle"/>
 </ccm:databases>
 
 
   <ccm:build>
-        <!--  Main apps   -->
-        <ccm:application name="ccm-core"/>
-        <ccm:application name="ccm-cms"/>
 
-        <!--  Content assets   -->
+        <ccm:application name="ccm-auth-http"/>
+        <ccm:application name="ccm-bookmarks"/>
+
+        <ccm:application name="ccm-cms"/>
         <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
-        <!--  Content types   -->
+        <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-article"/>
+        <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-esdservice"/>
+        <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
+        <ccm:application name="ccm-cms-types-htmlform"/>
+        <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
+        <ccm:application name="ccm-cms-types-job"/>
+        <ccm:application name="ccm-cms-types-legalnotice"/>
+        <ccm:application name="ccm-cms-types-minutes"/>
+        <ccm:application name="ccm-cms-types-motditem"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
-        <!-- siteproxy is a prerequisite for ccm-ldn-atoz  -->
+        <ccm:application name="ccm-cms-types-service"/>
+        <ccm:application name="ccm-cms-types-simpleaddress"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
-        <!--  Applications   -->
+        <ccm:application name="ccm-core"/>
+
+        <ccm:application name="ccm-docmngr"/>
+        <ccm:application name="ccm-docrepo"/>
+        <ccm:application name="ccm-faq"/>
+        <ccm:application name="ccm-formbuilder-pdf"/>
+        <ccm:application name="ccm-forum"/>     
+        <ccm:application name="ccm-forum-categorised"/>     
+
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-dublin"/>
+        <ccm:application name="ccm-ldn-exporter"/>
+        <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
         <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>
@@ -58,11 +83,15 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-        <!--  Extra apps   -->
-        <ccm:application name="ccm-forum"/>     
+        <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-portlet"/>
+        <ccm:application name="ccm-portlet-helloworld"/>
+        <ccm:application name="ccm-simplesurvey"/>
         <ccm:application name="ccm-themedirector"/>
-
+        <ccm:application name="ccm-user-preferences"/>
+        <ccm:application name="ccm-weblog"/>
+        <ccm:application name="ccm-webpage"/>
 
 <!-- tools will be downloaded from trunk, but does not
      contain java code to be compiled!
diff --git a/ccm-ldn-aplaws/bundles/complete/AUTHORS b/ccm-ldn-aplaws/bundles/extended/AUTHORS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/AUTHORS
rename to ccm-ldn-aplaws/bundles/extended/AUTHORS
diff --git a/ccm-ldn-aplaws/bundles/complete/ChangeLog b/ccm-ldn-aplaws/bundles/extended/ChangeLog
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/ChangeLog
rename to ccm-ldn-aplaws/bundles/extended/ChangeLog
diff --git a/ccm-ldn-aplaws/bundles/complete/NEWS b/ccm-ldn-aplaws/bundles/extended/NEWS
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/NEWS
rename to ccm-ldn-aplaws/bundles/extended/NEWS
diff --git a/ccm-ldn-aplaws/bundles/complete/README b/ccm-ldn-aplaws/bundles/extended/README
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/README
rename to ccm-ldn-aplaws/bundles/extended/README
diff --git a/ccm-ldn-aplaws/bundles/complete/bundle.in b/ccm-ldn-aplaws/bundles/extended/bundle.in
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/bundle.in
rename to ccm-ldn-aplaws/bundles/extended/bundle.in
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/cfg/integration.properties
rename to ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
similarity index 68%
rename from ccm-ldn-aplaws/bundles/complete/cfg/project.xml
rename to ccm-ldn-aplaws/bundles/extended/cfg/project.xml
index 417e63af4..2ebb03e4f 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml -complete- containing all modules as of aplaws 1.0.5      -->
-<!-- This file should be synchronized with an install bundle, e.g. aplaws-plus-devel-complete      -->
+<!-- project.xml -extended- containing a nearly complete set of modules.     -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -9,21 +8,23 @@
                name="aplaws" 
                prettyName="APLAWS plus" 
                version="1-1-5" 
-               release="-complete"
+               release="-extended"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
   <ccm:build>
-        <ccm:application name="ccm-auth-http"/>
-        <ccm:application name="ccm-bookmarks"/>
-
+        <!--  Main apps   -->
+        <ccm:application name="ccm-core"/>
         <ccm:application name="ccm-cms"/>
+
+        <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
+        <!--  Content types   -->
         <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
@@ -41,7 +42,8 @@
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-minutes"/>
-        <ccm:application name="ccm-cms-types-motditem"/>
+        <!-- Without any useful known function                 -->
+<!--    <ccm:application name="ccm-cms-types-motditem"/>       -->
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-organization"/>
@@ -51,15 +53,7 @@
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
-        <ccm:application name="ccm-core"/>
-
-        <ccm:application name="ccm-docmngr"/>
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-faq"/>
-        <ccm:application name="ccm-formbuilder-pdf"/>
-        <ccm:application name="ccm-forum"/>     
-        <ccm:application name="ccm-forum-categorised"/>     
-
+        <!--  Applications   -->
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-dublin"/>
@@ -74,15 +68,32 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
+        <!--  Extra apps   -->
+        <!-- Authentification against a Windows domain         -->
+<!--    <ccm:application name="ccm-auth-http"/>                -->
+        <!-- Completely untested                               -->
+<!--    <ccm:application name="ccm-bookmarks"/>                -->
+       <!-- Currently doesn't work                             -->
+<!--    <ccm:application name="ccm-docmngr"/>                  -->
+        <ccm:application name="ccm-docrepo"/>
+        <ccm:application name="ccm-faq"/>
+        <!-- Without any useful known function                 -->
+<!--    <ccm:application name="ccm-formbuilder-pdf"/>          -->
+        <ccm:application name="ccm-forum"/>     
+        <ccm:application name="ccm-forum-categorised"/>     
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portlet"/>
-        <ccm:application name="ccm-portlet-helloworld"/>
-        <ccm:application name="ccm-simplesurvey"/>
+        <!-- Completely untested                               -->
+<!--    <ccm:application name="ccm-portlet"/>                  -->
+<!--    <ccm:application name="ccm-portlet-helloworld"/>       -->
+       <!-- Currently doesn't work                             -->
+<!--    <ccm:application name="ccm-simplesurvey"/>             -->
         <ccm:application name="ccm-themedirector"/>
-        <ccm:application name="ccm-user-preferences"/>
-        <ccm:application name="ccm-weblog"/>
-        <ccm:application name="ccm-webpage"/>
+        <!-- Without any useful known function                 -->
+<!--    <ccm:application name="ccm-user-preferences"/>         -->
+        <!-- Completely untested                               -->
+<!--    <ccm:application name="ccm-weblog"/>                   -->
+<!--    <ccm:application name="ccm-webpage"/>                  -->
 
 <!-- tools will be downloaded from trunk, but does not
      contain java code to be compiled!
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
similarity index 100%
rename from ccm-ldn-aplaws/bundles/complete/cfg/web.xml
rename to ccm-ldn-aplaws/bundles/extended/cfg/web.xml
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index e5cb29cf5..332d3fa15 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- project.xml - (ldn)standard - containing those modules as of aplaws 1.1.x 
-     which are part of ccm-ldn-aplaws  standard bundle                               
-     To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/project.xml    -->
+<!-- project.xml - (ldn)standard - containing those modules of current
+     aplaws repository which are used by most Local Authorities.             -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
diff --git a/tools-ng/ecdc/conf/ccm.properties b/tools-ng/ecdc/conf/ccm.properties
index a38640f04..1dcc993ea 100644
--- a/tools-ng/ecdc/conf/ccm.properties
+++ b/tools-ng/ecdc/conf/ccm.properties
@@ -6,5 +6,5 @@
 ## to overwrite.
 ##
 # Usually you will use a specific adapted bundle! Use local.ccm.properties!
-ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/complete
+ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
 
diff --git a/tools-ng/ecdc/local.ccm.properties b/tools-ng/ecdc/local.ccm.properties
index c66385d87..c9fd66fd3 100644
--- a/tools-ng/ecdc/local.ccm.properties
+++ b/tools-ng/ecdc/local.ccm.properties
@@ -2,11 +2,156 @@
 ## the appropriate properties
 ## The defaults are shown commented out
 
+## -------------------------------------------------
 ## Usually you will define your own specific bundle!
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/complete
+## -------------------------------------------------
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
+ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
 
 
 #ccm.upgrade.package=ccm-xxx
 #ccm.upgrade.from.version=x.x.x
 #ccm.upgrade.to.version=y.y.y
 
+## ====================================================================
+## Update scripts
+## ====================================================================
+
+
+# ---------------------------------------------------------------------
+# Update post rel. 1.1.2 (trunk - temporal)
+# Execute after Update 1.1.1 -> 1.1.2 !
+# ---------------------------------------------------------------------
+# (hb r903: Navigation legacy free)
+#ccm.upgrade.package=ccm-ldn-navigation
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
+
+# (hb r908 cms new style legacy compatible instead of old style / kernel.package)
+#ccm.upgrade.package=ccm-cms
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
+
+# ---------------------------------------------------------------------
+# Update from (internal) rel. 1.1.1 to 1.1.2 
+# Execute after Update 1.1.0 -> 1.1.1 ! 
+# ---------------------------------------------------------------------
+# (hb r894/r914: core portal legacy free)
+#ccm.upgrade.package=ccm-core
+#ccm.upgrade.from.version=6.6.2
+#ccm.upgrade.to.version=6.6.3
+
+# (hb 799: former type address renamed to simpleaddress)
+#ccm.upgrade.package=ccm-cms-types-simpleaddress
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# (hb r800: rename ccm-ldn-theme to ccm-themedirector) 
+#ccm.upgrade.package=ccm-themedirector
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# (hb r818: rename ccm-ldn-portal to ccm-portalworkspace)
+#ccm.upgrade.package=ccm-portalworkspace
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# (hb r829: portalworkspace [and themedirector] legacy free)
+#ccm.upgrade.package=ccm-portalworkspace
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
+
+# (hb r829: themedirector [and portalworkspace] legacy free)
+#ccm.upgrade.package=ccm-themedirector
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
+
+# (hb r803/806: persistent property private mode added) 
+#ccm.upgrade.package=ccm-forum
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# (hb r833: named related links)
+#ccm.upgrade.package=ccm-cms-assets-relatedlink
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# (hb r836: unused table web_apps removed) 
+#ccm.upgrade.package=ccm-core
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
+
+# -----------------------------------------------------
+# Update from (internal) rel. 1.1.0 to 1.1.1 
+# -----------------------------------------------------
+#ccm.upgrade.package=ccm-cms-assets-imagestep
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-cms-assets-notes
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-ldn-navigation
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-ldn-terms
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-cms
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-cms-types-article
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-cms-types-newsitem
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-cms-types-event
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+#ccm.upgrade.package=ccm-core
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+
+# -----------------------------------------------------
+# Update from rel. 1.0.5 to (internal) 1.1.0 
+# ----------------------------------------------------
+# ccm.upgrade.package=ccm-core
+# ccm.upgrade.from.version=6.5.2
+# ccm.upgrade.to.version=6.5.3
+
+# ccm.upgrade.package=ccm-core
+# ccm.upgrade.from.version=6.5.5
+# ccm.upgrade.to.version=6.5.6
+
+# ccm.upgrade.package=ccm-cms
+# ccm.upgrade.from.version=6.5.3
+# ccm.upgrade.to.version=6.5.4
+
+# ccm.upgrade.package=ccm-ldn-portal
+# ccm.upgrade.from.version=6.5.1
+# ccm.upgrade.to.version=6.5.2
+
+# ccm.upgrade.package=ccm-ldn-portal
+# ccm.upgrade.from.version=6.5.2
+# ccm.upgrade.to.version=6.5.3
+
+# ccm.upgrade.package=ccm-ldn-terms
+# ccm.upgrade.from.version=6.5.0
+# ccm.upgrade.to.version=6.5.1
+
+# ccm.upgrade.package=ccm-ldn-terms
+# ccm.upgrade.from.version=6.5.1
+# ccm.upgrade.to.version=6.5.2
+