AtoZ sollte doch jetzt umgebaut werden, sonst ist das hinterher mit dem Auftrennen zuviel hin und her. Erste Version, bei der AtoZ noch nicht läuft. Notwendig um Mist mit SVN zu vermeiden. Hat aber auf SciCMS keine Auswirkung.

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

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;

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;

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);
 

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
-import com.arsdigita.london.atoz.AtoZSiteProxyProvider;
+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;
 

ccm-atoz/application.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  name="ccm-ldn-atoz"
+  prettyName="A-Z"
+  version="6.6.1"
+  release="1"
+  webapp="ROOT">
+
+  <ccm:dependencies>
+    <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-util" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-cms-types-siteproxy" version="6.6.0" relation="ge"/>
+  </ccm:dependencies>
+  <ccm:contacts>
+    <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
+    <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
+  </ccm:contacts>
+  <ccm:description>
+    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. 
+  </ccm:description>
+
+</ccm:application>

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;
 
 
 

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;

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 
+    /** PDL Stuff - Base object                                               */
-        = "com.arsdigita.london.atoz.AtoZ";
+    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.atoz.AtoZ";
-
+        
-    private static final AtoZConfig s_config = new AtoZConfig();
+    /* Convenient Strings                                                     */
-    static {
-        logger.debug("Static initializer is starting...");
-        s_config.load();
-        logger.debug("Static initializer is finished.");
-    }
-    
-    public static final AtoZConfig getConfig() {
-        return s_config;
-    }
-    
-    
     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";
     }
 
 }

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;
 

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";

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) {

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);
 

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 {

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");
-        
+    /** The UI widget for the Root Category Picker                            */
-        m_rootCategoryPicker = new ClassParameter(
+    private Parameter m_rootCategoryPicker = new ClassParameter(
             "com.arsdigita.london.atoz.root_category_picker",
             Parameter.REQUIRED,
             ApplicationCategoryPicker.class);
-
+    /** Make AtoZ use subsite-specific navigation categories. Set to true, 
-        m_useSubsiteSpecificNavigationCategory = new BooleanParameter
+     *  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);
-        
+    /** To filter out category without published items. If TRUE, the AtoZ 
-        m_filterCategoryProdiver = new BooleanParameter (
+     *  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);

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;
 
 
 

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;
 
 
 

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;

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;

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;

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;

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.atoz.ui.admin.ProviderForm;
-import com.arsdigita.london.atoz.ui.admin.ProviderAdmin;
+import com.arsdigita.atoz.ui.admin.ProviderAdmin;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
 
 import com.arsdigita.util.Assert;

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.atoz.ui.admin.CategoryProviderAdmin;
-import com.arsdigita.london.atoz.ui.admin.CategoryProviderForm;
+import com.arsdigita.atoz.ui.admin.CategoryProviderForm;
-import com.arsdigita.london.atoz.ui.admin.ItemProviderAdmin;
+import com.arsdigita.atoz.ui.admin.ItemProviderAdmin;
-import com.arsdigita.london.atoz.ui.admin.ItemProviderForm;
+import com.arsdigita.atoz.ui.admin.ItemProviderForm;
-import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderAdmin;
+import com.arsdigita.atoz.siteproxy.ui.admin.SiteProxyProviderAdmin;
-import com.arsdigita.london.atoz.ui.admin.SiteProxyProviderForm;
+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()
+        AtoZ.getConfig().registerProviderType(
-                .registerProviderType(
+                new AtoZProviderType("Category Provider",
-                        new AtoZProviderType("Category Provider",
+                                     "Provides a category A-Z",
-                                "Provides a category A-Z",
+                                     AtoZCategoryProvider.class,
-                                AtoZCategoryProvider.class,
+                                     CategoryProviderForm.class,
-                                CategoryProviderForm.class,
+                                     CategoryProviderAdmin.class));
-                                CategoryProviderAdmin.class));
 
         AtoZ.getConfig().registerProviderType(
-                new AtoZProviderType("Item Provider", "Provides an item A-Z",
+                new AtoZProviderType("Item Provider", 
-                        AtoZItemProvider.class, ItemProviderForm.class,
+                                     "Provides an item A-Z",
-                        ItemProviderAdmin.class));
+                                     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",
+                                     "Provides a SiteProxy A-Z",
-                        AtoZSiteProxyProvider.class,
+                                     AtoZSiteProxyProvider.class,
-                        SiteProxyProviderForm.class,
+                                     SiteProxyProviderForm.class,
-                        SiteProxyProviderAdmin.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,
+                                     "Provides a ESD Toolkit A-Z", 
-                        DomainProviderForm.class, DomainProviderAdmin.class));
+                                     DomainProvider.class,
+                                     DomainProviderForm.class, 
+                                     DomainProviderAdmin.class));
 
     }
 

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);

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZEntry;
+import com.arsdigita.atoz.AtoZEntry;
-import com.arsdigita.london.atoz.AtoZAtomicEntry;
+import com.arsdigita.atoz.AtoZAtomicEntry;
-import com.arsdigita.london.atoz.AtoZCompoundEntry;
+import com.arsdigita.atoz.AtoZCompoundEntry;
-import com.arsdigita.london.atoz.AtoZGenerator;
+import com.arsdigita.atoz.AtoZGenerator;
 
 import com.arsdigita.xml.Element;
 

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
-import com.arsdigita.london.atoz.AtoZProviderType;
+import com.arsdigita.atoz.AtoZProviderType;
 
 import java.util.Map;
 import java.util.HashMap;

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;

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 {
 

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZCategoryAlias;
+import com.arsdigita.atoz.AtoZCategoryAlias;
-import com.arsdigita.london.atoz.AtoZCategoryProvider;
+import com.arsdigita.atoz.AtoZCategoryProvider;
 
 import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.domain.DomainCollection;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZCategoryProvider;
+import com.arsdigita.atoz.AtoZCategoryProvider;
 
 import com.arsdigita.domain.DomainObjectXMLRenderer;
 import com.arsdigita.domain.DomainCollection;

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;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZCategoryProvider;
+import com.arsdigita.atoz.AtoZCategoryProvider;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;

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;
 

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
-import com.arsdigita.london.atoz.AtoZCategoryProvider;
+import com.arsdigita.atoz.AtoZCategoryProvider;
 import com.arsdigita.london.util.ui.CategoryPicker;
 
 import com.arsdigita.bebop.PageState;

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;

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.atoz.AtoZItemAlias;
-import com.arsdigita.london.atoz.AtoZItemProvider;
+import com.arsdigita.atoz.AtoZItemProvider;
 import com.arsdigita.util.Classes;
 import com.arsdigita.util.UncheckedWrapperException;
 

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZItemAlias;
+import com.arsdigita.atoz.AtoZItemAlias;
-import com.arsdigita.london.atoz.AtoZItemProvider;
+import com.arsdigita.atoz.AtoZItemProvider;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;

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.atoz.AtoZItemProvider;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
 import com.arsdigita.london.util.ui.AbstractCategoryPicker;
 import com.arsdigita.london.util.ui.CategoryPicker;
 import com.arsdigita.persistence.DataCollection;

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;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProviderType;
+import com.arsdigita.atoz.AtoZProviderType;
 
 import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.PageState;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
 
 import com.arsdigita.bebop.SimpleComponent;
 import com.arsdigita.bebop.PageState;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.Form;

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.atoz.AtoZ;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
 
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.PageState;

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;

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!

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.atoz.AbstractAtoZGenerator;
-import com.arsdigita.london.atoz.AtoZAtomicEntry;
+import com.arsdigita.atoz.AtoZAtomicEntry;
-import com.arsdigita.london.atoz.AtoZEntry;
+import com.arsdigita.atoz.AtoZEntry;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.Term;
 

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.atoz.AtoZGenerator;
-import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.atoz.AtoZProvider;
 import com.arsdigita.london.terms.Domain;
 
 import com.arsdigita.domain.DomainObjectFactory;

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.atoz.ui.admin.ProviderAdmin;
-import com.arsdigita.london.atoz.ui.admin.ProviderDetails;
+import com.arsdigita.atoz.ui.admin.ProviderDetails;
 
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.Component;

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.atoz.AtoZProvider;
-import com.arsdigita.london.atoz.ui.admin.ProviderForm;
+import com.arsdigita.atoz.ui.admin.ProviderForm;
 import com.arsdigita.london.atoz.terms.DomainProvider;
 import com.arsdigita.london.terms.Domain;
 

ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml

@@ -10,7 +10,7 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-atoz</param-value>
+      <param-value>/templates/ccm-atoz</param-value>
     </init-param>
   </servlet>
   <!-- module ccm-ldn-atoz  -  servlet declarations END  -->
@@ -18,7 +18,7 @@
   <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>atoz-files</servlet-name>
-    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+    <url-pattern>/ccm-atoz/files/*</url-pattern>
   </servlet-mapping>
   <!-- module ccm-ldn-atoz  -  servlet mappings END  -->