diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyGenerator.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java rename to ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyGenerator.java index 183b59ed2..5cbe26eaa 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java +++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyGenerator.java @@ -15,8 +15,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz.siteproxy; +import com.arsdigita.atoz.AbstractAtoZGenerator; +import com.arsdigita.atoz.AtoZAtomicEntry; +import com.arsdigita.atoz.AtoZCompoundEntry; +import com.arsdigita.atoz.AtoZEntry; +import com.arsdigita.atoz.AtoZProvider; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyProvider.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyProvider.java similarity index 94% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyProvider.java rename to ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyProvider.java index 88bdf3161..381e3999a 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyProvider.java +++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/AtoZSiteProxyProvider.java @@ -1,5 +1,7 @@ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz.siteproxy; +import com.arsdigita.atoz.AtoZGenerator; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.categorization.Category; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataQuery; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderAdmin.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderAdmin.java similarity index 91% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderAdmin.java rename to ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderAdmin.java index fc83c2c76..130eb5456 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderAdmin.java +++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderAdmin.java @@ -16,8 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.siteproxy.ui.admin; +import com.arsdigita.atoz.ui.admin.ProviderDetails; +import com.arsdigita.atoz.ui.admin.ProviderAdmin; +import com.arsdigita.atoz.ui.admin.ProviderAdmin; +import com.arsdigita.atoz.ui.admin.ProviderDetails; import com.arsdigita.bebop.ActionLink; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; @@ -50,6 +54,7 @@ public class SiteProxyProviderAdmin extends ProviderAdmin { .addCompletionListener(new SiteProxyProviderEditComplete()); } + @Override public void register(Page p) { super.register(p); diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderForm.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java similarity index 89% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderForm.java rename to ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java index 2d6d8cad2..1f860a3b3 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/SiteProxyProviderForm.java +++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java @@ -16,15 +16,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.siteproxy.ui.admin; +import com.arsdigita.atoz.ui.admin.ProviderForm; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; -import com.arsdigita.london.atoz.AtoZSiteProxyProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; +import com.arsdigita.atoz.siteproxy.AtoZSiteProxyProvider; +import com.arsdigita.atoz.ui.admin.ProviderForm; import com.arsdigita.london.util.ui.CategoryPicker; import com.arsdigita.util.Classes; diff --git a/ccm-atoz/application.xml b/ccm-atoz/application.xml new file mode 100755 index 000000000..18fbaf154 --- /dev/null +++ b/ccm-atoz/application.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + The ccm-ldn-atoz package enables a site to present all it's content in + alphabetical order as an additional service to it's users. Usually the + theme provides a link to the page as part of its static elements. + + By default the application presents the A-Z list at ~/ccm/atoz/. + + An administration interface is provided at ~/ccm/atoz/admin/. Here you + can configure the content to be listed by selecting an appropriate + content provider. + + + diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZ.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZ.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZCategoryProvider.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZCategoryProvider.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZItemAlias.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZItemAlias.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZItemAlias.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZItemAlias.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZItemProvider.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZItemProvider.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZItemProvider.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZItemProvider.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZProvider.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZProvider.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZProvider.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZProvider.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZSiteProxyProvider.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZSiteProxyProvider.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZSiteProxyProvider.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/AtoZSiteProxyProvider.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/query-getAllBlackListTypes.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/query-getAllBlackListTypes.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/query-getAllBlackListTypes.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/query-getAllBlackListTypes.pdl diff --git a/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/terms/DomainProvider.pdl similarity index 100% rename from ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl rename to ccm-atoz/pdl/com/arsdigita/atoz/terms/DomainProvider.pdl diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se-create.sql b/ccm-atoz/sql/ccm-atoz/oracle-se-create.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se-create.sql rename to ccm-atoz/sql/ccm-atoz/oracle-se-create.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se/upgrade/add-item_provider.sql b/ccm-atoz/sql/ccm-atoz/oracle-se/upgrade/add-item_provider.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se/upgrade/add-item_provider.sql rename to ccm-atoz/sql/ccm-atoz/oracle-se/upgrade/add-item_provider.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se/upgrade/add-item_provider_alias.sql b/ccm-atoz/sql/ccm-atoz/oracle-se/upgrade/add-item_provider_alias.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/oracle-se/upgrade/add-item_provider_alias.sql rename to ccm-atoz/sql/ccm-atoz/oracle-se/upgrade/add-item_provider_alias.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres-create.sql b/ccm-atoz/sql/ccm-atoz/postgres-create.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres-create.sql rename to ccm-atoz/sql/ccm-atoz/postgres-create.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres/upgrade/add-item_provider.sql b/ccm-atoz/sql/ccm-atoz/postgres/upgrade/add-item_provider.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres/upgrade/add-item_provider.sql rename to ccm-atoz/sql/ccm-atoz/postgres/upgrade/add-item_provider.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres/upgrade/add-item_provider_alias.sql b/ccm-atoz/sql/ccm-atoz/postgres/upgrade/add-item_provider_alias.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/postgres/upgrade/add-item_provider_alias.sql rename to ccm-atoz/sql/ccm-atoz/postgres/upgrade/add-item_provider_alias.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-cat_aliases.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/add-cat_aliases.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-cat_aliases.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/add-cat_aliases.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-ct_blacklist.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/add-ct_blacklist.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-ct_blacklist.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/add-ct_blacklist.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-item_provider.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/add-item_provider.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-item_provider.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/add-item_provider.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-item_provider_alias.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/add-item_provider_alias.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-item_provider_alias.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/add-item_provider_alias.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-siteproxy_provider.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/add-siteproxy_provider.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/add-siteproxy_provider.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/default/add-siteproxy_provider.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-1.0.0-1.0.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-1.0.0-1.0.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-1.0.0-1.0.1.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-1.0.2-1.0.3.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-1.0.2-1.0.3.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-1.0.2-1.0.3.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-1.0.2-1.0.3.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.3.0-6.3.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.3.0-6.3.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.3.0-6.3.1.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.5.0-6.6.0.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.5.0-6.6.0.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.5.0-6.6.0.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.5.0-6.6.0.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.0-6.6.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/oracle-se-6.6.0-6.6.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.0-6.6.1.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-1.0.0-1.0.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-1.0.0-1.0.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/postgres-1.0.0-1.0.1.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-1.0.2-1.0.3.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-1.0.2-1.0.3.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-1.0.2-1.0.3.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/postgres-1.0.2-1.0.3.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.3.0-6.3.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.3.0-6.3.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.3.0-6.3.1.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.5.0-6.6.0.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.5.0-6.6.0.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.5.0-6.6.0.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.5.0-6.6.0.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.0-6.6.1.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/postgres-6.6.0-6.6.1.sql rename to ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.0-6.6.1.sql diff --git a/ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml b/ccm-atoz/src/WEB-INF/resources/atoz-adapters.xml similarity index 100% rename from ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml rename to ccm-atoz/src/WEB-INF/resources/atoz-adapters.xml diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.config b/ccm-atoz/src/ccm-ldn-atoz.config similarity index 100% rename from ccm-ldn-atoz/src/ccm-ldn-atoz.config rename to ccm-atoz/src/ccm-ldn-atoz.config diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.load b/ccm-atoz/src/ccm-ldn-atoz.load similarity index 100% rename from ccm-ldn-atoz/src/ccm-ldn-atoz.load rename to ccm-atoz/src/ccm-ldn-atoz.load diff --git a/ccm-ldn-atoz/src/ccm-ldn-atoz.upgrade b/ccm-atoz/src/ccm-ldn-atoz.upgrade similarity index 100% rename from ccm-ldn-atoz/src/ccm-ldn-atoz.upgrade rename to ccm-atoz/src/ccm-ldn-atoz.upgrade diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AbstractAtoZGenerator.java b/ccm-atoz/src/com/arsdigita/atoz/AbstractAtoZGenerator.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AbstractAtoZGenerator.java rename to ccm-atoz/src/com/arsdigita/atoz/AbstractAtoZGenerator.java index 484a308e8..d9af0fafd 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AbstractAtoZGenerator.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AbstractAtoZGenerator.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AddAtoZ.java b/ccm-atoz/src/com/arsdigita/atoz/AddAtoZ.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AddAtoZ.java rename to ccm-atoz/src/com/arsdigita/atoz/AddAtoZ.java index 577285d1d..0a63ac698 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AddAtoZ.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AddAtoZ.java @@ -1,4 +1,4 @@ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import org.apache.commons.cli.CommandLine; import org.apache.log4j.Logger; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZ.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java similarity index 84% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZ.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZ.java index ee0fe8b72..cd2877a09 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZ.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZ.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataCollection; @@ -41,32 +41,42 @@ import org.apache.log4j.Logger; */ public class AtoZ extends Application { + /** A logger instance to assist debugging. */ private static final Logger logger = Logger.getLogger(AtoZ.class); - public static final String BASE_DATA_OBJECT_TYPE - = "com.arsdigita.london.atoz.AtoZ"; - - private static final AtoZConfig s_config = new AtoZConfig(); - static { - logger.debug("Static initializer is starting..."); - s_config.load(); - logger.debug("Static initializer is finished."); - } - - public static final AtoZConfig getConfig() { - return s_config; - } - - + /** PDL Stuff - Base object */ + public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.atoz.AtoZ"; + + /* Convenient Strings */ public static final String PROVIDERS = "atozProviders"; public static final String SORT_KEY = "sortKey"; + /** Config object containing various parameter */ + private static final AtoZConfig s_config = AtoZConfig.getConfig(); + + /** + * Constructor + * + * @param obj + */ public AtoZ(DataObject obj) { super(obj); } + /** + * Constructor + * + * @param oid + */ public AtoZ(OID oid) { super(oid); } + + /** + * Provides client classes with the config object. + */ + public static AtoZConfig getConfig() { + return s_config; + } public void addProvider(AtoZProvider provider) { DataObject link = add(PROVIDERS, provider); @@ -140,9 +150,10 @@ public class AtoZ extends Application { * * @return path name to the applications servlet/JSP */ + @Override public String getServletPath() { // return "/files"; - return "/ccm-ldn-atoz/files"; + return "/ccm-atoz/files"; } } diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZAtomicEntry.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZAtomicEntry.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZAtomicEntry.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZAtomicEntry.java index c30ea2c1e..445a28444 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZAtomicEntry.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZAtomicEntry.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.xml.Element; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryAlias.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryAlias.java similarity index 92% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryAlias.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryAlias.java index cac42ffe0..0957b6afa 100644 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryAlias.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryAlias.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import java.math.BigDecimal; import java.sql.SQLException; @@ -26,17 +26,19 @@ import org.apache.log4j.Logger; import com.arsdigita.categorization.Category; import com.arsdigita.db.Sequences; import com.arsdigita.domain.DomainObject; -import com.arsdigita.kernel.Kernel; -import com.arsdigita.kernel.Party; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.PersistenceException; -import com.arsdigita.persistence.metadata.ObjectType; +/** + * + * + */ public class AtoZCategoryAlias extends DomainObject { private static final Logger s_log = Logger.getLogger(AtoZCategoryAlias.class); - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.atoz.AtoZCategoryAlias"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.atoz.AtoZCategoryAlias"; public static final String ID = "id"; public static final String PROVIDER = "provider"; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryGenerator.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryGenerator.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryGenerator.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryGenerator.java index a14c15ae7..f3dbc8db5 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryGenerator.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryGenerator.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; @@ -30,6 +30,10 @@ import com.arsdigita.xml.Element; import java.util.List; import java.util.ArrayList; +/** + * + * @author pb + */ public class AtoZCategoryGenerator extends AbstractAtoZGenerator { public AtoZCategoryGenerator(AtoZCategoryProvider provider) { diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryProvider.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryProvider.java index f6de515ed..e39b7a362 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZCategoryProvider.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import org.apache.log4j.Logger; @@ -38,7 +38,8 @@ public class AtoZCategoryProvider extends AtoZProvider { private static final Logger s_log = Logger.getLogger(AtoZCategoryProvider.class); - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.atoz.AtoZCategoryProvider"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.atoz.AtoZCategoryProvider"; public static final String IS_COMPOUND = "isCompound"; @@ -78,6 +79,7 @@ public class AtoZCategoryProvider extends AtoZProvider { super(oid); } + @Override public void delete() { Category.clearRootForObject(this); diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCompoundEntry.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZCompoundEntry.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCompoundEntry.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZCompoundEntry.java index fbc901658..6bfe12d14 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCompoundEntry.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZCompoundEntry.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; public interface AtoZCompoundEntry extends AtoZEntry { diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZConfig.java similarity index 65% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZConfig.java index 82f0f6f9b..395d09bdf 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZConfig.java @@ -16,57 +16,85 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.runtime.AbstractConfig; import com.arsdigita.util.parameter.BooleanParameter; import com.arsdigita.util.parameter.ClassParameter; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.ResourceParameter; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.london.util.ui.ApplicationCategoryPicker; import java.io.InputStream; -import java.io.IOException; import java.util.Set; import java.util.HashSet; import org.apache.log4j.Logger; +/** + * This is the configuration file for the AtoZ application + */ public class AtoZConfig extends AbstractConfig { - private static final Logger s_log = - Logger.getLogger(AtoZConfig.class); + /** A logger instance to assist debugging. */ + private static final Logger s_log = Logger.getLogger(AtoZConfig.class); + + /** Singelton config object. */ + private static AtoZConfig s_conf; + + /** + * Gain a AtoZConfig object. + * + * Singelton pattern, don't instantiate a config object using the + * constructor directly! + * @return + */ + public static synchronized AtoZConfig getConfig() { + if (s_conf == null) { + s_conf = new AtoZConfig(); + s_conf.load(); + } + + return s_conf; + } + + /** */ private Set m_types; - private Parameter m_adapters; - private Parameter m_rootCategoryPicker; - private BooleanParameter m_useSubsiteSpecificNavigationCategory; - private BooleanParameter m_filterCategoryProdiver; - public AtoZConfig() { - m_types = new HashSet(); - m_adapters = new ResourceParameter + // /////////////////////////////////////////////////////////////////////// + // + // set of configuration parameters + + /** Rules for configuring information in generated XML */ + private Parameter m_adapters = new ResourceParameter ("com.arsdigita.london.atoz.traversal_adapters", Parameter.REQUIRED, "/WEB-INF/resources/atoz-adapters.xml"); - - m_rootCategoryPicker = new ClassParameter( + /** The UI widget for the Root Category Picker */ + private Parameter m_rootCategoryPicker = new ClassParameter( "com.arsdigita.london.atoz.root_category_picker", Parameter.REQUIRED, ApplicationCategoryPicker.class); - - m_useSubsiteSpecificNavigationCategory = new BooleanParameter + /** Make AtoZ use subsite-specific navigation categories. Set to true, + * and the AtoZ will use the subsite-specific navigation categories + * if you define *any* CategoryProvider */ + private BooleanParameter m_useSubsiteSpecificNavigationCategory = new BooleanParameter ("com.arsdigita.london.atoz.use_subsite_specific_navigation_category", Parameter.OPTIONAL, Boolean.FALSE); - - m_filterCategoryProdiver = new BooleanParameter ( + /** To filter out category without published items. If TRUE, the AtoZ + * category providers will only return Categories with published items */ + private BooleanParameter m_filterCategoryProdiver = new BooleanParameter ( "com.arsdigita.london.atoz.filterCategoryProviders", Parameter.OPTIONAL, Boolean.FALSE); + public AtoZConfig() { + + m_types = new HashSet(); + register(m_adapters); register(m_rootCategoryPicker); register(m_useSubsiteSpecificNavigationCategory); diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig_parameter.properties b/ccm-atoz/src/com/arsdigita/atoz/AtoZConfig_parameter.properties similarity index 100% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig_parameter.properties rename to ccm-atoz/src/com/arsdigita/atoz/AtoZConfig_parameter.properties diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZEntry.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZEntry.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZEntry.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZEntry.java index d84b72bb6..d0301dbf6 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZEntry.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZEntry.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZGenerator.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZGenerator.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZGenerator.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZGenerator.java index ce5bcb71b..5bb2b6174 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZGenerator.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZGenerator.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemAlias.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemAlias.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemAlias.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZItemAlias.java index fd119be3e..e164e51e5 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemAlias.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemAlias.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemGenerator.java similarity index 99% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZItemGenerator.java index 4a5fbd095..66f606a6d 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemGenerator.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemProvider.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemProvider.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemProvider.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZItemProvider.java index fad6fd9dc..cab3f0dc0 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemProvider.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZItemProvider.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.domain.DomainCollection; import com.arsdigita.persistence.DataObject; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProvider.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZProvider.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProvider.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZProvider.java index 2a4393407..9766b27f1 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProvider.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZProvider.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProviderType.java b/ccm-atoz/src/com/arsdigita/atoz/AtoZProviderType.java similarity index 95% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProviderType.java rename to ccm-atoz/src/com/arsdigita/atoz/AtoZProviderType.java index 111dd8e3d..d29843eb3 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZProviderType.java +++ b/ccm-atoz/src/com/arsdigita/atoz/AtoZProviderType.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; -import com.arsdigita.london.atoz.ui.admin.ProviderForm; -import com.arsdigita.london.atoz.ui.admin.ProviderAdmin; +import com.arsdigita.atoz.ui.admin.ProviderForm; +import com.arsdigita.atoz.ui.admin.ProviderAdmin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.util.Assert; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java similarity index 64% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java rename to ccm-atoz/src/com/arsdigita/atoz/Initializer.java index 94291e749..f9af6006a 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java +++ b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java @@ -16,8 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; +import com.arsdigita.atoz.siteproxy.AtoZSiteProxyProvider; import com.arsdigita.db.DbHelper; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; @@ -25,12 +26,12 @@ import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.domain.xml.TraversalHandler; import com.arsdigita.kernel.ACSObjectInstantiator; import com.arsdigita.london.atoz.terms.DomainProvider; -import com.arsdigita.london.atoz.ui.admin.CategoryProviderAdmin; -import com.arsdigita.london.atoz.ui.admin.CategoryProviderForm; -import com.arsdigita.london.atoz.ui.admin.ItemProviderAdmin; -import com.arsdigita.london.atoz.ui.admin.ItemProviderForm; -import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderAdmin; -import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderForm; +import com.arsdigita.atoz.ui.admin.CategoryProviderAdmin; +import com.arsdigita.atoz.ui.admin.CategoryProviderForm; +import com.arsdigita.atoz.ui.admin.ItemProviderAdmin; +import com.arsdigita.atoz.ui.admin.ItemProviderForm; +import com.arsdigita.atoz.siteproxy.ui.admin.SiteProxyProviderAdmin; +import com.arsdigita.atoz.siteproxy.ui.admin.SiteProxyProviderForm; import com.arsdigita.london.atoz.ui.terms.DomainProviderAdmin; import com.arsdigita.london.atoz.ui.terms.DomainProviderForm; import com.arsdigita.navigation.ApplicationNavigationModel; @@ -68,6 +69,8 @@ public class Initializer extends CompoundInitializer { public void init(DomainInitEvent evt) { super.init(evt); + // Was previously invoked by ApplicationSetup, added here in the process + // of code cleanup. See release notes version 2.0 /* Register object instantiator for AtoZ domain class */ evt.getFactory().registerInstantiator (AtoZ.BASE_DATA_OBJECT_TYPE, @@ -78,6 +81,7 @@ public class Initializer extends CompoundInitializer { } } ); + DomainObjectFactory f = evt.getFactory(); f.registerInstantiator(AtoZCategoryAlias.BASE_DATA_OBJECT_TYPE, new DomainObjectInstantiator() { @@ -86,36 +90,44 @@ public class Initializer extends CompoundInitializer { } }); + XML.parse(AtoZ.getConfig().getTraversalAdapters(), new TraversalHandler()); - AtoZ.getConfig() - .registerProviderType( - new AtoZProviderType("Category Provider", - "Provides a category A-Z", - AtoZCategoryProvider.class, - CategoryProviderForm.class, - CategoryProviderAdmin.class)); + AtoZ.getConfig().registerProviderType( + new AtoZProviderType("Category Provider", + "Provides a category A-Z", + AtoZCategoryProvider.class, + CategoryProviderForm.class, + CategoryProviderAdmin.class)); AtoZ.getConfig().registerProviderType( - new AtoZProviderType("Item Provider", "Provides an item A-Z", - AtoZItemProvider.class, ItemProviderForm.class, - ItemProviderAdmin.class)); + new AtoZProviderType("Item Provider", + "Provides an item A-Z", + AtoZItemProvider.class, + ItemProviderForm.class, + ItemProviderAdmin.class)); + // Introduces a dependency on ccm-types-siteproxy + // Must be refactored into its own package. AtoZ.getConfig().registerProviderType( new AtoZProviderType("SiteProxy Provider", - "Provides a SiteProxy A-Z", - AtoZSiteProxyProvider.class, - SiteProxyProviderForm.class, - SiteProxyProviderAdmin.class)); + "Provides a SiteProxy A-Z", + AtoZSiteProxyProvider.class, + SiteProxyProviderForm.class, + SiteProxyProviderAdmin.class)); + // Introduces dependenciy on navigation package ApplicationNavigationModel.register(AtoZ.class.getName(), new DefaultNavigationModel()); + // Introduces dependency on ccm-ldn-typesesdervise ?? AtoZ.getConfig().registerProviderType( new AtoZProviderType("ESD Toolkit Domain Provider", - "Provides a ESD Toolkit A-Z", DomainProvider.class, - DomainProviderForm.class, DomainProviderAdmin.class)); + "Provides a ESD Toolkit A-Z", + DomainProvider.class, + DomainProviderForm.class, + DomainProviderAdmin.class)); } diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Loader.java b/ccm-atoz/src/com/arsdigita/atoz/Loader.java similarity index 92% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/Loader.java rename to ccm-atoz/src/com/arsdigita/atoz/Loader.java index d8a54f717..8c31c9df6 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Loader.java +++ b/ccm-atoz/src/com/arsdigita/atoz/Loader.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz; +package com.arsdigita.atoz; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; @@ -49,6 +49,11 @@ public class Loader extends PackageLoader { private void setupAtoZ() { s_log.debug("Creating AtoZ application..."); + +// The old ApplicationSetup code is retained here as an example for +// developers how to migrate existing legacy code. See release notes 2.0 +// Should be removed in subsequent releases. + /* ApplicationSetup setup = new ApplicationSetup(s_log); @@ -57,6 +62,7 @@ public class Loader extends PackageLoader { setup.setTitle("A-Z"); setup.setDescription("A-Z of content"); setup.setSingleton(true); + // setInstantiator is a task of the initalizer now! setup.setInstantiator(new ACSObjectInstantiator() { public DomainObject doNewInstance(DataObject dataObject) { return new AtoZ(dataObject); diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/AtoZPane.java b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZPane.java similarity index 93% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/AtoZPane.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/AtoZPane.java index 2a5dabc5d..3a1739bb9 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/AtoZPane.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZPane.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui; +package com.arsdigita.atoz.ui; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; @@ -25,11 +25,11 @@ import com.arsdigita.cms.dispatcher.SiteProxyPanel; import com.arsdigita.kernel.Kernel; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZEntry; -import com.arsdigita.london.atoz.AtoZAtomicEntry; -import com.arsdigita.london.atoz.AtoZCompoundEntry; -import com.arsdigita.london.atoz.AtoZGenerator; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZEntry; +import com.arsdigita.atoz.AtoZAtomicEntry; +import com.arsdigita.atoz.AtoZCompoundEntry; +import com.arsdigita.atoz.AtoZGenerator; import com.arsdigita.xml.Element; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/AdminPane.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AdminPane.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/AdminPane.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/AdminPane.java index f5d8280c2..4390b3f24 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/AdminPane.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AdminPane.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.bebop.SimpleContainer; @@ -33,9 +33,9 @@ import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.util.Assert; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; -import com.arsdigita.london.atoz.AtoZProviderType; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZProviderType; import java.util.Map; import java.util.HashMap; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAdmin.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAdmin.java similarity index 99% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAdmin.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAdmin.java index fb123771e..2d333da13 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAdmin.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAdmin.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.bebop.event.ActionListener; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java index 57abffdee..f8c614c87 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import java.math.BigDecimal; @@ -35,7 +35,7 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.StringInRangeValidationListener; import com.arsdigita.categorization.Category; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZCategoryProvider; public class CategoryProviderAliasForm extends Form { diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasList.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasList.java similarity index 95% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasList.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasList.java index 8d92411f5..e722a6edf 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasList.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasList.java @@ -16,16 +16,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.PageState; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZCategoryAlias; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZCategoryAlias; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.domain.DomainCollection; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlackList.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlackList.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlackList.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlackList.java index 8e5c529e6..2808b9f46 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlackList.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlackList.java @@ -16,15 +16,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.PageState; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.domain.DomainCollection; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlockForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlockForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java index fc7558a3d..0a771fe75 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlockForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.london.util.ui.ObjectCategoryPicker; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java index 8295177d7..0def5a16b 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlacklist.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import java.io.IOException; @@ -29,8 +29,8 @@ import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.persistence.OID; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java index 7537658ab..9a539b75c 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import java.math.BigDecimal; import java.util.TooManyListenersException; @@ -41,7 +41,7 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentTypeCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.persistence.OID; import com.arsdigita.util.UncheckedWrapperException; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderForm.java similarity index 94% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderForm.java index 6f11402c3..2fc1ef25a 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderForm.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.london.util.ui.CategoryPicker; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAdmin.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAdmin.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAdmin.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAdmin.java index a7e7ca20a..5d06cb0fc 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAdmin.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAdmin.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.bebop.event.ActionListener; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java index 9951e6dc9..ee7010231 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SaveCancelSection; @@ -40,8 +40,8 @@ import com.arsdigita.categorization.CategorizedCollection; import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZItemAlias; -import com.arsdigita.london.atoz.AtoZItemProvider; +import com.arsdigita.atoz.AtoZItemAlias; +import com.arsdigita.atoz.AtoZItemProvider; import com.arsdigita.util.Classes; import com.arsdigita.util.UncheckedWrapperException; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasList.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasList.java similarity index 94% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasList.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasList.java index ee9ea3c5d..aa37af3ab 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasList.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasList.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.PageState; @@ -24,9 +24,9 @@ import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZItemAlias; -import com.arsdigita.london.atoz.AtoZItemProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZItemAlias; +import com.arsdigita.atoz.AtoZItemProvider; import com.arsdigita.persistence.OID; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderForm.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderForm.java index 9cb750acf..fe95432a0 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ItemProviderForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderForm.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; @@ -30,8 +30,8 @@ import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainServiceInterfaceExposer; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZItemProvider; -import com.arsdigita.london.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZItemProvider; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.london.util.ui.AbstractCategoryPicker; import com.arsdigita.london.util.ui.CategoryPicker; import com.arsdigita.persistence.DataCollection; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderAdmin.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderAdmin.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderAdmin.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderAdmin.java index a851688e2..d231c7fbe 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderAdmin.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderAdmin.java @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZ; +import com.arsdigita.atoz.AtoZ; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.ActionListener; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderCreateForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderCreateForm.java similarity index 95% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderCreateForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderCreateForm.java index 6658431dd..49dc5450a 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderCreateForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderCreateForm.java @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProviderType; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProviderType; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderDetails.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderDetails.java similarity index 93% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderDetails.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderDetails.java index f6d86dab2..deaa95e71 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderDetails.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderDetails.java @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderForm.java similarity index 97% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderForm.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderForm.java index 4415d8615..32ff686d3 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderForm.java @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Form; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderList.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderList.java similarity index 96% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderList.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderList.java index bd393c6c0..b51b058ab 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/ProviderList.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ProviderList.java @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; -import com.arsdigita.london.atoz.AtoZ; -import com.arsdigita.london.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZ; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/TermWidget.java similarity index 98% rename from ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java rename to ccm-atoz/src/com/arsdigita/atoz/ui/admin/TermWidget.java index 604e0a10d..4bdd92756 100644 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/TermWidget.java @@ -17,10 +17,10 @@ * */ -package com.arsdigita.london.atoz.ui.admin; +package com.arsdigita.atoz.ui.admin; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.atoz.AtoZCategoryProvider; +import com.arsdigita.atoz.AtoZCategoryProvider; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.Terms; diff --git a/ccm-ldn-atoz/src/overview.html b/ccm-atoz/src/overview.html similarity index 100% rename from ccm-ldn-atoz/src/overview.html rename to ccm-atoz/src/overview.html diff --git a/ccm-cms/etc/upload.jsp.README.txt b/ccm-cms/etc/upload.jsp.README.txt new file mode 100644 index 000000000..cbf26a4e4 --- /dev/null +++ b/ccm-cms/etc/upload.jsp.README.txt @@ -0,0 +1,6 @@ +Removed from web directory, + +see r1441, r1443: +> remove wildcard imports and a potentiall security hole in ccm-cms/web/upload.jsp +> Note: Actually the whole upload.jsp should be removed, because it doesn't have +> any permission checks! \ No newline at end of file diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java index a3511529f..3f0de29b5 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java @@ -18,9 +18,9 @@ package com.arsdigita.london.atoz.terms; -import com.arsdigita.london.atoz.AbstractAtoZGenerator; -import com.arsdigita.london.atoz.AtoZAtomicEntry; -import com.arsdigita.london.atoz.AtoZEntry; +import com.arsdigita.atoz.AbstractAtoZGenerator; +import com.arsdigita.atoz.AtoZAtomicEntry; +import com.arsdigita.atoz.AtoZEntry; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Term; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java index f90be00b6..7fc6ca80a 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java @@ -18,8 +18,8 @@ package com.arsdigita.london.atoz.terms; -import com.arsdigita.london.atoz.AtoZGenerator; -import com.arsdigita.london.atoz.AtoZProvider; +import com.arsdigita.atoz.AtoZGenerator; +import com.arsdigita.atoz.AtoZProvider; import com.arsdigita.london.terms.Domain; import com.arsdigita.domain.DomainObjectFactory; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java index b79641f62..f7f9c0a04 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java @@ -18,8 +18,8 @@ package com.arsdigita.london.atoz.ui.terms; -import com.arsdigita.london.atoz.ui.admin.ProviderAdmin; -import com.arsdigita.london.atoz.ui.admin.ProviderDetails; +import com.arsdigita.atoz.ui.admin.ProviderAdmin; +import com.arsdigita.atoz.ui.admin.ProviderDetails; import com.arsdigita.bebop.ActionLink; import com.arsdigita.bebop.Component; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java index 69519b5ae..85e37827f 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java @@ -18,8 +18,8 @@ package com.arsdigita.london.atoz.ui.terms; -import com.arsdigita.london.atoz.AtoZProvider; -import com.arsdigita.london.atoz.ui.admin.ProviderForm; +import com.arsdigita.atoz.AtoZProvider; +import com.arsdigita.atoz.ui.admin.ProviderForm; import com.arsdigita.london.atoz.terms.DomainProvider; import com.arsdigita.london.terms.Domain; diff --git a/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml b/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml index 028ea377e..8e6ee0ba8 100644 --- a/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml +++ b/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml @@ -10,7 +10,7 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-atoz + /templates/ccm-atoz @@ -18,7 +18,7 @@ atoz-files - /ccm-ldn-atoz/files/* + /ccm-atoz/files/* diff --git a/ccm-ldn-atoz/web/templates/ccm-ldn-atoz/admin/index.jsp b/ccm-ldn-atoz/web/templates/ccm-atoz/admin/index.jsp similarity index 100% rename from ccm-ldn-atoz/web/templates/ccm-ldn-atoz/admin/index.jsp rename to ccm-ldn-atoz/web/templates/ccm-atoz/admin/index.jsp diff --git a/ccm-ldn-atoz/web/templates/ccm-ldn-atoz/admin/load-cat.jsp b/ccm-ldn-atoz/web/templates/ccm-atoz/admin/load-cat.jsp similarity index 100% rename from ccm-ldn-atoz/web/templates/ccm-ldn-atoz/admin/load-cat.jsp rename to ccm-ldn-atoz/web/templates/ccm-atoz/admin/load-cat.jsp diff --git a/ccm-ldn-atoz/web/templates/ccm-ldn-atoz/index.jsp b/ccm-ldn-atoz/web/templates/ccm-atoz/index.jsp similarity index 100% rename from ccm-ldn-atoz/web/templates/ccm-ldn-atoz/index.jsp rename to ccm-ldn-atoz/web/templates/ccm-atoz/index.jsp