Renaming xmlfeed as content type

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

ccm-cms-types-xmlfeed/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-ldn-xmlfeed"
+  name="ccm-cms-types-xmlfeed"
   prettyName="XML Feed"
   version="6.5.0"
   release="1"
@@ -16,7 +16,11 @@
     <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 XML feed content type allows external XML feeds to act as data sources
+    in the CCM system.
+    
+    CCM is a collaboration and content management system which is based upon
+    the Red Hat Web Application Framework (WAF), which is a platform for writing
     database-backed web applications in Java.
   </ccm:description>
 </ccm:application>

ccm-cms-types-xmlfeed/debian/ccm-cms-types-xmlfeed.dirs

@@ -0,0 +1 @@
+usr/share/java/ccm-cms-types-xmlfeed-6.3.0

ccm-cms-types-xmlfeed/debian/ccm-settings.sh

@@ -14,9 +14,9 @@ DEBIAN_HAS_FRONTEND=$orig_DEBIAN_HAS_FRONTEND
 
 # variables we use [especially in ccm-install.sh]
 
-name=ccm-ldn-xmlfeed
+name=ccm-cms-types-xmlfeed
 version=6.3.0
-appname=ccm-ldn-xmlfeed
+appname=ccm-cms-types-xmlfeed
 appversion=6.3.0
 confdir="/etc/ccm/conf"
 sharedjardir="/usr/share/java"

ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.load

@@ -15,7 +15,7 @@
     <initializer class="com.arsdigita.cms.contenttypes.xmlfeed.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-ldn-xmlfeed"/>
+    <schema directory="ccm-cms-types-xmlfeed"/>
     <data class="com.arsdigita.cms.contenttypes.xmlfeed.Loader"/>
   </scripts>
 </load>

ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java

@@ -90,7 +90,8 @@ public final class XMLFeed extends FormItem {
     private static Logger s_log = Logger.getLogger(XMLFeed.class);
 
     // ===== Constants ======================================================= //
-    public static final String versionID = "$Id: XMLFeed.java 755 2005-09-02 13:42:47Z sskracic $";
+    public static final String versionID =
+            "$Id: XMLFeed.java 755 2005-09-02 13:42:47Z sskracic $";
 
     /**
      * The fully qualified model name of the underlying data object, which in
@@ -223,7 +224,8 @@ public final class XMLFeed extends FormItem {
         DataAssociationCursor allFields = getForm().getComponents();
 
         while (allFields.next()) {
-            PersistentComponent c = (PersistentComponent) DomainObjectFactory.newInstance(allFields.getDataObject());
+            PersistentComponent c = (PersistentComponent)
+                    DomainObjectFactory.newInstance(allFields.getDataObject());
             if (c instanceof PersistentWidget && !(c instanceof PersistentSubmit)) {
                 names.add(((PersistentWidget) c).getParameterName());
             }
@@ -250,8 +252,8 @@ public final class XMLFeed extends FormItem {
                                    Component c) {
         super.generateXMLBody(state, parent, c);
         
-        String data = (String)state.getRequest()
+        String data = (String)state.getRequest().getAttribute(
-            .getAttribute(RetrieveListener.REQUEST_RESULTS_KEY);
+                                        RetrieveListener.REQUEST_RESULTS_KEY);
         
         Element label = parent.newChildElement(
             "bebop:label", Component.BEBOP_XML_NS);

ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java

@@ -80,7 +80,8 @@ public class RetrieveListener implements FormProcessListener{
     private static final Logger s_log = Logger.getLogger(RetrieveListener.class);
 
     // ===== Constants ======================================================= //
-    public static final String versionId = "$Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $";
+    public static final String versionId =
+            "$Id: RetrieveListener.java 755 2005-09-02 13:42:47Z sskracic $";
     
     /** The key that the results are stored in the request under. */
     public static final String REQUEST_RESULTS_KEY = "XML Feed Results";

ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java

@@ -90,7 +90,8 @@ public final class XSLFileProperties extends SecurityPropertyEditor
     private static Logger s_log = Logger.getLogger(XSLFileProperties.class);
 
     // ===== Constants ======================================================= //
-    public static final String versionId = "$Id: XSLFileProperties.java 755 2005-09-02 13:42:47Z sskracic $";
+    public static final String versionId =
+            "$Id: XSLFileProperties.java 755 2005-09-02 13:42:47Z sskracic $";
 
     public static final String MIME_TYPE = "application/xsl+xml";
     public static final String FILE_UPLOAD = FileUploadSection.FILE_UPLOAD;

ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg

@@ -7,30 +7,31 @@ ccm-cms-assets-relatedlink
 ccm-cms-assets-fileattachment
 
 # Content types
+ccm-cms-types-address
 ccm-cms-types-agenda
 ccm-cms-types-article
+ccm-cms-types-bookmark
+ccm-cms-types-contact
+ccm-cms-types-esdservice
 ccm-cms-types-event
+ccm-cms-types-faqitem
+ccm-cms-types-filestorageitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-formitem
+ccm-cms-types-glossaryitem
+ccm-cms-types-htmlform
+ccm-cms-types-inlinesite
 ccm-cms-types-job
 ccm-cms-types-legalnotice
 ccm-cms-types-minutes
+ccm-cms-types-motditem
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
+ccm-cms-types-organization
 ccm-cms-types-pressrelease
 ccm-cms-types-service
-ccm-cms-types-inlinesite
 ccm-cms-types-siteproxy
-ccm-cms-types-bookmark
+ccm-cms-types-xmlfeed
-ccm-cms-types-address
-ccm-cms-types-glossaryitem
-ccm-cms-types-faqitem
-ccm-cms-types-organization
-ccm-cms-types-filestorageitem
-ccm-cms-types-contact
-ccm-cms-types-esdservice
-ccm-cms-types-htmlform
-ccm-cms-types-motditem
 
 ccm-ldn-image-step
 
@@ -51,7 +52,6 @@ ccm-ldn-freeform
 ccm-user-preferences
 ccm-forum
 ccm-simplesurvey
-ccm-ldn-xmlfeed
 ccm-auth-http
 ccm-ldn-importer
 ccm-ldn-exporter

ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg

@@ -7,17 +7,17 @@ ccm-cms-assets-relatedlink
 ccm-ldn-dublin
 
 # Content types
+ccm-cms-types-article
 ccm-cms-types-contact
 ccm-cms-types-esdservice
-ccm-cms-types-article
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-pressrelease
+ccm-cms-types-xmlfeed
 
 # Applications
 ccm-ldn-util

ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg

@@ -7,17 +7,17 @@ ccm-cms-assets-relatedlink
 ccm-ldn-dublin
 
 # Content types
+ccm-cms-types-article
 ccm-cms-types-contact
 ccm-cms-types-esdservice
-ccm-cms-types-article
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-pressrelease
+ccm-cms-types-xmlfeed
 
 # Applications
 ccm-ldn-util

ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg

@@ -8,17 +8,17 @@ ccm-cms-assets-fileattachment
 ccm-ldn-dublin
 
 # Content types
+ccm-cms-types-article
 ccm-cms-types-contact
 ccm-cms-types-esdservice
-ccm-cms-types-article
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-pressrelease
+ccm-cms-types-xmlfeed
 
 # Applications
 ccm-ldn-util

ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs

@@ -1 +0,0 @@
-usr/share/java/ccm-ldn-xmlfeed-6.3.0

ccm-shp-aplaws/bundles/devel/cfg/applications.cfg

@@ -7,17 +7,17 @@ ccm-cms-assets-relatedlink
 ccm-ldn-dublin
 
 # Content types
+ccm-cms-types-article
 ccm-cms-types-contact
 ccm-cms-types-esdservice
-ccm-cms-types-article
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-pressrelease
+ccm-cms-types-xmlfeed
 
 # Applications
 ccm-ldn-util

ccm-shp-aplaws/bundles/standard/cfg/applications.cfg

@@ -8,17 +8,17 @@ ccm-cms-assets-fileattachment
 ccm-ldn-dublin
 
 # Content types
+ccm-cms-types-article
 ccm-cms-types-contact
 ccm-cms-types-esdservice
-ccm-cms-types-article
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-pressrelease
+ccm-cms-types-xmlfeed
 
 # Applications
 ccm-ldn-util