From 8fa5abb9fbe93ffd497d56a05aafae6400dfbdb9 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 15 Mar 2009 10:41:39 +0000 Subject: [PATCH] Renaming xmlfeed as content type git-svn-id: https://svn.libreccm.org/ccm/trunk@92 8810af33-2d31-482b-a856-94f89814c4df --- .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.svnignore | 0 .../application.xml | 8 +++++-- .../debian/ccm-build.sh | 0 .../debian/ccm-clean.sh | 0 .../debian/ccm-cms-types-xmlfeed.dirs | 1 + .../debian/ccm-config.sh | 0 .../debian/ccm-disperse.sh | 0 .../debian/ccm-install.sh | 0 .../debian/ccm-settings-run.sh | 0 .../debian/ccm-settings.sh | 4 ++-- .../debian/changelog | 0 .../debian/compat | 0 .../debian/config | 0 .../debian/control | 0 .../debian/copyright | 0 .../debian/postinst | 0 .../debian/postrm | 0 .../debian/prerm | 0 .../debian/rules | 0 .../debian/templates | 0 .../doc/example-xsl/ums-banks.xsl | 0 .../doc/example-xsl/ums-education.xsl | 0 .../doc/example-xsl/ums-nrs.xsl | 0 .../cms/contenttypes/xmlfeed/XMLFeed.pdl | 0 .../default/upgrade/create-cms_xml_feeds.sql | 0 .../oracle-se-create.sql | 0 .../postgres-create.sql | 0 .../upgrade/oracle-se-1.sql | 0 .../upgrade/postgres-1.sql | 0 .../arsdigita/cms/contenttypes/XMLFeed.xml | 0 .../src/ccm-ldn-xmlfeed.config | 0 .../src/ccm-ldn-xmlfeed.load | 2 +- .../cms/contenttypes/xmlfeed/Initializer.java | 0 .../cms/contenttypes/xmlfeed/Loader.java | 0 .../xmlfeed/Loader_parameter.properties | 0 .../cms/contenttypes/xmlfeed/XMLFeed.java | 10 ++++---- .../xmlfeed/listener/RetrieveListener.java | 3 ++- .../xmlfeed/ui/XMLFeedProperties.java | 0 .../xmlfeed/ui/XSLFileProperties.java | 3 ++- .../arsdigita/cms/contenttypes/XMLFeed.xsl | 0 .../bundles/complete/cfg/applications.cfg | 24 +++++++++---------- .../bundles/demo/cfg/applications.cfg | 10 ++++---- .../bundles/devel/cfg/applications.cfg | 10 ++++---- .../bundles/standard/cfg/applications.cfg | 10 ++++---- ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs | 1 - .../bundles/devel/cfg/applications.cfg | 10 ++++---- .../bundles/standard/cfg/applications.cfg | 10 ++++---- 49 files changed, 57 insertions(+), 49 deletions(-) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/.settings/org.eclipse.jdt.core.prefs (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/.svnignore (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/application.xml (72%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-build.sh (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-clean.sh (100%) create mode 100755 ccm-cms-types-xmlfeed/debian/ccm-cms-types-xmlfeed.dirs rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-config.sh (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-disperse.sh (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-install.sh (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-settings-run.sh (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/ccm-settings.sh (92%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/changelog (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/compat (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/config (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/control (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/copyright (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/postinst (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/postrm (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/prerm (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/rules (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/debian/templates (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/doc/example-xsl/ums-banks.xsl (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/doc/example-xsl/ums-education.xsl (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/doc/example-xsl/ums-nrs.xsl (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/pdl/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.pdl (100%) rename {ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed}/default/upgrade/create-cms_xml_feeds.sql (100%) rename {ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed}/oracle-se-create.sql (100%) rename {ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed}/postgres-create.sql (100%) rename {ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed}/upgrade/oracle-se-1.sql (100%) rename {ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed}/upgrade/postgres-1.sql (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xml (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/ccm-ldn-xmlfeed.config (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/ccm-ldn-xmlfeed.load (92%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader_parameter.properties (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java (95%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java (98%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java (100%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java (98%) rename {ccm-ldn-xmlfeed => ccm-cms-types-xmlfeed}/web/static/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xsl (100%) delete mode 100755 ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs diff --git a/ccm-ldn-xmlfeed/.settings/org.eclipse.jdt.core.prefs b/ccm-cms-types-xmlfeed/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ccm-ldn-xmlfeed/.settings/org.eclipse.jdt.core.prefs rename to ccm-cms-types-xmlfeed/.settings/org.eclipse.jdt.core.prefs diff --git a/ccm-ldn-xmlfeed/.settings/org.eclipse.jdt.ui.prefs b/ccm-cms-types-xmlfeed/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from ccm-ldn-xmlfeed/.settings/org.eclipse.jdt.ui.prefs rename to ccm-cms-types-xmlfeed/.settings/org.eclipse.jdt.ui.prefs diff --git a/ccm-ldn-xmlfeed/.svnignore b/ccm-cms-types-xmlfeed/.svnignore similarity index 100% rename from ccm-ldn-xmlfeed/.svnignore rename to ccm-cms-types-xmlfeed/.svnignore diff --git a/ccm-ldn-xmlfeed/application.xml b/ccm-cms-types-xmlfeed/application.xml similarity index 72% rename from ccm-ldn-xmlfeed/application.xml rename to ccm-cms-types-xmlfeed/application.xml index 4a60fd731..2536e1cc2 100755 --- a/ccm-ldn-xmlfeed/application.xml +++ b/ccm-cms-types-xmlfeed/application.xml @@ -1,6 +1,6 @@ - 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. diff --git a/ccm-ldn-xmlfeed/debian/ccm-build.sh b/ccm-cms-types-xmlfeed/debian/ccm-build.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-build.sh rename to ccm-cms-types-xmlfeed/debian/ccm-build.sh diff --git a/ccm-ldn-xmlfeed/debian/ccm-clean.sh b/ccm-cms-types-xmlfeed/debian/ccm-clean.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-clean.sh rename to ccm-cms-types-xmlfeed/debian/ccm-clean.sh diff --git a/ccm-cms-types-xmlfeed/debian/ccm-cms-types-xmlfeed.dirs b/ccm-cms-types-xmlfeed/debian/ccm-cms-types-xmlfeed.dirs new file mode 100755 index 000000000..cc35c213a --- /dev/null +++ b/ccm-cms-types-xmlfeed/debian/ccm-cms-types-xmlfeed.dirs @@ -0,0 +1 @@ +usr/share/java/ccm-cms-types-xmlfeed-6.3.0 diff --git a/ccm-ldn-xmlfeed/debian/ccm-config.sh b/ccm-cms-types-xmlfeed/debian/ccm-config.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-config.sh rename to ccm-cms-types-xmlfeed/debian/ccm-config.sh diff --git a/ccm-ldn-xmlfeed/debian/ccm-disperse.sh b/ccm-cms-types-xmlfeed/debian/ccm-disperse.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-disperse.sh rename to ccm-cms-types-xmlfeed/debian/ccm-disperse.sh diff --git a/ccm-ldn-xmlfeed/debian/ccm-install.sh b/ccm-cms-types-xmlfeed/debian/ccm-install.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-install.sh rename to ccm-cms-types-xmlfeed/debian/ccm-install.sh diff --git a/ccm-ldn-xmlfeed/debian/ccm-settings-run.sh b/ccm-cms-types-xmlfeed/debian/ccm-settings-run.sh similarity index 100% rename from ccm-ldn-xmlfeed/debian/ccm-settings-run.sh rename to ccm-cms-types-xmlfeed/debian/ccm-settings-run.sh diff --git a/ccm-ldn-xmlfeed/debian/ccm-settings.sh b/ccm-cms-types-xmlfeed/debian/ccm-settings.sh similarity index 92% rename from ccm-ldn-xmlfeed/debian/ccm-settings.sh rename to ccm-cms-types-xmlfeed/debian/ccm-settings.sh index 8be80634e..8e18200b7 100755 --- a/ccm-ldn-xmlfeed/debian/ccm-settings.sh +++ b/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" diff --git a/ccm-ldn-xmlfeed/debian/changelog b/ccm-cms-types-xmlfeed/debian/changelog similarity index 100% rename from ccm-ldn-xmlfeed/debian/changelog rename to ccm-cms-types-xmlfeed/debian/changelog diff --git a/ccm-ldn-xmlfeed/debian/compat b/ccm-cms-types-xmlfeed/debian/compat similarity index 100% rename from ccm-ldn-xmlfeed/debian/compat rename to ccm-cms-types-xmlfeed/debian/compat diff --git a/ccm-ldn-xmlfeed/debian/config b/ccm-cms-types-xmlfeed/debian/config similarity index 100% rename from ccm-ldn-xmlfeed/debian/config rename to ccm-cms-types-xmlfeed/debian/config diff --git a/ccm-ldn-xmlfeed/debian/control b/ccm-cms-types-xmlfeed/debian/control similarity index 100% rename from ccm-ldn-xmlfeed/debian/control rename to ccm-cms-types-xmlfeed/debian/control diff --git a/ccm-ldn-xmlfeed/debian/copyright b/ccm-cms-types-xmlfeed/debian/copyright similarity index 100% rename from ccm-ldn-xmlfeed/debian/copyright rename to ccm-cms-types-xmlfeed/debian/copyright diff --git a/ccm-ldn-xmlfeed/debian/postinst b/ccm-cms-types-xmlfeed/debian/postinst similarity index 100% rename from ccm-ldn-xmlfeed/debian/postinst rename to ccm-cms-types-xmlfeed/debian/postinst diff --git a/ccm-ldn-xmlfeed/debian/postrm b/ccm-cms-types-xmlfeed/debian/postrm similarity index 100% rename from ccm-ldn-xmlfeed/debian/postrm rename to ccm-cms-types-xmlfeed/debian/postrm diff --git a/ccm-ldn-xmlfeed/debian/prerm b/ccm-cms-types-xmlfeed/debian/prerm similarity index 100% rename from ccm-ldn-xmlfeed/debian/prerm rename to ccm-cms-types-xmlfeed/debian/prerm diff --git a/ccm-ldn-xmlfeed/debian/rules b/ccm-cms-types-xmlfeed/debian/rules similarity index 100% rename from ccm-ldn-xmlfeed/debian/rules rename to ccm-cms-types-xmlfeed/debian/rules diff --git a/ccm-ldn-xmlfeed/debian/templates b/ccm-cms-types-xmlfeed/debian/templates similarity index 100% rename from ccm-ldn-xmlfeed/debian/templates rename to ccm-cms-types-xmlfeed/debian/templates diff --git a/ccm-ldn-xmlfeed/doc/example-xsl/ums-banks.xsl b/ccm-cms-types-xmlfeed/doc/example-xsl/ums-banks.xsl similarity index 100% rename from ccm-ldn-xmlfeed/doc/example-xsl/ums-banks.xsl rename to ccm-cms-types-xmlfeed/doc/example-xsl/ums-banks.xsl diff --git a/ccm-ldn-xmlfeed/doc/example-xsl/ums-education.xsl b/ccm-cms-types-xmlfeed/doc/example-xsl/ums-education.xsl similarity index 100% rename from ccm-ldn-xmlfeed/doc/example-xsl/ums-education.xsl rename to ccm-cms-types-xmlfeed/doc/example-xsl/ums-education.xsl diff --git a/ccm-ldn-xmlfeed/doc/example-xsl/ums-nrs.xsl b/ccm-cms-types-xmlfeed/doc/example-xsl/ums-nrs.xsl similarity index 100% rename from ccm-ldn-xmlfeed/doc/example-xsl/ums-nrs.xsl rename to ccm-cms-types-xmlfeed/doc/example-xsl/ums-nrs.xsl diff --git a/ccm-ldn-xmlfeed/pdl/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.pdl b/ccm-cms-types-xmlfeed/pdl/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.pdl similarity index 100% rename from ccm-ldn-xmlfeed/pdl/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.pdl rename to ccm-cms-types-xmlfeed/pdl/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.pdl diff --git a/ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/default/upgrade/create-cms_xml_feeds.sql b/ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/default/upgrade/create-cms_xml_feeds.sql similarity index 100% rename from ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/default/upgrade/create-cms_xml_feeds.sql rename to ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/default/upgrade/create-cms_xml_feeds.sql diff --git a/ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/oracle-se-create.sql b/ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/oracle-se-create.sql similarity index 100% rename from ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/oracle-se-create.sql rename to ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/oracle-se-create.sql diff --git a/ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/postgres-create.sql b/ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/postgres-create.sql similarity index 100% rename from ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/postgres-create.sql rename to ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/postgres-create.sql diff --git a/ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/upgrade/oracle-se-1.sql b/ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/upgrade/oracle-se-1.sql similarity index 100% rename from ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/upgrade/oracle-se-1.sql rename to ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/upgrade/oracle-se-1.sql diff --git a/ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/upgrade/postgres-1.sql b/ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/upgrade/postgres-1.sql similarity index 100% rename from ccm-ldn-xmlfeed/sql/ccm-ldn-xmlfeed/upgrade/postgres-1.sql rename to ccm-cms-types-xmlfeed/sql/ccm-cms-types-xmlfeed/upgrade/postgres-1.sql diff --git a/ccm-ldn-xmlfeed/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xml b/ccm-cms-types-xmlfeed/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xml similarity index 100% rename from ccm-ldn-xmlfeed/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xml rename to ccm-cms-types-xmlfeed/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xml diff --git a/ccm-ldn-xmlfeed/src/ccm-ldn-xmlfeed.config b/ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.config similarity index 100% rename from ccm-ldn-xmlfeed/src/ccm-ldn-xmlfeed.config rename to ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.config diff --git a/ccm-ldn-xmlfeed/src/ccm-ldn-xmlfeed.load b/ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.load similarity index 92% rename from ccm-ldn-xmlfeed/src/ccm-ldn-xmlfeed.load rename to ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.load index f5ae2a8ba..6dc3953ab 100755 --- a/ccm-ldn-xmlfeed/src/ccm-ldn-xmlfeed.load +++ b/ccm-cms-types-xmlfeed/src/ccm-ldn-xmlfeed.load @@ -15,7 +15,7 @@ - + diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java similarity index 100% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java similarity index 100% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader_parameter.properties b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader_parameter.properties similarity index 100% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader_parameter.properties rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader_parameter.properties diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java similarity index 95% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java index eb7619d34..c8723df99 100755 --- a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java +++ b/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() - .getAttribute(RetrieveListener.REQUEST_RESULTS_KEY); + String data = (String)state.getRequest().getAttribute( + RetrieveListener.REQUEST_RESULTS_KEY); Element label = parent.newChildElement( "bebop:label", Component.BEBOP_XML_NS); diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java similarity index 98% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java index ce130ae5f..9922d429f 100755 --- a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java +++ b/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"; diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java similarity index 100% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java diff --git a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java b/ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java similarity index 98% rename from ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java rename to ccm-cms-types-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java index d30b4d3fb..2a23c64dc 100755 --- a/ccm-ldn-xmlfeed/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java +++ b/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; diff --git a/ccm-ldn-xmlfeed/web/static/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xsl b/ccm-cms-types-xmlfeed/web/static/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xsl similarity index 100% rename from ccm-ldn-xmlfeed/web/static/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xsl rename to ccm-cms-types-xmlfeed/web/static/content-types/com/arsdigita/cms/contenttypes/XMLFeed.xsl diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg index 15914d57e..115e31a70 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg +++ b/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-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-cms-types-xmlfeed 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 diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg index a80059125..6f53ec72f 100755 --- a/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg +++ b/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 diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg index a80059125..6f53ec72f 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg +++ b/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 diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg index 87b8ac070..f931c0386 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg +++ b/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 diff --git a/ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs b/ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs deleted file mode 100755 index dbaa16950..000000000 --- a/ccm-ldn-xmlfeed/debian/ccm-ldn-xmlfeed.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java/ccm-ldn-xmlfeed-6.3.0 diff --git a/ccm-shp-aplaws/bundles/devel/cfg/applications.cfg b/ccm-shp-aplaws/bundles/devel/cfg/applications.cfg index a80059125..6f53ec72f 100755 --- a/ccm-shp-aplaws/bundles/devel/cfg/applications.cfg +++ b/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 diff --git a/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg b/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg index 87b8ac070..f931c0386 100755 --- a/ccm-shp-aplaws/bundles/standard/cfg/applications.cfg +++ b/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