From 3892f343f3617326a03305d7a898a545487d8feb Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 17 Aug 2010 09:47:56 +0000
Subject: [PATCH] ldn-aplaws: Anpassen an aktuellen Entwicklungsstand.

git-svn-id: https://svn.libreccm.org/ccm/trunk@507 8810af33-2d31-482b-a856-94f89814c4df
---
 .../bundles/devel/cfg/applications.cfg        | 10 ++++++++--
 .../bundles/standard/cfg/applications.cfg     | 15 +++++++++-----
 environment/project.xml.ldn-devel             |  8 ++++++--
 tools-ng/netbeans/project.xml                 | 20 +++++++++++++++++++
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg
index fcad08b84..4979bd13d 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg
@@ -1,10 +1,13 @@
+# bundle devel
+# keep in sync with bundle standard!
+
 # Main apps
 ccm-core
 ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
-ccm-cms-assets-imagestep
+## ccm-cms-assets-imagestep
 ## ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
 # is ldn-dublin really an asset?
@@ -13,7 +16,9 @@ ccm-ldn-dublin
 # Content types
 ccm-cms-types-article
 ccm-cms-types-contact
-#  ccm-cms-types-esdservice
+# esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact
+# not decided yet which one to choose
+# ccm-cms-types-esdservice
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
@@ -21,6 +26,7 @@ ccm-cms-types-inlinesite
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 ccm-cms-types-pressrelease
+# siteproxy is required by ccm-ldn-atoz
 ccm-cms-types-siteproxy
 ccm-cms-types-xmlfeed
 
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg
index 2a2b45f33..02e53bc69 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg
@@ -1,10 +1,13 @@
+# bundle standard
+# keep in sync with bundle devel!
+
 # Main apps
 ccm-core
 ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
-ccm-cms-assets-imagestep
+## ccm-cms-assets-imagestep
 ## ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
 # is ldn-dublin really an asset?
@@ -21,19 +24,21 @@ ccm-cms-types-inlinesite
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 ccm-cms-types-pressrelease
+# siteproxy is required by ccm-ldn-atoz
+ccm-cms-types-siteproxy
 ccm-cms-types-xmlfeed
 
 # Applications
-ccm-ldn-util
+ccm-ldn-aplaws
 ccm-ldn-atoz
-ccm-ldn-rss
-ccm-ldn-portal
 ccm-ldn-navigation
+ccm-ldn-portal
+ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-aplaws
+ccm-ldn-util
 
 # Extra apps
 ccm-forum
diff --git a/environment/project.xml.ldn-devel b/environment/project.xml.ldn-devel
index e796875ba..d02e5413d 100755
--- a/environment/project.xml.ldn-devel
+++ b/environment/project.xml.ldn-devel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.0.5 
-     which are part of ccm-ldn-aplaws devel bundle                               
+     which are part of ccm-ldn-aplaws devel (and standard) bundle                               
      To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/applications.cfg -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
@@ -26,13 +26,16 @@
         <ccm:application name="ccm-cms"/>
 
         <!--  Content assets   -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
         <ccm:application name="ccm-ldn-dublin"/>
 
         <!--  Content types   -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-contact"/>
-<!--    <ccm:application name="ccm-cms-types-esdservice"/>     -->
+        <!-- esdservice needs ccm-cms-types-contact or ccm-ldn-ccm-types-contact 
+             not decided yet which one to choose    
+        <ccm:application name="ccm-cms-types-esdservice"/>     --> 
         <ccm:application name="ccm-cms-types-filestorageitem"/>
         <ccm:application name="ccm-cms-types-formitem"/>
         <ccm:application name="ccm-cms-types-formsectionitem"/>
@@ -40,6 +43,7 @@
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
+        <!-- siteproxy is a prerequisite for ccm-ldn-atoz  -->
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 3b8f6585d..0a9c6e987 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -32,6 +32,11 @@
                     <type>java</type>
                     <location>ccm-cms-assets-fileattachment/src</location>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-cms-assets-imagestep (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-assets-imagestep/src</location>
+                </source-folder>
                 <source-folder>
                     <label>ccm-cms-assets-notes (Source)</label>
                     <type>java</type>
@@ -237,6 +242,11 @@
                     <type>java</type>
                     <location>ccm-forum/src</location>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-forum-categorised (Source)</label>
+                    <type>java</type>
+                    <location>ccm-forum-categorised/src</location>
+                </source-folder>
                 <source-folder>
                     <label>ccm-simplesurvey (Source)</label>
                     <type>java</type>
@@ -418,6 +428,10 @@
                         <label>ccm-cms-assets-fileattachment (Source)</label>
                         <location>ccm-cms-assets-fileattachment/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-assets-imagestep (Source)</label>
+                        <location>ccm-cms-assets-imagestep/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-assets-notes (Source)</label>
                         <location>ccm-cms-assets-notes/src</location>
@@ -582,6 +596,10 @@
                         <label>ccm-forum (Source)</label>
                         <location>ccm-forum/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-forum-categorised (Source)</label>
+                        <location>ccm-forum-categorised/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-simplesurvey (Source)</label>
                         <location>ccm-simplesurvey/src</location>
@@ -707,6 +725,7 @@
                 <package-root>ccm-core/src</package-root>
                 <package-root>ccm-cms/src</package-root>
                 <package-root>ccm-cms-assets-fileattachment/src</package-root>
+                <package-root>ccm-cms-assets-imagestep/src</package-root>
                 <package-root>ccm-cms-assets-notes/src</package-root>
                 <package-root>ccm-cms-assets-relatedlink/src</package-root>
                 <package-root>ccm-cms-types-address/src</package-root>
@@ -748,6 +767,7 @@
                 <package-root>ccm-docmgr/src</package-root>
                 <package-root>ccm-formbuilder-pdf/src</package-root>
                 <package-root>ccm-forum/src</package-root>
+                <package-root>ccm-forum-categorised/src</package-root>
                 <package-root>ccm-simplesurvey/src</package-root>
                 <package-root>ccm-user-preferences/src</package-root>
                 <package-root>ccm-weblog/src</package-root>