diff --git a/ccm-atoz-siteproxy/src/WEB-INF/web.ccm-atoz.xml b/ccm-atoz-siteproxy/src/WEB-INF/web.ccm-atoz.xml new file mode 100644 index 000000000..0a690a1bc --- /dev/null +++ b/ccm-atoz-siteproxy/src/WEB-INF/web.ccm-atoz.xml @@ -0,0 +1,25 @@ + + + + + + atoz-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-atoz + + + + + + + atoz-files + /ccm-atoz/files/* + + + + diff --git a/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java index 1f860a3b3..86e226e03 100755 --- a/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java +++ b/ccm-atoz-siteproxy/src/com/arsdigita/atoz/siteproxy/ui/admin/SiteProxyProviderForm.java @@ -27,7 +27,7 @@ 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.categorization.ui.CategoryPicker; import com.arsdigita.util.Classes; public class SiteProxyProviderForm extends ProviderForm { diff --git a/ccm-atoz/application.xml b/ccm-atoz/application.xml index 41c980215..14f79d535 100755 --- a/ccm-atoz/application.xml +++ b/ccm-atoz/application.xml @@ -11,7 +11,7 @@ - + + @@ -56,8 +56,8 @@ - - + - + @@ -85,7 +85,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -116,7 +116,7 @@ - + + @@ -52,7 +53,7 @@ - + diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml index 212ab4c10..853089179 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml @@ -219,16 +219,16 @@ MODULES SERVLET DECLARATIONS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - + atoz-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-atoz + /templates/ccm-atoz - + @@ -362,12 +362,12 @@ MODULES SERVLET MAPPINGS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - + atoz-files - /ccm-ldn-atoz/files/* + /ccm-atoz/files/* - + diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java index e6ae5ceb8..07b4a34b6 100755 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java @@ -22,7 +22,7 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.london.terms.Term; -import com.arsdigita.london.util.ui.AbstractCategoryPicker; +import com.arsdigita.categorization.ui.AbstractCategoryPicker; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java index 8c75550ab..34cba577d 100755 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java @@ -23,7 +23,7 @@ import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.london.terms.Domain; -import com.arsdigita.london.util.ui.AbstractCategoryPicker; +import com.arsdigita.categorization.ui.AbstractCategoryPicker; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; diff --git a/ccm-ldn-types-contact/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/Contact.xml b/ccm-ldn-types-contact/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/Contact.xml index 0c88ac0b2..144cf7444 100755 --- a/ccm-ldn-types-contact/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/Contact.xml +++ b/ccm-ldn-types-contact/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/Contact.xml @@ -9,25 +9,25 @@ objectType="com.arsdigita.london.contenttypes.Contact" classname="com.arsdigita.london.contenttypes.Contact"> - + + component="com.arsdigita.london.contenttypes.ui.ContactPropertiesStep"/> + component="com.arsdigita.london.contenttypes.ui.ContactAddressProperties"/> + component="com.arsdigita.london.contenttypes.ui.ContactPhonesPanel"/> diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/Contact.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/Contact.java index 4b6e017e7..931c33168 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/Contact.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/Contact.java @@ -340,9 +340,9 @@ public class Contact extends ContentPage { /** * Return collection of Phone objects associated with this Contact object. */ - public PhonesCollection getPhones(){ + public ContactPhonesCollection getPhones(){ DataAssociationCursor dac = ((DataAssociation) get(PHONES)).cursor(); - return new PhonesCollection(dac); + return new ContactPhonesCollection(dac); } private DataObject retrieveDataobject(String attr){ diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactInitializer.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactInitializer.java index 7445250cb..3e05e743c 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactInitializer.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactInitializer.java @@ -23,7 +23,7 @@ import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter; import com.arsdigita.cms.contenttypes.ContentTypeInitializer; -import com.arsdigita.london.contenttypes.ui.AddContactPropertiesStep; +import com.arsdigita.london.contenttypes.ui.ContactPropertiesAddStep; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.runtime.DomainInitEvent; @@ -151,7 +151,7 @@ public class ContactInitializer extends ContentTypeInitializer { } private Class getAuthoringStep() { - return AddContactPropertiesStep.class; + return ContactPropertiesAddStep.class; } private String getBaseType() { diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/PhonesCollection.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactPhonesCollection.java similarity index 87% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/PhonesCollection.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactPhonesCollection.java index 517e87ee6..acad1d2e4 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/PhonesCollection.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ContactPhonesCollection.java @@ -26,15 +26,15 @@ import com.arsdigita.persistence.DataCollection; * * @author Shashin Shinde sshinde@redhat.com * - * @version $Id: PhonesCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactPhonesCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ -public class PhonesCollection extends DomainCollection { +public class ContactPhonesCollection extends DomainCollection { /** * Constructor. * **/ - public PhonesCollection(DataCollection dataCollection) { + public ContactPhonesCollection(DataCollection dataCollection) { super(dataCollection); } diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressProperties.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressProperties.java similarity index 93% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressProperties.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressProperties.java index 218bf7b65..76c751140 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressProperties.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressProperties.java @@ -33,21 +33,21 @@ import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; * * @author Shashin Shinde sshinde@redhat.com * - * @version $Id: AddressProperties.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactAddressProperties.java 287 2005-02-22 00:29:02Z sskracic $ * */ -public class AddressProperties extends SimpleEditStep { +public class ContactAddressProperties extends SimpleEditStep { /** The name of the editing sheet added to this step */ public static String EDIT_SHEET_NAME = "edit-contact-address"; - public AddressProperties(ItemSelectionModel itemModel, + public ContactAddressProperties(ItemSelectionModel itemModel, AuthoringKitWizard parent) { super(itemModel, parent); BasicItemForm form; - form = new AddressPropertyForm(itemModel); + form = new ContactAddressPropertyForm(itemModel); add(EDIT_SHEET_NAME, "Edit", diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressPropertyForm.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressPropertyForm.java similarity index 96% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressPropertyForm.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressPropertyForm.java index 247c3305d..1a8d4611b 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddressPropertyForm.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactAddressPropertyForm.java @@ -38,15 +38,15 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm; * * @author Shashin Shinde sshinde@redhat.com * - * @version $Id: AddressPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactAddressPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $ * */ -public class AddressPropertyForm extends BasicItemForm { +public class ContactAddressPropertyForm extends BasicItemForm { /** Name of this form */ private static final String ID = "Contact_address_edit"; - private static final Logger s_log = Logger.getLogger(AddressPropertyForm.class); + private static final Logger s_log = Logger.getLogger(ContactAddressPropertyForm.class); /** * Creates a new form to edit the ContactAddress object @@ -56,7 +56,7 @@ public class AddressPropertyForm extends BasicItemForm { * @param itemModel The ItemSelectionModel to use to obtain the Contact * object to work on **/ - public AddressPropertyForm(ItemSelectionModel itemModel) { + public ContactAddressPropertyForm(ItemSelectionModel itemModel) { super(ID, itemModel); } diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/CreatePhone.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactCreatePhone.java similarity index 95% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/CreatePhone.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactCreatePhone.java index 686737adf..54437b5e5 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/CreatePhone.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactCreatePhone.java @@ -41,10 +41,10 @@ import java.util.ArrayList; * * @author Shashin Shinde * - * @version $Id: CreatePhone.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactCreatePhone.java 287 2005-02-22 00:29:02Z sskracic $ * */ -class CreatePhone extends BasicItemForm { +class ContactCreatePhone extends BasicItemForm { private ItemSelectionModel m_model; @@ -57,7 +57,7 @@ class CreatePhone extends BasicItemForm { * The ItemSelectionModel to use to obtain the Contact object to * work on */ - public CreatePhone(ItemSelectionModel itemModel) { + public ContactCreatePhone(ItemSelectionModel itemModel) { super("Contact_phone_create", itemModel); m_model = itemModel; } diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesPanel.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesPanel.java similarity index 83% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesPanel.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesPanel.java index 4ab1ea259..99dc12c79 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesPanel.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesPanel.java @@ -30,18 +30,18 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; * * @author Shashin Shinde sshinde@redhat.com * - * @version $Id: PhonesPanel.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactPhonesPanel.java 287 2005-02-22 00:29:02Z sskracic $ * */ -public class PhonesPanel extends SimpleEditStep { +public class ContactPhonesPanel extends SimpleEditStep { /** The name of the editing sheet added to this step */ private static String EDIT_SHEET_NAME = "manage-phones"; - public PhonesPanel(ItemSelectionModel itemModel, AuthoringKitWizard parent) { + public ContactPhonesPanel(ItemSelectionModel itemModel, AuthoringKitWizard parent) { super(itemModel, parent); - BasicItemForm form = new CreatePhone(itemModel); + BasicItemForm form = new ContactCreatePhone(itemModel); add( EDIT_SHEET_NAME, @@ -49,7 +49,7 @@ public class PhonesPanel extends SimpleEditStep { new WorkflowLockedComponentAccess(form, itemModel), form.getSaveCancelSection().getCancelButton()); - PhonesTable phTable = new PhonesTable(itemModel); + ContactPhonesTable phTable = new ContactPhonesTable(itemModel); setDisplayComponent(phTable); } diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesTable.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesTable.java similarity index 95% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesTable.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesTable.java index e4f9a1642..cd4bd961f 100755 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/PhonesTable.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPhonesTable.java @@ -34,7 +34,7 @@ import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.SecurityManager; import com.arsdigita.london.contenttypes.Contact; import com.arsdigita.london.contenttypes.ContactPhone; -import com.arsdigita.london.contenttypes.PhonesCollection; +import com.arsdigita.london.contenttypes.ContactPhonesCollection; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.util.LockableImpl; @@ -46,10 +46,10 @@ import java.math.BigDecimal; * * @author Shashin Shinde sshinde@redhat.com * - * @version $Id: PhonesTable.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContactPhonesTable.java 287 2005-02-22 00:29:02Z sskracic $ * */ -class PhonesTable extends Table implements TableActionListener{ +class ContactPhonesTable extends Table implements TableActionListener{ private ItemSelectionModel m_contactSel; @@ -63,7 +63,7 @@ class PhonesTable extends Table implements TableActionListener{ * @param selContact , ItemSelectionModel which provides the * Contact object whose Phones are to be manipulated. */ - public PhonesTable(ItemSelectionModel selContact) { + public ContactPhonesTable(ItemSelectionModel selContact) { super(); m_contactSel = selContact; @@ -102,7 +102,7 @@ class PhonesTable extends Table implements TableActionListener{ private class PhonesTableModel implements TableModel{ private Table m_table; - private PhonesCollection m_phones; + private ContactPhonesCollection m_phones; private ContactPhone m_phone; private PhonesTableModel(Table t,PageState ps,Contact c){ diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactPropertiesStep.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPropertiesAddStep.java similarity index 97% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactPropertiesStep.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPropertiesAddStep.java index 44e28489e..0ff2b3348 100644 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactPropertiesStep.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPropertiesAddStep.java @@ -26,10 +26,10 @@ import com.arsdigita.util.Assert; /** * */ -public class AddContactPropertiesStep extends ResettableContainer { +public class ContactPropertiesAddStep extends ResettableContainer { private static final Logger s_log = Logger - .getLogger(AddContactPropertiesStep.class); + .getLogger(ContactPropertiesAddStep.class); public static final String EDIT_SHEET_NAME = "edit"; @@ -45,7 +45,7 @@ public class AddContactPropertiesStep extends ResettableContainer { private ContactDisplay m_display; - public AddContactPropertiesStep(ItemSelectionModel itemModel, + public ContactPropertiesAddStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) { m_parent = parent; @@ -76,7 +76,7 @@ public class AddContactPropertiesStep extends ResettableContainer { } private Component getFindContactSheet() { - return new AddContactToItemForm(this); + return new ContactToItemAddForm(this); } public ItemSelectionModel getItemSelectionModel() { diff --git a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactToItemForm.java b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactToItemAddForm.java similarity index 95% rename from ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactToItemForm.java rename to ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactToItemAddForm.java index a51a99e77..ea1cd3343 100644 --- a/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/AddContactToItemForm.java +++ b/ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactToItemAddForm.java @@ -22,7 +22,7 @@ import com.arsdigita.london.contenttypes.Contact; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; -public class AddContactToItemForm extends FormSection implements +public class ContactToItemAddForm extends FormSection implements FormInitListener, FormValidationListener, FormProcessListener, FormSubmissionListener { @@ -40,7 +40,7 @@ public class AddContactToItemForm extends FormSection implements private Label m_searchFormLabel; - private AddContactPropertiesStep m_step; + private ContactPropertiesAddStep m_step; private AuthoringKitWizard m_parent; @@ -49,7 +49,7 @@ public class AddContactToItemForm extends FormSection implements private ActionLink m_removeLink; - public AddContactToItemForm(AddContactPropertiesStep step) { + public ContactToItemAddForm(ContactPropertiesAddStep step) { m_step = step; m_parent = m_step.getParent(); @@ -94,7 +94,7 @@ public class AddContactToItemForm extends FormSection implements add(m_itemSearch); } - public AddContactToItemForm getThis() { + public ContactToItemAddForm getThis() { return this; } diff --git a/ccm-ldn-util/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java b/ccm-ldn-util/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java index 08fcdc49b..e0a9c2f55 100755 --- a/ccm-ldn-util/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java +++ b/ccm-ldn-util/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java @@ -18,6 +18,7 @@ package com.arsdigita.london.util.ui; +import com.arsdigita.categorization.ui.ObjectCategoryPicker; import com.arsdigita.web.Web; import com.arsdigita.kernel.ACSObject; import com.arsdigita.bebop.PageState; diff --git a/ccm-ldn-util/src/com/arsdigita/london/util/ui/UserPicker.java b/ccm-ldn-util/src/com/arsdigita/london/util/ui/UserPicker.java index 8f68141dd..34129864a 100755 --- a/ccm-ldn-util/src/com/arsdigita/london/util/ui/UserPicker.java +++ b/ccm-ldn-util/src/com/arsdigita/london/util/ui/UserPicker.java @@ -28,8 +28,9 @@ import java.math.BigDecimal; public abstract class UserPicker extends FormSection - implements FormProcessListener, FormInitListener -{ + implements FormProcessListener, + FormInitListener { + private static final int USER_LIST_SIZE = 10; private static final String ADD_USER = "addUser"; @@ -185,6 +186,7 @@ public abstract class UserPicker extends FormSection } + @Override public void register( Page p ) { super.register( p ); diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java index 49b22c0ee..e83658385 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/portlet/ObjectListPortletEditor.java @@ -52,7 +52,7 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.StringUtils; import com.arsdigita.kernel.ResourceType; -import com.arsdigita.london.util.ui.CategoryPicker; +import com.arsdigita.categorization.ui.CategoryPicker; import com.arsdigita.london.util.ui.ApplicationCategoryPicker; import com.redhat.persistence.metadata.Root; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java index b3faef86a..3e8752884 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java @@ -42,7 +42,7 @@ import com.arsdigita.kernel.ResourceType; import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet; // @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection // import com.arsdigita.london.portal.ui.PortletConfigFormSection; -import com.arsdigita.london.util.Categorization; +import com.arsdigita.categorization.ui.CategorizationTree; import com.arsdigita.persistence.OID; import com.arsdigita.portal.Portlet; import com.arsdigita.util.UncheckedWrapperException; @@ -175,7 +175,7 @@ public class ContentDirectoryPortletEditor extends PortletConfigFormSection { Application app = Web.getContext().getApplication(); Category root = Category.getRootForObject(app, getUseContext()); - Map cats = Categorization.categorySubtreePath(root, " > "); + Map cats = CategorizationTree.getSubtreePath(root, " > "); Iterator i = cats.keySet().iterator(); while (i.hasNext()) { String path = (String) i.next(); diff --git a/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java index 36be0289a..1d2ab7bae 100755 --- a/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java +++ b/ccm-rssfeed/src/com/arsdigita/rssfeed/RSSService.java @@ -31,7 +31,7 @@ import java.text.SimpleDateFormat; import com.arsdigita.categorization.Category; import com.arsdigita.categorization.CategorizedCollection; -import com.arsdigita.london.util.Categorization; +import com.arsdigita.categorization.ui.CategorizationTree; import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentItem; @@ -405,7 +405,7 @@ public class RSSService { Element itemsSeq = new Element("Seq", rdfNS); channelItems.addContent(itemsSeq); - Map cats = Categorization.categorySubtreePath(root); + Map cats = CategorizationTree.getSubtreePath(root); s_log.debug("Get categories"); Iterator i = cats.keySet().iterator(); s_log.debug("About to iterate"); diff --git a/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java b/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java index 5f3965e2e..b988bff44 100755 --- a/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java +++ b/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java @@ -43,7 +43,7 @@ import com.arsdigita.bebop.parameters.ParameterData; import com.arsdigita.bebop.PageState; import com.arsdigita.categorization.Category; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.london.util.ui.CategoryPicker; +import com.arsdigita.categorization.ui.CategoryPicker; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.subsite.Site;