diff --git a/tools-ng/devel/lib/postgresql-jdbc-8.4.701.jar b/tools-ng/devel/lib/postgresql-jdbc-8.4.701.jar
new file mode 100644
index 000000000..2d42624d3
Binary files /dev/null and b/tools-ng/devel/lib/postgresql-jdbc-8.4.701.jar differ
diff --git a/tools-ng/devel/lib/postgresql-jdbc.jar b/tools-ng/devel/lib/postgresql-jdbc.jar
index 63e54165e..2d42624d3 100644
Binary files a/tools-ng/devel/lib/postgresql-jdbc.jar and b/tools-ng/devel/lib/postgresql-jdbc.jar differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.20.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.20.zip
deleted file mode 100644
index 7bf085249..000000000
Binary files a/tools-ng/ecdc/bundles/apache-tomcat-6.0.20.zip and /dev/null differ
diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip
new file mode 100644
index 000000000..e99615b13
Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-6.0.32.zip differ
diff --git a/tools-ng/ecdc/conf/runtime.properties b/tools-ng/ecdc/conf/runtime.properties
index abf71cbde..15a9baf4d 100644
--- a/tools-ng/ecdc/conf/runtime.properties
+++ b/tools-ng/ecdc/conf/runtime.properties
@@ -23,7 +23,7 @@
     # Tomcat version 5.5 not yet supported!
     # app.server.version=5.5.27
     # app.server.version=6.0.20
-    app.server.version=6.0.26
+    app.server.version=6.0.32
 
 
     app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version}
diff --git a/tools-ng/ecdc/local.runtime.properties b/tools-ng/ecdc/local.runtime.properties
index ff50affc3..6e8c8ca0c 100644
--- a/tools-ng/ecdc/local.runtime.properties
+++ b/tools-ng/ecdc/local.runtime.properties
@@ -12,7 +12,7 @@
     #app.server.type=tomcat
     ##  Tomcat 5.5 currently not supported!
     ##app.server.version=5.5.27
-    #app.server.version=6.0.20
+    #app.server.version=6.0.32
  
 ##
 ## Debugger Usage
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index 055d9d19f..e97e6eeff 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -3,6 +3,9 @@
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>CCM (trunk)</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
             <!-- Wenn Sie diese Datei manuell editieren, vermeiden Sie die Einstellung der Eigenschaften mittels Werkzeug. -->
             <name>CCM (trunk)</name>
             <properties/>
@@ -17,365 +20,514 @@
                     <type>web_inf</type>
                     <location>~/ccm-devel/runtime/apache-tomcat-6.0.26/webapps/ROOT/WEB-INF</location>
                 </source-folder>
+                <source-folder>
+                    <label>CCM (trunk)</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-core (Source)</label>
                     <type>java</type>
                     <location>ccm-core/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-core (Web)</label>
+                    <type>java</type>
+                    <location>ccm-core/web</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms (Source)</label>
                     <type>java</type>
                     <location>ccm-cms/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-cms (Web)</label>
+                    <type>java</type>
+                    <location>ccm-cms/web</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-assets-fileattachment (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-assets-fileattachment/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-assets-imagestep (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-assets-imagestep/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-assets-notes (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-assets-notes/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-assets-relatedlink (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-assets-relatedlink/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-address (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-address/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-agenda (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-agenda/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-article (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-article/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-baseAddress (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-baseAddress/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-baseContact (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-baseContact/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-bookmark (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-bookmark/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-contact (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-contact/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-esdservice (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-esdservice/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-event (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-event/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-faqitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-faqitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-filestorageitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-filestorageitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-formitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-formitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-formsectionitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-formsectionitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-genericorganisation (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-genericorganisation/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-glossaryitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-glossaryitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-healthCareFacility (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-healthCareFacility/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-htmlform (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-htmlform/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-inlinesite (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-inlinesite/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-job (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-job/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-legalnotice (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-legalnotice/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-member (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-member/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-minutes (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-minutes/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-motditem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-motditem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-mparticle (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-mparticle/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-newsitem (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-newsitem/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-organization (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-organization/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-organizationalunit (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-organizationalunit/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-pressrelease (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-pressrelease/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-project (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-project/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-researchnetwork (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-researchnetwork/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-service (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-service/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-cms-types-simpleaddress (Source)</label>
+                    <type>java</type>
+                    <location>ccm-cms-types-simpleaddress/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-siteproxy (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-siteproxy/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-survey (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-survey/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-cms-types-xmlfeed (Source)</label>
                     <type>java</type>
                     <location>ccm-cms-types-xmlfeed/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-auth-http (Source)</label>
                     <type>java</type>
                     <location>ccm-auth-http/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-bookmarks (Source)</label>
                     <type>java</type>
                     <location>ccm-bookmarks/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-calendar (Source)</label>
+                    <type>java</type>
+                    <location>ccm-calendar/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-docmgr (Source)</label>
                     <type>java</type>
                     <location>ccm-docmgr/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-docrepo (Source)</label>
+                    <type>java</type>
+                    <location>ccm-docrepo/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-faq (Source)</label>
+                    <type>java</type>
+                    <location>ccm-faq/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-formbuilder-pdf (Source)</label>
                     <type>java</type>
                     <location>ccm-formbuilder-pdf/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-forum (Source)</label>
                     <type>java</type>
                     <location>ccm-forum/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-forum-categorised (Source)</label>
                     <type>java</type>
                     <location>ccm-forum-categorised/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-portalserver (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portalserver/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-portalworkspace (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portalworkspace/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-portlet-bookmarks (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portlet-bookmarks/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-portlet-latestnews (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portlet-latestnews/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-portlet-motd (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portlet-motd/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-simplesurvey (Source)</label>
                     <type>java</type>
                     <location>ccm-simplesurvey/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-themedirector (Source)</label>
+                    <type>java</type>
+                    <location>ccm-themedirector/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-user-preferences (Source)</label>
                     <type>java</type>
                     <location>ccm-user-preferences/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-weblog (Source)</label>
                     <type>java</type>
                     <location>ccm-weblog/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-webpage (Source)</label>
                     <type>java</type>
                     <location>ccm-webpage/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-aplaws (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-aplaws/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-atoz (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-atoz/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-dublin (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-dublin/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-exporter (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-exporter/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-freeform (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-freeform/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-image-step (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-image-step/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-importer (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-importer/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-navigation (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-navigation/src</location>
-                </source-folder>
-                <source-folder>
-                    <label>ccm-ldn-portal (Source)</label>
-                    <type>java</type>
-                    <location>ccm-ldn-portal/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-rss (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-rss/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-search (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-search/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-shortcuts (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-shortcuts/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-subsite (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-subsite/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-terms (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-terms/src</location>
-                </source-folder>
-                <source-folder>
-                    <label>ccm-ldn-theme (Source)</label>
-                    <type>java</type>
-                    <location>ccm-ldn-theme/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-ldn-util (Source)</label>
                     <type>java</type>
                     <location>ccm-ldn-util/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-gen-aplaws (Source)</label>
                     <type>java</type>
                     <location>ccm-gen-aplaws/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-gen-aplaws (Web)</label>
                     <type>java</type>
                     <location>ccm-gen-aplaws/web</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-shp-aplaws (Source)</label>
                     <type>java</type>
                     <location>ccm-shp-aplaws/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-shp-aplaws (Web)</label>
                     <type>java</type>
                     <location>ccm-shp-aplaws/web</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-zes-aplaws (Source)</label>
                     <type>java</type>
                     <location>ccm-zes-aplaws/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
                     <label>ccm-zes-aplaws (Web)</label>
                     <type>java</type>
                     <location>ccm-zes-aplaws/web</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-sci-publications/src</label>
+                    <type>java</type>
+                    <location>ccm-sci-publications/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-sci-types-organization/src</label>
+                    <type>java</type>
+                    <location>ccm-sci-types-organization/src</location>
+                    <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
             <ide-actions>
@@ -401,6 +553,10 @@
                     <target>clean</target>
                     <target>build</target>
                 </action>
+                <action name="debug">
+                    <script>nbproject/ide-targets.xml</script>
+                    <target>debug-nb</target>
+                </action>
             </ide-actions>
             <view>
                 <items>
@@ -420,10 +576,18 @@
                         <label>ccm-core (Source)</label>
                         <location>ccm-core/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-core (Web)</label>
+                        <location>ccm-core/web</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms (Source)</label>
                         <location>ccm-cms/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms (Web)</label>
+                        <location>ccm-cms/web</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-assets-fileattachment (Source)</label>
                         <location>ccm-cms-assets-fileattachment/src</location>
@@ -493,8 +657,8 @@
                         <location>ccm-cms-types-formsectionitem/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-cms-types-genericOrganisation (Source)</label>
-                        <location>ccm-cms-types-genericOrganisation/src</location>
+                        <label>ccm-cms-types-genericorganisation (Source)</label>
+                        <location>ccm-cms-types-genericorganisation/src</location>
                     </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-glossaryitem (Source)</label>
@@ -564,6 +728,10 @@
                         <label>ccm-cms-types-service (Source)</label>
                         <location>ccm-cms-types-service/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-cms-types-simpleaddress (Source)</label>
+                        <location>ccm-cms-types-simpleaddress/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-siteproxy (Source)</label>
                         <location>ccm-cms-types-siteproxy/src</location>
@@ -584,10 +752,22 @@
                         <label>ccm-bookmarks (Source)</label>
                         <location>ccm-bookmarks/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-calendar (Source)</label>
+                        <location>ccm-calendar/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-docmgr (Source)</label>
                         <location>ccm-docmgr/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-docrepo (Source)</label>
+                        <location>ccm-docrepo/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-faq (Source)</label>
+                        <location>ccm-faq/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-formbuilder-pdf (Source)</label>
                         <location>ccm-formbuilder-pdf/src</location>
@@ -600,10 +780,34 @@
                         <label>ccm-forum-categorised (Source)</label>
                         <location>ccm-forum-categorised/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portalserver (Source)</label>
+                        <location>ccm-portalserver/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portalworkspace (Source)</label>
+                        <location>ccm-portalworkspace/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portlet-bookmarks (Source)</label>
+                        <location>ccm-portlet-bookmarks/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portlet-latestnews (Source)</label>
+                        <location>ccm-portlet-latestnews/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portlet-motd (Source)</label>
+                        <location>ccm-portlet-motd/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-simplesurvey (Source)</label>
                         <location>ccm-simplesurvey/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-themedirector (Source)</label>
+                        <location>ccm-themedirector/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-user-preferences (Source)</label>
                         <location>ccm-user-preferences/src</location>
@@ -648,10 +852,6 @@
                         <label>ccm-ldn-navigation (Source)</label>
                         <location>ccm-ldn-navigation/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-ldn-portal (Source)</label>
-                        <location>ccm-ldn-portal/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-rss (Source)</label>
                         <location>ccm-ldn-rss/src</location>
@@ -672,10 +872,6 @@
                         <label>ccm-ldn-terms (Source)</label>
                         <location>ccm-ldn-terms/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-ldn-theme (Source)</label>
-                        <location>ccm-ldn-theme/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-util (Source)</label>
                         <location>ccm-ldn-util/src</location>
@@ -704,6 +900,14 @@
                         <label>ccm-zes-aplaws (Web)</label>
                         <location>ccm-zes-aplaws/web</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-publications/src</label>
+                        <location>ccm-sci-publications/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-types-organization/src</label>
+                        <location>ccm-sci-types-organization/src</location>
+                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -716,6 +920,7 @@
                     <ide-action name="test"/>
                     <ide-action name="redeploy"/>
                     <ide-action name="rebuild"/>
+                    <ide-action name="debug"/>
                 </context-menu>
             </view>
             <subprojects/>
@@ -741,7 +946,7 @@
                 <package-root>ccm-cms-types-filestorageitem/src</package-root>
                 <package-root>ccm-cms-types-formitem/src</package-root>
                 <package-root>ccm-cms-types-formsectionitem/src</package-root>
-                <package-root>ccm-cms-types-genericOrganisation/src</package-root>
+                <package-root>ccm-cms-types-genericorganisation/src</package-root>
                 <package-root>ccm-cms-types-glossaryitem/src</package-root>
                 <package-root>ccm-cms-types-healthCareFacility/src</package-root>
                 <package-root>ccm-cms-types-htmlform/src</package-root>
@@ -758,17 +963,27 @@
                 <package-root>ccm-cms-types-pressrelease/src</package-root>
                 <package-root>ccm-cms-types-project/src</package-root>
                 <package-root>ccm-cms-types-researchnetwork/src</package-root>
+                <package-root>ccm-cms-types-simpleaddress/src</package-root>
                 <package-root>ccm-cms-types-service/src</package-root>
                 <package-root>ccm-cms-types-siteproxy/src</package-root>
                 <package-root>ccm-cms-types-survey/src</package-root>
                 <package-root>ccm-cms-types-xmlfeed/src</package-root>
                 <package-root>ccm-auth-http/src</package-root>
                 <package-root>ccm-bookmarks/src</package-root>
+                <package-root>ccm-calendar/src</package-root>
                 <package-root>ccm-docmgr/src</package-root>
+                <package-root>ccm-docrepo/src</package-root>
+                <package-root>ccm-faq/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-portalserver/src</package-root>
+                <package-root>ccm-portalworkspace/src</package-root>
+                <package-root>ccm-portlet-bookmarks/src</package-root>
+                <package-root>ccm-portlet-latestnews/src</package-root>
+                <package-root>ccm-portlet-motd/src</package-root>
                 <package-root>ccm-simplesurvey/src</package-root>
+                <package-root>ccm-themedirector/src</package-root>
                 <package-root>ccm-user-preferences/src</package-root>
                 <package-root>ccm-weblog/src</package-root>
                 <package-root>ccm-webpage/src</package-root>
@@ -780,13 +995,11 @@
                 <package-root>ccm-ldn-image-step/src</package-root>
                 <package-root>ccm-ldn-importer/src</package-root>
                 <package-root>ccm-ldn-navigation/src</package-root>
-                <package-root>ccm-ldn-portal/src</package-root>
                 <package-root>ccm-ldn-rss/src</package-root>
                 <package-root>ccm-ldn-search/src</package-root>
                 <package-root>ccm-ldn-shortcuts/src</package-root>
                 <package-root>ccm-ldn-subsite/src</package-root>
                 <package-root>ccm-ldn-terms/src</package-root>
-                <package-root>ccm-ldn-theme/src</package-root>
                 <package-root>ccm-ldn-util/src</package-root>
                 <package-root>ccm-gen-aplaws/src</package-root>
                 <package-root>ccm-gen-aplaws/web</package-root>
@@ -794,6 +1007,8 @@
                 <package-root>ccm-shp-aplaws/web</package-root>
                 <package-root>ccm-zes-aplaws/src</package-root>
                 <package-root>ccm-zes-aplaws/web</package-root>
+                <package-root>ccm-sci-publications/src</package-root>
+                <package-root>ccm-sci-types-organization/src</package-root>
                 <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>