diff --git a/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/Feed.pdl b/ccm-rssfeed/pdl/com/arsdigita/rssfeed/Feed.pdl similarity index 100% rename from ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/Feed.pdl rename to ccm-rssfeed/pdl/com/arsdigita/rssfeed/Feed.pdl diff --git a/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/RSS.pdl b/ccm-rssfeed/pdl/com/arsdigita/rssfeed/RSS.pdl similarity index 100% rename from ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/RSS.pdl rename to ccm-rssfeed/pdl/com/arsdigita/rssfeed/RSS.pdl diff --git a/ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/WorkspaceDirectoryPortlet.pdl b/ccm-rssfeed/pdl/com/arsdigita/rssfeed/WorkspaceDirectoryPortlet.pdl similarity index 100% rename from ccm-rssfeed/pdl/com/arsdigita/london/rssfeed/WorkspaceDirectoryPortlet.pdl rename to ccm-rssfeed/pdl/com/arsdigita/rssfeed/WorkspaceDirectoryPortlet.pdl diff --git a/ccm-rssfeed/src/ccm-rssfeed.config b/ccm-rssfeed/src/ccm-rssfeed.config index e0e3a5f34..c4451da00 100755 --- a/ccm-rssfeed/src/ccm-rssfeed.config +++ b/ccm-rssfeed/src/ccm-rssfeed.config @@ -1,5 +1,5 @@ - diff --git a/ccm-rssfeed/src/ccm-rssfeed.load b/ccm-rssfeed/src/ccm-rssfeed.load index fcec3deb8..9e2209e0d 100755 --- a/ccm-rssfeed/src/ccm-rssfeed.load +++ b/ccm-rssfeed/src/ccm-rssfeed.load @@ -11,10 +11,10 @@ - + - + diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/Feed.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/Feed.java similarity index 99% rename from ccm-rssfeed/src/com/arsdigita/london/rss/Feed.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/Feed.java index be29314a1..e3a4927bf 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/Feed.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/Feed.java @@ -1,4 +1,4 @@ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.kernel.ACSObject; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/FeedCollection.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/FeedCollection.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/FeedCollection.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/FeedCollection.java index 177127350..f947fdaf2 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/FeedCollection.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/FeedCollection.java @@ -13,7 +13,7 @@ * */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/Initializer.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/Initializer.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/Initializer.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/Initializer.java index fe404e35a..63f97cc7f 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/Initializer.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/Initializer.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; // import com.arsdigita.domain.DomainObjectInstantiator; @@ -32,7 +32,7 @@ import com.arsdigita.runtime.DomainInitEvent; // import com.arsdigita.runtime.LegacyInitializer; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; -import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet; +import com.arsdigita.rssfeed.portlet.WorkspaceDirectoryPortlet; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/Loader.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/Loader.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/Loader.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/Loader.java index e6b16fb38..75966f4b2 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/Loader.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/Loader.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.categorization.CategoryPurpose; import com.arsdigita.domain.DataObjectNotFoundException; @@ -28,7 +28,7 @@ import com.arsdigita.loader.PackageLoader; // import com.arsdigita.persistence.DataObject; import com.arsdigita.portal.PortletType; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet; +import com.arsdigita.rssfeed.portlet.WorkspaceDirectoryPortlet; import com.arsdigita.web.Application; // import com.arsdigita.web.ApplicationSetup; import com.arsdigita.web.ApplicationType; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSS.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSS.java similarity index 99% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSS.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSS.java index a2ef1bf55..55b5ec9f5 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSS.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSS.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSChannel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSChannel.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSChannel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSChannel.java index 6982227ee..02a28ba98 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSChannel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSChannel.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSConfig.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSConfig.java index 352a1675b..ad6486865 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSConfig.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.runtime.AbstractConfig; import com.arsdigita.util.parameter.Parameter; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig_parameter.properties b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSConfig_parameter.properties similarity index 100% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSConfig_parameter.properties rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSConfig_parameter.properties diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSFileResolver.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSFileResolver.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSFileResolver.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSFileResolver.java index 29c556413..9f2ef72d9 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSFileResolver.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSFileResolver.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.web.DefaultApplicationFileResolver; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSImage.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSImage.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSImage.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSImage.java index ebb3f3099..77e18441d 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSImage.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSImage.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItem.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItem.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSItem.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItem.java index 998a99c5e..3af2cacc9 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItem.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItem.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItemCollection.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItemCollection.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSItemCollection.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItemCollection.java index 48fd0001e..576de3af1 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSItemCollection.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSItemCollection.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; /** diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSRenderer.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSRenderer.java similarity index 99% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSRenderer.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSRenderer.java index d1a678f25..05dbd351c 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSRenderer.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSRenderer.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.xml.Element; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSService.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java similarity index 99% rename from ccm-rssfeed/src/com/arsdigita/london/rss/RSSService.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java index 23a3d2b71..e282d186b 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/RSSService.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSChannel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSChannel.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSChannel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSChannel.java index d46e3e901..ae34e6a73 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSChannel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSChannel.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; /** * Highly experimental. This API will definitely diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSImage.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSImage.java similarity index 97% rename from ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSImage.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSImage.java index bd30abbeb..fdcbd2738 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSImage.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSImage.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; /** * Highly experimental. This API will definitely diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItem.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItem.java similarity index 97% rename from ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItem.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItem.java index 150274dcc..0bc485907 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItem.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItem.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; /** * Highly experimental. This API will definitely diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItemCollection.java similarity index 97% rename from ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItemCollection.java index 9103abff3..fbb8827a1 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/SimpleRSSItemCollection.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss; +package com.arsdigita.rssfeed; import com.arsdigita.util.Assert; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryChannel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryChannel.java similarity index 93% rename from ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryChannel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryChannel.java index ffaf6ccda..3986f4be7 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryChannel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryChannel.java @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss.category; +package com.arsdigita.rssfeed.category; -import com.arsdigita.london.rss.RSSItem; -import com.arsdigita.london.rss.RSSChannel; -import com.arsdigita.london.rss.RSSItemCollection; -import com.arsdigita.london.rss.RSSImage; +import com.arsdigita.rssfeed.RSSItem; +import com.arsdigita.rssfeed.RSSChannel; +import com.arsdigita.rssfeed.RSSItemCollection; +import com.arsdigita.rssfeed.RSSImage; import com.arsdigita.kernel.URLService; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectCollection; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryPurposeChannel.java similarity index 93% rename from ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryPurposeChannel.java index 95c3b783f..14573c1e5 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/category/CategoryPurposeChannel.java @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss.category; +package com.arsdigita.rssfeed.category; -import com.arsdigita.london.rss.RSSItem; -import com.arsdigita.london.rss.RSSChannel; -import com.arsdigita.london.rss.RSSItemCollection; -import com.arsdigita.london.rss.RSSImage; +import com.arsdigita.rssfeed.RSSItem; +import com.arsdigita.rssfeed.RSSChannel; +import com.arsdigita.rssfeed.RSSItemCollection; +import com.arsdigita.rssfeed.RSSImage; import com.arsdigita.kernel.URLService; import com.arsdigita.categorization.Category; import com.arsdigita.categorization.CategoryPurpose; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/RSSDispatcher.java similarity index 94% rename from ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/RSSDispatcher.java index b5061c3bb..3d7137fa0 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/RSSDispatcher.java @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss.dispatcher; +package com.arsdigita.rssfeed.dispatcher; -import com.arsdigita.london.rss.RSSChannel; -import com.arsdigita.london.rss.RSSRenderer; +import com.arsdigita.rssfeed.RSSChannel; +import com.arsdigita.rssfeed.RSSRenderer; import com.arsdigita.dispatcher.Dispatcher; import com.arsdigita.dispatcher.RequestContext; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/SimpleRSSDispatcher.java similarity index 94% rename from ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/SimpleRSSDispatcher.java index 3894a1634..61b6ea930 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/dispatcher/SimpleRSSDispatcher.java @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss.dispatcher; +package com.arsdigita.rssfeed.dispatcher; -import com.arsdigita.london.rss.RSSChannel; +import com.arsdigita.rssfeed.RSSChannel; import com.arsdigita.dispatcher.RequestContext; import javax.servlet.http.HttpServletRequest; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/enterprise.init b/ccm-rssfeed/src/com/arsdigita/rssfeed/enterprise.init similarity index 100% rename from ccm-rssfeed/src/com/arsdigita/london/rss/enterprise.init rename to ccm-rssfeed/src/com/arsdigita/rssfeed/enterprise.init diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse b/ccm-rssfeed/src/com/arsdigita/rssfeed/installer.nolongerInUse/Initializer.java.nolongerInUse similarity index 100% rename from ccm-rssfeed/src/com/arsdigita/london/rss/installer.nolongerInUse/Initializer.java.nolongerInUse rename to ccm-rssfeed/src/com/arsdigita/rssfeed/installer.nolongerInUse/Initializer.java.nolongerInUse diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryChannel.java similarity index 91% rename from ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryChannel.java index 908ac70d0..38b15a7ab 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryChannel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryChannel.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.rss.portlet; +package com.arsdigita.rssfeed.portlet; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.Party; @@ -24,11 +24,11 @@ import com.arsdigita.kernel.Resource; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; // import com.arsdigita.london.portal.Workspace; -import com.arsdigita.london.rss.RSSChannel; -import com.arsdigita.london.rss.RSSImage; -import com.arsdigita.london.rss.RSSItem; -import com.arsdigita.london.rss.RSSItemCollection; -import com.arsdigita.london.rss.SimpleRSSItem; +import com.arsdigita.rssfeed.RSSChannel; +import com.arsdigita.rssfeed.RSSImage; +import com.arsdigita.rssfeed.RSSItem; +import com.arsdigita.rssfeed.RSSItemCollection; +import com.arsdigita.rssfeed.SimpleRSSItem; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationCollection; import com.arsdigita.web.URL; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryPortlet.java similarity index 91% rename from ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryPortlet.java index 9ee0a37f8..3a39adcbf 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/portlet/WorkspaceDirectoryPortlet.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/portlet/WorkspaceDirectoryPortlet.java @@ -13,10 +13,10 @@ * */ -package com.arsdigita.london.rss.portlet; +package com.arsdigita.rssfeed.portlet; import com.arsdigita.bebop.portal.AbstractPortletRenderer; -import com.arsdigita.london.rss.ui.portlet.WorkspaceDirectoryPortletRenderer; +import com.arsdigita.rssfeed.ui.portlet.WorkspaceDirectoryPortletRenderer; import com.arsdigita.persistence.DataObject; import com.arsdigita.portal.Portlet; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelGenerator.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelGenerator.java similarity index 94% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelGenerator.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelGenerator.java index 4923f509f..69e3dc09e 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelGenerator.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelGenerator.java @@ -1,7 +1,7 @@ -package com.arsdigita.london.rss.ui; +package com.arsdigita.rssfeed.ui; import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.london.rss.RSSService; +import com.arsdigita.rssfeed.RSSService; import com.arsdigita.categorization.Category; import com.arsdigita.util.UncheckedWrapperException; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelIndex.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelIndex.java similarity index 92% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelIndex.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelIndex.java index c943a7958..a801a37c5 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/ChannelIndex.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/ChannelIndex.java @@ -1,7 +1,7 @@ -package com.arsdigita.london.rss.ui; +package com.arsdigita.rssfeed.ui; import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.london.rss.RSSService; +import com.arsdigita.rssfeed.RSSService; import com.arsdigita.categorization.Category; import com.arsdigita.web.Application; import com.arsdigita.web.Web; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/FeedGenerator.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/FeedGenerator.java similarity index 93% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/FeedGenerator.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/FeedGenerator.java index f4db0cd7a..124c59caf 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/FeedGenerator.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/FeedGenerator.java @@ -13,10 +13,10 @@ * */ -package com.arsdigita.london.rss.ui; +package com.arsdigita.rssfeed.ui; import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.london.rss.RSSService; +import com.arsdigita.rssfeed.RSSService; import org.apache.log4j.Logger; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/RSSComponent.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/RSSComponent.java similarity index 91% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/RSSComponent.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/RSSComponent.java index a977ed0ac..ef523ab88 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/RSSComponent.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/RSSComponent.java @@ -13,10 +13,10 @@ * */ -package com.arsdigita.london.rss.ui; +package com.arsdigita.rssfeed.ui; -import com.arsdigita.london.rss.RSSChannel; -import com.arsdigita.london.rss.RSSRenderer; +import com.arsdigita.rssfeed.RSSChannel; +import com.arsdigita.rssfeed.RSSRenderer; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.xml.Element; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/WorkspaceDirectoryComponent.java similarity index 90% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/WorkspaceDirectoryComponent.java index c4351da5e..a3809402e 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/WorkspaceDirectoryComponent.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/WorkspaceDirectoryComponent.java @@ -13,13 +13,13 @@ * */ -package com.arsdigita.london.rss.ui; +package com.arsdigita.rssfeed.ui; import com.arsdigita.bebop.PageState; import com.arsdigita.kernel.Kernel; -import com.arsdigita.london.rss.portlet.WorkspaceDirectoryChannel; +import com.arsdigita.rssfeed.portlet.WorkspaceDirectoryChannel; // import com.arsdigita.london.portal.ui.PortalConstants; -import com.arsdigita.london.rss.RSSChannel; +import com.arsdigita.rssfeed.RSSChannel; // import com.arsdigita.london.rss.ui.RSSComponent; import com.arsdigita.web.Application; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ExternalFeedForm.java similarity index 96% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ExternalFeedForm.java index b342ea352..dcdeed191 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ExternalFeedForm.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ExternalFeedForm.java @@ -14,7 +14,7 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.parameters.StringParameter; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedForm.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedForm.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedForm.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedForm.java index 9fbbdcc8b..1446bb856 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedForm.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedForm.java @@ -14,7 +14,7 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.SaveCancelSection; @@ -24,7 +24,7 @@ import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormInitListener; -import com.arsdigita.london.rss.Feed; +import com.arsdigita.rssfeed.Feed; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedSelectionModel.java similarity index 92% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedSelectionModel.java index ab754b0ff..68f3bf982 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedSelectionModel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedSelectionModel.java @@ -14,10 +14,10 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.PageState; -import com.arsdigita.london.rss.Feed; +import com.arsdigita.rssfeed.Feed; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.bebop.parameters.BigDecimalParameter; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsPanel.java similarity index 97% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsPanel.java index cb2201beb..3c9fbcfb0 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsPanel.java @@ -14,7 +14,7 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.Table; import com.arsdigita.bebop.Label; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsTable.java similarity index 97% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsTable.java index e17ea3da0..96d7d4e58 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/FeedsTable.java @@ -14,7 +14,7 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.Table; @@ -23,8 +23,8 @@ import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.ControlLink; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Component; -import com.arsdigita.london.rss.Feed; -import com.arsdigita.london.rss.FeedCollection; +import com.arsdigita.rssfeed.Feed; +import com.arsdigita.rssfeed.FeedCollection; import com.arsdigita.util.LockableImpl; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.bebop.event.TableActionListener; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ProviderFeedForm.java similarity index 98% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ProviderFeedForm.java index 890cf8807..6687cecbf 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/admin/ProviderFeedForm.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/admin/ProviderFeedForm.java @@ -14,7 +14,7 @@ */ -package com.arsdigita.london.rss.ui.admin; +package com.arsdigita.rssfeed.ui.admin; import com.arsdigita.bebop.form.TextField; diff --git a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/portlet/WorkspaceDirectoryPortletRenderer.java similarity index 88% rename from ccm-rssfeed/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java rename to ccm-rssfeed/src/com/arsdigita/rssfeed/ui/portlet/WorkspaceDirectoryPortletRenderer.java index 15e826ae3..6db075acc 100755 --- a/ccm-rssfeed/src/com/arsdigita/london/rss/ui/portlet/WorkspaceDirectoryPortletRenderer.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/ui/portlet/WorkspaceDirectoryPortletRenderer.java @@ -13,15 +13,15 @@ * */ -package com.arsdigita.london.rss.ui.portlet; +package com.arsdigita.rssfeed.ui.portlet; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.portal.AbstractPortletRenderer; import com.arsdigita.kernel.Kernel; -import com.arsdigita.london.rss.portlet.WorkspaceDirectoryChannel; -import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet; +import com.arsdigita.rssfeed.portlet.WorkspaceDirectoryChannel; +import com.arsdigita.rssfeed.portlet.WorkspaceDirectoryPortlet; // import com.arsdigita.london.portal.ui.PortalConstants; -import com.arsdigita.london.rss.RSSRenderer; +import com.arsdigita.rssfeed.RSSRenderer; import com.arsdigita.web.Application; import com.arsdigita.web.URL; import com.arsdigita.web.Web; diff --git a/ccm-rssfeed/web/WEB-INF/web.ccm-ldn-rss.xml b/ccm-rssfeed/web/WEB-INF/web.ccm-rssfeed.xml similarity index 57% rename from ccm-rssfeed/web/WEB-INF/web.ccm-ldn-rss.xml rename to ccm-rssfeed/web/WEB-INF/web.ccm-rssfeed.xml index 6e35abb50..a24bbaf00 100644 --- a/ccm-rssfeed/web/WEB-INF/web.ccm-ldn-rss.xml +++ b/ccm-rssfeed/web/WEB-INF/web.ccm-rssfeed.xml @@ -4,24 +4,25 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - + - rss-files + rssfeed-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-rss + /templates/ccm-rssfeed file-resolver - com.arsdigita.london.rss.RSSFileResolver + com.arsdigita.rssfeed.RSSFileResolver + - + - rss-files - /ccm-ldn-rss/files/* + rssfeed-files + /ccm-rssfeed/files/* diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/README b/ccm-rssfeed/web/templates/ccm-rssfeed/README similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/README rename to ccm-rssfeed/web/templates/ccm-rssfeed/README diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/admin/index.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/admin/index.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/admin/index.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/admin/index.jsp diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/portlets/workspaces.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/portlets/workspaces.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/portlets/workspaces.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/portlets/workspaces.jsp diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/acsj.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/rss/acsj.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/rss/acsj.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/rss/acsj.jsp diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/channel.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/rss/channel.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/rss/channel.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/rss/channel.jsp diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/external.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/rss/external.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/rss/external.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/rss/external.jsp diff --git a/ccm-rssfeed/web/templates/ccm-ldn-rss/rss/index.jsp b/ccm-rssfeed/web/templates/ccm-rssfeed/rss/index.jsp similarity index 100% rename from ccm-rssfeed/web/templates/ccm-ldn-rss/rss/index.jsp rename to ccm-rssfeed/web/templates/ccm-rssfeed/rss/index.jsp diff --git a/ccm-rssfeed/web/__ccm__/apps/rss/xsl/index.xsl b/ccm-rssfeed/web/themes/heirloom/apps/rssfeed/xsl/index.xsl similarity index 77% rename from ccm-rssfeed/web/__ccm__/apps/rss/xsl/index.xsl rename to ccm-rssfeed/web/themes/heirloom/apps/rssfeed/xsl/index.xsl index e0d205a02..c74236775 100755 --- a/ccm-rssfeed/web/__ccm__/apps/rss/xsl/index.xsl +++ b/ccm-rssfeed/web/themes/heirloom/apps/rssfeed/xsl/index.xsl @@ -9,7 +9,7 @@ - - + + diff --git a/ccm-rssfeed/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl b/ccm-rssfeed/web/themes/heirloom/apps/rssfeed/xsl/workspace-directory-portlet.xsl similarity index 100% rename from ccm-rssfeed/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl rename to ccm-rssfeed/web/themes/heirloom/apps/rssfeed/xsl/workspace-directory-portlet.xsl diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml index f7a457a8e..218874b22 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml @@ -220,20 +220,20 @@ com.arsdigita.dispatcher.PortletTypeXSLServlet - + - rss-files + rssfeed-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-rss + /templates/ccm-rssfeed file-resolver - com.arsdigita.london.rss.RSSFileResolver + com.arsdigita.rssfeed.RSSFileResolver - + @@ -347,11 +347,12 @@ /ccm-navigation/files/* - + - rss-files - /ccm-ldn-rss/files/* + rssfeed-files + /ccm-rssfeed/files/* +