From ad0524d1020cc35022c61c56603dc1331982861e Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 8 Sep 2011 07:45:25 +0000
Subject: [PATCH] Nachhalten der Bundle Files aus Release 1.1.4-r1110.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1111 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-gen-aplaws/bundles/devel/cfg/project.xml  |  4 +-
 .../bundles/develpb/cfg/project.xml           |  4 +-
 .../bundles/handbook/cfg/project.xml          | 63 +++++++-------
 ccm-gen-aplaws/bundles/nsh/cfg/project.xml    |  4 +-
 .../bundles/staatsschiff/cfg/project.xml      |  4 +-
 ccm-gen-aplaws/bundles/zsr/cfg/project.xml    |  4 +-
 ccm-iaw-aplaws/bundles/devel/cfg/project.xml  |  4 +-
 .../standard/cfg/integration.properties       |  2 +-
 .../bundles/standard/cfg/project.xml          | 85 +++++++++++--------
 9 files changed, 94 insertions(+), 80 deletions(-)

diff --git a/ccm-gen-aplaws/bundles/devel/cfg/project.xml b/ccm-gen-aplaws/bundles/devel/cfg/project.xml
index eb26be3d7..4400e4597 100644
--- a/ccm-gen-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/devel/cfg/project.xml
@@ -8,8 +8,8 @@
               ccmVersion="6.1" 
                     name="aplaws-gen" 
               prettyName="APLAWS plus" 
-                 version="1-1-2" 
-                 release="alpha-1" 
+                 version="1-1-4" 
+                 release="1107" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
index dae59f9c6..67845a274 100644
--- a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
@@ -8,8 +8,8 @@
               ccmVersion="6.1" 
                     name="aplaws-gen" 
               prettyName="APLAWS plus" 
-                 version="1-1-2" 
-                 release="trunk" 
+                 version="1-1-4" 
+                 release="r1107" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
index 0e914bd09..2cf795d21 100644
--- a/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/project.xml
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-handbook" 
               prettyName="APLAWS plus" 
-                 version="1-1-0" 
-                 release="423" 
+                 version="1-1-4" 
+                 release="r1110" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -30,54 +30,26 @@
 <!--   Content Types   -->
 <!--   - - - - - - -    -->
         <ccm:application name="ccm-cms-types-address"/>
-<!--    <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-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-member"/>
-<!--    <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"/>         -->
-<!--    <ccm:application name="ccm-cms-types-service"/>              -->
-<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->   
-<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
 
 <!--  Applications   -->
 <!--  - - - - -  -   -->
-<!--    <ccm:application name="ccm-auth-http"/>                      -->
-<!--    <ccm:application name="ccm-bookmarks"/>                      -->
-<!--    had been temporarily excluded, produces errors in the build process   -->
         <ccm:application name="ccm-docmgr"/>                            
-<!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
         <ccm:application name="ccm-forum"/>
-<!--    <ccm:application name="ccm-simplesurvey"/>                   -->
         <ccm:application name="ccm-user-preferences"/>
-<!--    <ccm:application name="ccm-weblog"/>                         -->
-<!--    <ccm:application name="ccm-webpage"/>                        -->
 
 <!--  LDN extension  -->
 <!--  - - - - - - -  -->
-<!--    <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-image-step"/>                 -->
-<!--    <ccm:application name="ccm-ldn-importer"/>                   -->
         <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-portal"/>
         <ccm:application name="ccm-ldn-rss"/>                        
@@ -99,6 +71,35 @@
      contain java code to be compiled!
         <ccm:application name="tools"/>           -->
 
-
   </ccm:build>
+
+<!-- possible addons  --> 
+
+<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+<!--    <ccm:application name="ccm-cms-types-event"/>                -->
+<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
+<!--    <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-organization"/>         -->
+<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
+<!--    <ccm:application name="ccm-cms-types-service"/>              -->
+<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->   
+<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
+<!--    <ccm:application name="ccm-auth-http"/>                      -->
+<!--    <ccm:application name="ccm-bookmarks"/>                      -->
+<!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
+<!--    <ccm:application name="ccm-simplesurvey"/>                   -->
+<!--    <ccm:application name="ccm-weblog"/>                         -->
+<!--    <ccm:application name="ccm-webpage"/>                        -->
+<!--    <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:project>
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/project.xml b/ccm-gen-aplaws/bundles/nsh/cfg/project.xml
index e3964fc8b..93125de71 100644
--- a/ccm-gen-aplaws/bundles/nsh/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/project.xml
@@ -8,8 +8,8 @@
               ccmVersion="6.1" 
                     name="aplaws-nsh" 
               prettyName="APLAWS plus NSH" 
-                 version="1-1-1" 
-                 release="r796" 
+                 version="1-1-4" 
+                 release="r1110" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
index 9cefe9df0..bcf1c4ea5 100644
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/project.xml
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-staatsschiff" 
               prettyName="APLAWS plus" 
-                 version="1-1-1" 
-                 release="780" 
+                 version="1-1-4" 
+                 release="1110" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
index 2ad0f352b..978b0bac3 100644
--- a/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/project.xml
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-zsr" 
               prettyName="APLAWS plus" 
-                 version="1-1-1" 
-                 release="765" 
+                 version="1-1-4" 
+                 release="1110" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-iaw-aplaws/bundles/devel/cfg/project.xml b/ccm-iaw-aplaws/bundles/devel/cfg/project.xml
index 38a4d140a..91f7927b7 100644
--- a/ccm-iaw-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-iaw-aplaws/bundles/devel/cfg/project.xml
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-iaw" 
               prettyName="APLAWS plus" 
-                 version="1-1-1" 
-                 release="rc2-780" 
+                 version="1-1-4" 
+                 release="r1107" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
index bf5fc151d..ff947f044 100644
--- a/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-iaw-aplaws/bundles/standard/cfg/integration.properties
@@ -138,7 +138,7 @@ waf.admin.password.question=12345
 waf.admin.password.answer=6
 
 ; devel specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-113?user\=iaw&password\=iaw24
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-114?user\=iaw&password\=iaw24
 waf.runtime.jdbc_pool_size=40
 
 waf.web.server=localhost\:8080
diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/project.xml b/ccm-iaw-aplaws/bundles/standard/cfg/project.xml
index 38a4d140a..47e089345 100644
--- a/ccm-iaw-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-iaw-aplaws/bundles/standard/cfg/project.xml
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-iaw" 
               prettyName="APLAWS plus" 
-                 version="1-1-1" 
-                 release="rc2-780" 
+                 version="1-1-4" 
+                 release="r1110" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -29,17 +29,59 @@
 
 <!--   Content Types   -->
 <!--   - - - - - - -    -->
-<!--    <ccm:application name="ccm-cms-types-address"/>              -->
-<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+        <ccm:application name="ccm-cms-types-address"/>
         <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-contact"/>
         <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-mparticle"/>
+        <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-siteproxy"/>               
+
+<!--  Applications   -->
+<!--  - - - - -  -   -->
+        <ccm:application name="ccm-portalworkspace"/>                
+        <ccm:application name="ccm-themedirector"/>                
+        <ccm:application name="ccm-user-preferences"/>
+
+<!--  LDN extension  -->
+<!--  - - - - - - -  -->
+        <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"/>                    
+        <ccm:application name="ccm-ldn-terms"/>
+        <ccm:application name="ccm-ldn-util"/>
+
+
+<!--  IAW extension  (for new version 1.1.4)   -->
+<!--  - - - - - - - - - - - - - - - - - - -    -->
+        <ccm:application name="ccm-sci-types-member"/>
+        <ccm:application name="ccm-cms-dabinpersonimporter" />
+        <ccm:application name="ccm-cms-publicpersonalprofile"/>
+
+        <ccm:application name="ccm-iaw-aplaws"/>
+
+
+
+<!-- tools will be downloaded from trunk, but does not
+     contain java code to be compiled!
+        <ccm:application name="tools"/>           -->
+
+
+  </ccm:build>
+
+<!--  probable addons    --> 
+
+<!--   Content Types   -->
+<!--   - - - - - - -    -->
+<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+<!--    <ccm:application name="ccm-cms-types-faqitem"/>              -->
 <!--    <ccm:application name="ccm-cms-types-glossaryitem"/>         -->
 <!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
 <!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
@@ -47,13 +89,10 @@
 <!--    <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-person"/>         -->
 <!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
 <!--    <ccm:application name="ccm-cms-types-service"/>              -->
-        <ccm:application name="ccm-cms-types-siteproxy"/>               
 <!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->
 
 <!--  Applications   -->
@@ -65,7 +104,6 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
 <!--    <ccm:application name="ccm-forum"/>                          -->
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
-        <ccm:application name="ccm-user-preferences"/>
 <!--    <ccm:application name="ccm-weblog"/>                         -->
 <!--    <ccm:application name="ccm-webpage"/>                        -->
 
@@ -77,31 +115,6 @@
 <!--    <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-portal"/>
-        <ccm:application name="ccm-ldn-rss"/>                        
-        <ccm:application name="ccm-ldn-search"/>
-        <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
-        <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
-        <ccm:application name="ccm-ldn-util"/>
 
 
-<!--  IAW extension  -->
-<!--  - - - - - - -  -->
-<!--    <ccm:application name="ccm-cms-dabinimporter" />
-        <ccm:application name="ccm-sci-types-organization"/>
-        <ccm:application name="ccm-sci-publications"/>
--->
-        <ccm:application name="ccm-iaw-aplaws"/>
-
-
-
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
-
-  </ccm:build>
 </ccm:project>