Umbenennen rss-lsd-rss Teil 1.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1446 8810af33-2d31-482b-a856-94f89814c4df

ccm-bundle/bundles/devel/cfg/project.xml

@@ -84,6 +84,7 @@
 <!--    temporyrily excluded because configuration has to be cleared
         <ccm:application name="ccm-ldn-rss"/>                        
 -->
+        <ccm:application name="ccm-rssfeed"/>                        
 
 
 

ccm-rssfeed/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-ldn-rss"
+  name="ccm-rssfeed"
   prettyName="RSS"
   version="6.6.0"
   release="1"
@@ -16,7 +16,8 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Red Hat Web Application Framework is a platform for writing
+    The RSSfeed package provides a rss feeder which may be used to deploy
-    database-backed web applications in Java.
+    internal content which is selected by categorization as well as external
+    content based on URL.
   </ccm:description>
 </ccm:application>

ccm-rssfeed/src/ccm-rssfeed.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
    <config class="com.arsdigita.london.rss.RSSConfig"
-           storage="ccm-ldn-rss/rss.properties"/>
+           storage="ccm-rssfeed/rss.properties"/>
 </registry>

ccm-rssfeed/src/ccm-rssfeed.load

@@ -14,7 +14,7 @@
     <initializer class="com.arsdigita.london.rss.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-ldn-rss"/>
+    <schema directory="ccm-rssfeed"/>
     <data class="com.arsdigita.london.rss.Loader"/>
   </scripts>
 </load>

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -86,6 +86,7 @@
 <!--    temporyrily excluded because configuration has to be cleared
         <ccm:application name="ccm-ldn-rss"/>                        
 -->
+        <ccm:application name="ccm-rssfeed"/>                        
 
 <!--   SCI extension  -->
 <!--

tools-ng/netbeans/project.xml

@@ -2,9 +2,6 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <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>
@@ -109,12 +106,6 @@
                     <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>
@@ -145,12 +136,6 @@
                     <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>
@@ -241,12 +226,6 @@
                     <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>
@@ -361,6 +340,12 @@
                     <location>ccm-portalworkspace/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-portalworkspace-homepage (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portalworkspace-homepage/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-portlet-bookmarks (Source)</label>
                     <type>java</type>
@@ -379,6 +364,12 @@
                     <location>ccm-portlet-motd/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-rssfeed (Source)</label>
+                    <type>java</type>
+                    <location>ccm-rssfeed/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-shortcuts (Source)</label>
                     <type>java</type>
@@ -403,12 +394,6 @@
                     <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>
@@ -451,24 +436,12 @@
                     <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-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>
@@ -493,6 +466,12 @@
                     <location>ccm-ldn-types-esdservice/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-ldn-userpreferences (Source)</label>
+                    <type>java</type>
+                    <location>ccm-ldn-userpreferences/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-util (Source)</label>
                     <type>java</type>
@@ -511,24 +490,24 @@
                     <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-sci-bundle (Source)</label>
                     <type>java</type>
                     <location>ccm-sci-bundle/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-sci-personalprojects (Source)</label>
+                    <type>java</type>
+                    <location>ccm-sci-personalprojects/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-sci-personalpublications (Source)</label>
+                    <type>java</type>
+                    <location>ccm-sci-personalpublications/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-sci-publications (Source)</label>
                     <type>java</type>
@@ -536,15 +515,27 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>ccm-sci-types-organizationwithpublications (Source)</label>
+                    <label>ccm-sci-types-department (Source)</label>
                     <type>java</type>
-                    <location>ccm-sci-types-organizationwithpublications/src</location>
+                    <location>ccm-sci-types-department/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>ccm-sci-types-organization (Source)</label>
+                    <label>ccm-sci-types-institute (Source)</label>
                     <type>java</type>
-                    <location>ccm-sci-types-organization/src</location>
+                    <location>ccm-sci-types-institute/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-sci-types-member (Source)</label>
+                    <type>java</type>
+                    <location>ccm-sci-types-member/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-sci-types-project (Source)</label>
+                    <type>java</type>
+                    <location>ccm-sci-types-project/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
@@ -646,10 +637,6 @@
                         <label>ccm-cms-types-contact (Source)</label>
                         <location>ccm-cms-types-contact/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-cms-types-esdservice (Source)</label>
-                        <location>ccm-cms-types-esdservice/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-event (Source)</label>
                         <location>ccm-cms-types-event/src</location>
@@ -670,10 +657,6 @@
                         <label>ccm-cms-types-formsectionitem (Source)</label>
                         <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>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-glossaryitem (Source)</label>
                         <location>ccm-cms-types-glossaryitem/src</location>
@@ -810,6 +793,10 @@
                         <label>ccm-portalworkspace (Source)</label>
                         <location>ccm-portalworkspace/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portalworkspace-homepage (Source)</label>
+                        <location>ccm-portalworkspace-homepage/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-portlet-bookmarks (Source)</label>
                         <location>ccm-portlet-bookmarks/src</location>
@@ -822,6 +809,10 @@
                         <label>ccm-portlet-motd (Source)</label>
                         <location>ccm-portlet-motd/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-rssfeed (Source)</label>
+                        <location>ccm-rssfeed/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-shortcuts (Source)</label>
                         <location>ccm-shortcuts/src</location>
@@ -838,10 +829,6 @@
                         <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>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-weblog (Source)</label>
                         <location>ccm-weblog/src</location>
@@ -870,18 +857,10 @@
                         <label>ccm-ldn-freeform (Source)</label>
                         <location>ccm-ldn-freeform/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-ldn-image-step (Source)</label>
-                        <location>ccm-ldn-image-step/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-importer (Source)</label>
                         <location>ccm-ldn-importer/src</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-ldn-rss (Source)</label>
-                        <location>ccm-ldn-rss/src</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-search (Source)</label>
                         <location>ccm-ldn-search/src</location>
@@ -898,6 +877,10 @@
                         <label>ccm-ldn-types-esdservice (Source)</label>
                         <location>ccm-ldn-types-esdservice/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-ldn-userpreferences (Source)</label>
+                        <location>ccm-ldn-userpreferences/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-ldn-util (Source)</label>
                         <location>ccm-ldn-util/src</location>
@@ -910,37 +893,37 @@
                         <label>ccm-gen-aplaws (Web)</label>
                         <location>ccm-gen-aplaws/web</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-shp-aplaws (Source)</label>
-                        <location>ccm-shp-aplaws/src</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-shp-aplaws (Web)</label>
-                        <location>ccm-shp-aplaws/web</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-zes-aplaws (Source)</label>
-                        <location>ccm-zes-aplaws/src</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>ccm-zes-aplaws (Web)</label>
-                        <location>ccm-zes-aplaws/web</location>
-                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-sci-bundle (Source)</label>
                         <location>ccm-sci-bundle/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-personalprojects (Source)</label>
+                        <location>ccm-sci-personalprojects/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-personalpublications (Source)</label>
+                        <location>ccm-sci-personalpublications/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-sci-publications (Source)</label>
                         <location>ccm-sci-publications/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-types-organization (Source)</label>
+                        <label>ccm-sci-type-departement (Source)</label>
-                        <location>ccm-sci-types-organization/src</location>
+                        <location>ccm-sci-type-departement/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-types-organizationwithpublications (Source)</label>
+                        <label>ccm-sci-type-institute (Source)</label>
-                        <location>ccm-sci-types-organizationwithpublications/src</location>
+                        <location>ccm-sci-type-institute/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-type-member (Source)</label>
+                        <location>ccm-sci-type-member/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-sci-type-project (Source)</label>
+                        <location>ccm-sci-type-project/src</location>
                     </source-folder>
                     <source-file>
                         <location>build.xml</location>
@@ -979,7 +962,6 @@
                 <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-glossaryitem/src</package-root>
                 <package-root>ccm-cms-types-healthCareFacility/src</package-root>
                 <package-root>ccm-cms-types-htmlform/src</package-root>
@@ -996,8 +978,8 @@
                 <package-root>ccm-cms-types-person/src</package-root>
                 <package-root>ccm-cms-types-pressrelease/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-simpleaddress/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>
@@ -1014,14 +996,15 @@
                 <package-root>ccm-navigation/src</package-root>
                 <package-root>ccm-portalserver/src</package-root>
                 <package-root>ccm-portalworkspace/src</package-root>
+                <package-root>ccm-portalworkspace-homepage/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-rssfeed/src</package-root>
                 <package-root>ccm-shortcuts/src</package-root>
                 <package-root>ccm-simplesurvey/src</package-root>
                 <package-root>ccm-subsite/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>
                 <package-root>ccm-ldn-aplaws/src</package-root>
@@ -1029,24 +1012,23 @@
                 <package-root>ccm-ldn-dublin/src</package-root>
                 <package-root>ccm-ldn-exporter/src</package-root>
                 <package-root>ccm-ldn-freeform/src</package-root>
-                <package-root>ccm-ldn-image-step/src</package-root>
                 <package-root>ccm-ldn-importer/src</package-root>
-                <package-root>ccm-ldn-rss/src</package-root>
                 <package-root>ccm-ldn-search/src</package-root>
                 <package-root>ccm-ldn-terms/src</package-root>
                 <package-root>ccm-ldn-types-contact/src</package-root>
                 <package-root>ccm-ldn-types-esdservice/src</package-root>
+                <package-root>ccm-ldn-userpreferences/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>
-                <package-root>ccm-shp-aplaws/src</package-root>
-                <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-bundle/src</package-root>
+                <package-root>ccm-sci-personalprojects/src</package-root>
+                <package-root>ccm-sci-personalpublications/src</package-root>
                 <package-root>ccm-sci-publications/src</package-root>
-                <package-root>ccm-sci-types-organization/src</package-root>
+                <package-root>ccm-sci-type-department/src</package-root>
-                <package-root>ccm-sci-types-organizationwithpublications/src</package-root>
+                <package-root>ccm-sci-type-institute/src</package-root>
+                <package-root>ccm-sci-type-member/src</package-root>
+                <package-root>ccm-sci-type-project/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>