diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml index 8f7a3fc77..c78234076 100644 --- a/ccm-bundle/bundles/devel/cfg/project.xml +++ b/ccm-bundle/bundles/devel/cfg/project.xml @@ -84,6 +84,7 @@ + diff --git a/ccm-ldn-rss/.classpath b/ccm-rssfeed/.classpath similarity index 100% rename from ccm-ldn-rss/.classpath rename to ccm-rssfeed/.classpath diff --git a/ccm-ldn-rss/.project b/ccm-rssfeed/.project similarity index 100% rename from ccm-ldn-rss/.project rename to ccm-rssfeed/.project diff --git a/ccm-ldn-rss/.settings/org.eclipse.jdt.core.prefs b/ccm-rssfeed/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ccm-ldn-rss/.settings/org.eclipse.jdt.core.prefs rename to ccm-rssfeed/.settings/org.eclipse.jdt.core.prefs diff --git a/ccm-ldn-rss/.settings/org.eclipse.jdt.ui.prefs b/ccm-rssfeed/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from ccm-ldn-rss/.settings/org.eclipse.jdt.ui.prefs rename to ccm-rssfeed/.settings/org.eclipse.jdt.ui.prefs diff --git a/ccm-ldn-rss/.svnignore b/ccm-rssfeed/.svnignore similarity index 100% rename from ccm-ldn-rss/.svnignore rename to ccm-rssfeed/.svnignore diff --git a/ccm-ldn-rss/application.xml b/ccm-rssfeed/application.xml similarity index 78% rename from ccm-ldn-rss/application.xml rename to ccm-rssfeed/application.xml index 64892683c..63dfe7433 100755 --- a/ccm-ldn-rss/application.xml +++ b/ccm-rssfeed/application.xml @@ -1,6 +1,6 @@ - The Red Hat Web Application Framework is a platform for writing - database-backed web applications in Java. + The RSSfeed package provides a rss feeder which may be used to deploy + internal content which is selected by categorization as well as external + content based on URL. diff --git a/ccm-ldn-rss/doc/rss-standalone/README b/ccm-rssfeed/doc/rss-standalone/README similarity index 100% rename from ccm-ldn-rss/doc/rss-standalone/README rename to ccm-rssfeed/doc/rss-standalone/README diff --git a/ccm-ldn-rss/doc/rss-standalone/bebop-define.tld b/ccm-rssfeed/doc/rss-standalone/bebop-define.tld similarity index 100% rename from ccm-ldn-rss/doc/rss-standalone/bebop-define.tld rename to ccm-rssfeed/doc/rss-standalone/bebop-define.tld diff --git a/ccm-ldn-rss/doc/rss-standalone/bebop-show.tld b/ccm-rssfeed/doc/rss-standalone/bebop-show.tld similarity index 100% rename from ccm-ldn-rss/doc/rss-standalone/bebop-show.tld rename to ccm-rssfeed/doc/rss-standalone/bebop-show.tld diff --git a/ccm-ldn-rss/doc/rss-standalone/web.xml b/ccm-rssfeed/doc/rss-standalone/web.xml similarity index 100% rename from ccm-ldn-rss/doc/rss-standalone/web.xml rename to ccm-rssfeed/doc/rss-standalone/web.xml diff --git a/ccm-ldn-rss/doc/sample-0.91.rss b/ccm-rssfeed/doc/sample-0.91.rss similarity index 100% rename from ccm-ldn-rss/doc/sample-0.91.rss rename to ccm-rssfeed/doc/sample-0.91.rss diff --git a/ccm-ldn-rss/doc/sample-0.92.rss b/ccm-rssfeed/doc/sample-0.92.rss similarity index 100% rename from ccm-ldn-rss/doc/sample-0.92.rss rename to ccm-rssfeed/doc/sample-0.92.rss diff --git a/ccm-ldn-rss/doc/sample-1.0-modules.rdf b/ccm-rssfeed/doc/sample-1.0-modules.rdf similarity index 100% rename from ccm-ldn-rss/doc/sample-1.0-modules.rdf rename to ccm-rssfeed/doc/sample-1.0-modules.rdf diff --git a/ccm-ldn-rss/doc/sample-1.0.rdf b/ccm-rssfeed/doc/sample-1.0.rdf similarity index 100% rename from ccm-ldn-rss/doc/sample-1.0.rdf rename to ccm-rssfeed/doc/sample-1.0.rdf diff --git a/ccm-ldn-rss/doc/sample-2.0.rss b/ccm-rssfeed/doc/sample-2.0.rss similarity index 100% rename from ccm-ldn-rss/doc/sample-2.0.rss rename to ccm-rssfeed/doc/sample-2.0.rss diff --git a/ccm-ldn-rss/doc/spec-rdf-1.0-content.html b/ccm-rssfeed/doc/spec-rdf-1.0-content.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rdf-1.0-content.html rename to ccm-rssfeed/doc/spec-rdf-1.0-content.html diff --git a/ccm-ldn-rss/doc/spec-rdf-1.0-dublin-core.html b/ccm-rssfeed/doc/spec-rdf-1.0-dublin-core.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rdf-1.0-dublin-core.html rename to ccm-rssfeed/doc/spec-rdf-1.0-dublin-core.html diff --git a/ccm-ldn-rss/doc/spec-rdf-1.0-syndication.html b/ccm-rssfeed/doc/spec-rdf-1.0-syndication.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rdf-1.0-syndication.html rename to ccm-rssfeed/doc/spec-rdf-1.0-syndication.html diff --git a/ccm-ldn-rss/doc/spec-rdf-1.0.html b/ccm-rssfeed/doc/spec-rdf-1.0.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rdf-1.0.html rename to ccm-rssfeed/doc/spec-rdf-1.0.html diff --git a/ccm-ldn-rss/doc/spec-rss-0.91.html b/ccm-rssfeed/doc/spec-rss-0.91.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rss-0.91.html rename to ccm-rssfeed/doc/spec-rss-0.91.html diff --git a/ccm-ldn-rss/doc/spec-rss-0.92.html b/ccm-rssfeed/doc/spec-rss-0.92.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rss-0.92.html rename to ccm-rssfeed/doc/spec-rss-0.92.html diff --git a/ccm-ldn-rss/doc/spec-rss-2.0.html b/ccm-rssfeed/doc/spec-rss-2.0.html similarity index 100% rename from ccm-ldn-rss/doc/spec-rss-2.0.html rename to ccm-rssfeed/doc/spec-rss-2.0.html diff --git a/ccm-ldn-rss/doc/web.xml-rss.in b/ccm-rssfeed/doc/web.xml-rss.in similarity index 100% rename from ccm-ldn-rss/doc/web.xml-rss.in rename to ccm-rssfeed/doc/web.xml-rss.in diff --git a/ccm-ldn-rss/pdl/com/arsdigita/london/rss/Feed.pdl b/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/Feed.pdl similarity index 100% rename from ccm-ldn-rss/pdl/com/arsdigita/london/rss/Feed.pdl rename to ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/Feed.pdl diff --git a/ccm-ldn-rss/pdl/com/arsdigita/london/rss/RSS.pdl b/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/RSS.pdl similarity index 100% rename from ccm-ldn-rss/pdl/com/arsdigita/london/rss/RSS.pdl rename to ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/RSS.pdl diff --git a/ccm-ldn-rss/pdl/com/arsdigita/london/rss/WorkspaceDirectoryPortlet.pdl b/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/WorkspaceDirectoryPortlet.pdl similarity index 100% rename from ccm-ldn-rss/pdl/com/arsdigita/london/rss/WorkspaceDirectoryPortlet.pdl rename to ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/WorkspaceDirectoryPortlet.pdl diff --git a/ccm-ldn-rss/sql/ccm-ldn-rss/default-create.sql b/ccm-rssfeed/sql/ccm-rssfeed/default-create.sql similarity index 100% rename from ccm-ldn-rss/sql/ccm-ldn-rss/default-create.sql rename to ccm-rssfeed/sql/ccm-rssfeed/default-create.sql diff --git a/ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se-create.sql b/ccm-rssfeed/sql/ccm-rssfeed/oracle-se-create.sql similarity index 100% rename from ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se-create.sql rename to ccm-rssfeed/sql/ccm-rssfeed/oracle-se-create.sql diff --git a/ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se/rss-drop.sql b/ccm-rssfeed/sql/ccm-rssfeed/oracle-se/rss-drop.sql similarity index 100% rename from ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se/rss-drop.sql rename to ccm-rssfeed/sql/ccm-rssfeed/oracle-se/rss-drop.sql diff --git a/ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se/upgrade-1.sql b/ccm-rssfeed/sql/ccm-rssfeed/oracle-se/upgrade-1.sql similarity index 100% rename from ccm-ldn-rss/sql/ccm-ldn-rss/oracle-se/upgrade-1.sql rename to ccm-rssfeed/sql/ccm-rssfeed/oracle-se/upgrade-1.sql diff --git a/ccm-ldn-rss/sql/ccm-ldn-rss/postgres-create.sql b/ccm-rssfeed/sql/ccm-rssfeed/postgres-create.sql similarity index 100% rename from ccm-ldn-rss/sql/ccm-ldn-rss/postgres-create.sql rename to ccm-rssfeed/sql/ccm-rssfeed/postgres-create.sql diff --git a/ccm-ldn-rss/src/ccm-ldn-rss.config b/ccm-rssfeed/src/ccm-rssfeed.config similarity index 69% rename from ccm-ldn-rss/src/ccm-ldn-rss.config rename to ccm-rssfeed/src/ccm-rssfeed.config index 02150d833..e0e3a5f34 100755 --- a/ccm-ldn-rss/src/ccm-ldn-rss.config +++ b/ccm-rssfeed/src/ccm-rssfeed.config @@ -1,5 +1,5 @@ + storage="ccm-rssfeed/rss.properties"/> diff --git a/ccm-ldn-rss/src/ccm-ldn-rss.load b/ccm-rssfeed/src/ccm-rssfeed.load similarity index 93% rename from ccm-ldn-rss/src/ccm-ldn-rss.load rename to ccm-rssfeed/src/ccm-rssfeed.load index 53ef75e9c..fcec3deb8 100755 --- a/ccm-ldn-rss/src/ccm-ldn-rss.load +++ b/ccm-rssfeed/src/ccm-rssfeed.load @@ -14,7 +14,7 @@ - + diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Feed.java b/ccm-rssfeed/src/com/arsdigita/london/rss/Feed.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/Feed.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/Feed.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/FeedCollection.java b/ccm-rssfeed/src/com/arsdigita/london/rss/FeedCollection.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/FeedCollection.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/FeedCollection.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java b/ccm-rssfeed/src/com/arsdigita/london/rss/Initializer.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/Initializer.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java b/ccm-rssfeed/src/com/arsdigita/london/rss/Loader.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/Loader.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSS.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSS.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSS.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSS.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSChannel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSChannel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSChannel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSChannel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSConfig.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSConfig.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSConfig_parameter.properties b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig_parameter.properties similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSConfig_parameter.properties rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig_parameter.properties diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSFileResolver.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSFileResolver.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSFileResolver.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSFileResolver.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSImage.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSImage.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSImage.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSImage.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSItem.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItem.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSItem.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSItem.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSItemCollection.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItemCollection.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSItemCollection.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSItemCollection.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSRenderer.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSRenderer.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSRenderer.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSRenderer.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java b/ccm-rssfeed/src/com/arsdigita/london/rss/RSSService.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/RSSService.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSChannel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSChannel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSChannel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSChannel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSImage.java b/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSImage.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSImage.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSImage.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSItem.java b/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItem.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSItem.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItem.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java b/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/category/CategoryChannel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryChannel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/category/CategoryChannel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryChannel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java b/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java b/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/enterprise.init b/ccm-rssfeed/src/com/arsdigita/london/rss/enterprise.init similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/enterprise.init rename to ccm-rssfeed/src/com/arsdigita/london/rss/enterprise.init diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse b/ccm-rssfeed/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse rename to ccm-rssfeed/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java b/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/ChannelGenerator.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelGenerator.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/ChannelGenerator.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelGenerator.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/ChannelIndex.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelIndex.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/ChannelIndex.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelIndex.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/FeedGenerator.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/FeedGenerator.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/FeedGenerator.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/FeedGenerator.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/RSSComponent.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/RSSComponent.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/RSSComponent.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/RSSComponent.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedForm.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedForm.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedForm.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedForm.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java b/ccm-rssfeed/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java similarity index 100% rename from ccm-ldn-rss/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java rename to ccm-rssfeed/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java diff --git a/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml b/ccm-rssfeed/web/WEB-INF/web.ccm-ldn-rss.xml similarity index 100% rename from ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml rename to ccm-rssfeed/web/WEB-INF/web.ccm-ldn-rss.xml diff --git a/ccm-ldn-rss/web/__ccm__/apps/rss/xsl/index.xsl b/ccm-rssfeed/web/__ccm__/apps/rss/xsl/index.xsl similarity index 100% rename from ccm-ldn-rss/web/__ccm__/apps/rss/xsl/index.xsl rename to ccm-rssfeed/web/__ccm__/apps/rss/xsl/index.xsl diff --git a/ccm-ldn-rss/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl b/ccm-rssfeed/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl similarity index 100% rename from ccm-ldn-rss/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl rename to ccm-rssfeed/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/README b/ccm-rssfeed/web/templates/ccm-ldn-rss/README similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/README rename to ccm-rssfeed/web/templates/ccm-ldn-rss/README diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/admin/index.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/admin/index.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/admin/index.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/admin/index.jsp diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/portlets/workspaces.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/portlets/workspaces.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/portlets/workspaces.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/portlets/workspaces.jsp diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/acsj.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/acsj.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/acsj.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/rss/acsj.jsp diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/channel.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/channel.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/channel.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/rss/channel.jsp diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/external.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/external.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/external.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/rss/external.jsp diff --git a/ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/index.jsp b/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/index.jsp similarity index 100% rename from ccm-ldn-rss/web/templates/ccm-ldn-rss/rss/index.jsp rename to ccm-rssfeed/web/templates/ccm-ldn-rss/rss/index.jsp diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 6ebe9edc7..19ad21efd 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -86,6 +86,7 @@ + CCM (trunk) @@ -109,12 +106,6 @@ ccm-cms-types-contact/src UTF-8 - - - java - ccm-cms-types-esdservice/src - UTF-8 - java @@ -145,12 +136,6 @@ ccm-cms-types-formsectionitem/src UTF-8 - - - java - ccm-cms-types-genericorganisation/src - UTF-8 - java @@ -241,12 +226,6 @@ ccm-cms-types-pressrelease/src UTF-8 - - - java - ccm-cms-types-project/src - UTF-8 - java @@ -361,6 +340,12 @@ ccm-portalworkspace/src UTF-8 + + + java + ccm-portalworkspace-homepage/src + UTF-8 + java @@ -379,6 +364,12 @@ ccm-portlet-motd/src UTF-8 + + + java + ccm-rssfeed/src + UTF-8 + java @@ -403,12 +394,6 @@ ccm-themedirector/src UTF-8 - - - java - ccm-user-preferences/src - UTF-8 - java @@ -451,24 +436,12 @@ ccm-ldn-freeform/src UTF-8 - - - java - ccm-ldn-image-step/src - UTF-8 - java ccm-ldn-importer/src UTF-8 - - - java - ccm-ldn-rss/src - UTF-8 - java @@ -493,6 +466,12 @@ ccm-ldn-types-esdservice/src UTF-8 + + + java + ccm-ldn-userpreferences/src + UTF-8 + java @@ -511,24 +490,24 @@ ccm-gen-aplaws/web UTF-8 - - - java - ccm-shp-aplaws/src - UTF-8 - - - - java - ccm-shp-aplaws/web - UTF-8 - java ccm-sci-bundle/src UTF-8 + + + java + ccm-sci-personalprojects/src + UTF-8 + + + + java + ccm-sci-personalpublications/src + UTF-8 + java @@ -536,15 +515,27 @@ UTF-8 - + java - ccm-sci-types-organizationwithpublications/src + ccm-sci-types-department/src UTF-8 - + java - ccm-sci-types-organization/src + ccm-sci-types-institute/src + UTF-8 + + + + java + ccm-sci-types-member/src + UTF-8 + + + + java + ccm-sci-types-project/src UTF-8 @@ -646,10 +637,6 @@ ccm-cms-types-contact/src - - - ccm-cms-types-esdservice/src - ccm-cms-types-event/src @@ -670,10 +657,6 @@ ccm-cms-types-formsectionitem/src - - - ccm-cms-types-genericorganisation/src - ccm-cms-types-glossaryitem/src @@ -810,6 +793,10 @@ ccm-portalworkspace/src + + + ccm-portalworkspace-homepage/src + ccm-portlet-bookmarks/src @@ -822,6 +809,10 @@ ccm-portlet-motd/src + + + ccm-rssfeed/src + ccm-shortcuts/src @@ -838,10 +829,6 @@ ccm-themedirector/src - - - ccm-user-preferences/src - ccm-weblog/src @@ -870,18 +857,10 @@ ccm-ldn-freeform/src - - - ccm-ldn-image-step/src - ccm-ldn-importer/src - - - ccm-ldn-rss/src - ccm-ldn-search/src @@ -898,6 +877,10 @@ ccm-ldn-types-esdservice/src + + + ccm-ldn-userpreferences/src + ccm-ldn-util/src @@ -910,37 +893,37 @@ ccm-gen-aplaws/web - - - ccm-shp-aplaws/src - - - - ccm-shp-aplaws/web - - - - ccm-zes-aplaws/src - - - - ccm-zes-aplaws/web - ccm-sci-bundle/src + + + ccm-sci-personalprojects/src + + + + ccm-sci-personalpublications/src + ccm-sci-publications/src - - ccm-sci-types-organization/src + + ccm-sci-type-departement/src - - ccm-sci-types-organizationwithpublications/src + + ccm-sci-type-institute/src + + + + ccm-sci-type-member/src + + + + ccm-sci-type-project/src build.xml @@ -979,7 +962,6 @@ ccm-cms-types-filestorageitem/src ccm-cms-types-formitem/src ccm-cms-types-formsectionitem/src - ccm-cms-types-genericorganisation/src ccm-cms-types-glossaryitem/src ccm-cms-types-healthCareFacility/src ccm-cms-types-htmlform/src @@ -996,8 +978,8 @@ ccm-cms-types-person/src ccm-cms-types-pressrelease/src ccm-cms-types-researchnetwork/src - ccm-cms-types-simpleaddress/src ccm-cms-types-service/src + ccm-cms-types-simpleaddress/src ccm-cms-types-siteproxy/src ccm-cms-types-survey/src ccm-cms-types-xmlfeed/src @@ -1014,14 +996,15 @@ ccm-navigation/src ccm-portalserver/src ccm-portalworkspace/src + ccm-portalworkspace-homepage/src ccm-portlet-bookmarks/src ccm-portlet-latestnews/src ccm-portlet-motd/src + ccm-rssfeed/src ccm-shortcuts/src ccm-simplesurvey/src ccm-subsite/src ccm-themedirector/src - ccm-user-preferences/src ccm-weblog/src ccm-webpage/src ccm-ldn-aplaws/src @@ -1029,24 +1012,23 @@ ccm-ldn-dublin/src ccm-ldn-exporter/src ccm-ldn-freeform/src - ccm-ldn-image-step/src ccm-ldn-importer/src - ccm-ldn-rss/src ccm-ldn-search/src ccm-ldn-terms/src ccm-ldn-types-contact/src ccm-ldn-types-esdservice/src + ccm-ldn-userpreferences/src ccm-ldn-util/src ccm-gen-aplaws/src ccm-gen-aplaws/web - ccm-shp-aplaws/src - ccm-shp-aplaws/web - ccm-zes-aplaws/src - ccm-zes-aplaws/web ccm-sci-bundle/src + ccm-sci-personalprojects/src + ccm-sci-personalpublications/src ccm-sci-publications/src - ccm-sci-types-organization/src - ccm-sci-types-organizationwithpublications/src + ccm-sci-type-department/src + ccm-sci-type-institute/src + ccm-sci-type-member/src + ccm-sci-type-project/src 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 1.5