diff --git a/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java b/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java index a00a6e99c..9c9e60561 100755 --- a/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java +++ b/ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java @@ -107,7 +107,6 @@ public class Initializer extends CompoundInitializer { appsetup.setTitle("Bookmarks Application"); appsetup.setDescription("Bookmarks for a Portal"); appsetup.setDispatcherClass("com.arsdigita.bookmarks.BookmarkDispatcher"); - appsetup.setStylesheet("/packages/bookmarks/xsl/bookmarks.xsl"); appsetup.setPortalApplication(true); appsetup.setInstantiator(new ACSObjectInstantiator() { protected DomainObject doNewInstance(DataObject dataObject) { diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java index e105219d7..d5a531641 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java @@ -31,7 +31,7 @@ import com.arsdigita.search.MetadataProviderRegistry; * The MultiPartArticle initializer. * * @author Justin Ross <jross@redhat.com> - * @version $Id: MultiPartArticleInitializer.java 1500 2007-03-20 09:25:45Z chrisgilbert23 $ + * @version $Id: MultiPartArticleInitializer.java 2099 2010-04-17 15:35:14Z pboy $ */ public class MultiPartArticleInitializer extends ContentTypeInitializer { diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java index ab47608df..57467c263 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; * MultiPartArticle Loader. * * @author Justin Ross <jross@redhat.com> - * @version $Id: MultiPartArticleLoader.java 1561 2007-04-16 15:37:21Z apevec $ + * @version $Id: MultiPartArticleLoader.java 2099 2010-04-17 15:35:14Z pboy $ */ public class MultiPartArticleLoader extends AbstractContentTypeLoader { diff --git a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItem.java b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItem.java index a05dd00aa..34c3dafb8 100755 --- a/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItem.java +++ b/ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItem.java @@ -142,6 +142,7 @@ public class NewsItem extends GenericArticle { public void setNewsDate(Date newsDate) { set(NEWS_DATE, newsDate); } + public static final int SUMMARY_LENGTH = 200; @Override diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java index 167eefb93..659f174de 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java @@ -28,16 +28,20 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ui.authoring.*; import com.arsdigita.kernel.ACSObject; -// import com.arsdigita.london.terms.ui.ACSObjectCategoryPicker; +import com.arsdigita.london.terms.ui.ACSObjectCategoryPicker; import com.arsdigita.london.terms.ui.TermWidget; - /** + *

cms specific Concrete implementation of + * com.arsdigita.aplaws.ui.ACSObjectCategoryPicker.

* + * * - * cms specific Concrete implementation of ACSObjectCategoryPicker - * + *

Activated by pointing the parameter + * com.arsdigita.cms.category_authoring_add_form< to it.

*/ + + public class ItemCategoryPicker extends ACSObjectCategoryPicker { private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class); @@ -51,11 +55,13 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker { /* - * @see com.arsdigita.aplaws.ui.ACSObjectCategoryPicker#getForm(com.arsdigita.bebop.parameters.BigDecimalParameter, com.arsdigita.bebop.parameters.StringParameter) + * @see com.arsdigita.aplaws.ui.ACSObjectCategoryPicker#getForm( + com.arsdigita.bebop.parameters.BigDecimalParameter, + com.arsdigita.bebop.parameters.StringParameter) */ protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) { - s_log.debug("getForm"); - return new ItemCategoryForm(root, mode, new TermWidget(mode, this)); + s_log.debug("getForm"); + return new ItemCategoryForm(root, mode, new TermWidget(mode, this)); } @@ -63,8 +69,8 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker { * @see com.arsdigita.aplaws.ui.ACSObjectCategoryPicker#getObject() */ protected ACSObject getObject(PageState state) { - ContentItem item = CMS.getContext().getContentItem(); - return item.getParent(); + ContentItem item = CMS.getContext().getContentItem(); + return item.getParent(); } diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java index a5cc2ff05..604e0a10d 100644 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java @@ -23,32 +23,32 @@ import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.london.atoz.AtoZCategoryProvider; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Term; +import com.arsdigita.london.terms.Terms; -// import com.arsdigita.aplaws.Aplaws; -// import com.arsdigita.bebop.form.Widget; +import com.arsdigita.aplaws.Aplaws; +import com.arsdigita.bebop.form.Widget; import com.arsdigita.bebop.PageState; -// import com.arsdigita.bebop.parameters.ArrayParameter; -// import com.arsdigita.bebop.parameters.StringParameter; -// import com.arsdigita.bebop.parameters.BigDecimalParameter; +import com.arsdigita.bebop.parameters.ArrayParameter; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.categorization.Category; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.london.terms.Terms; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.xml.Element; -// import com.arsdigita.xml.XML; +import com.arsdigita.xml.XML; import com.arsdigita.cms.CMS; -// import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentSection; import java.math.BigDecimal; -// import java.util.HashMap; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -// import java.util.Map; +import java.util.Map; import java.util.Set; import org.apache.log4j.Logger; diff --git a/ccm-ldn-types-esdservice/pdl/com/arsdigita/content-types/ESDService.pdl b/ccm-ldn-types-esdservice/pdl/com/arsdigita/content-types/ESDService.pdl index 6559ac778..d3de5881d 100755 --- a/ccm-ldn-types-esdservice/pdl/com/arsdigita/content-types/ESDService.pdl +++ b/ccm-ldn-types-esdservice/pdl/com/arsdigita/content-types/ESDService.pdl @@ -17,10 +17,10 @@ model com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.TextPage; +import com.arsdigita.cms.contenttypes.GenericArticle; // object type to hold Contact content type -object type ESDService extends TextPage { +object type ESDService extends GenericArticle { String[0..1] serviceTimes = ct_esdservice.servicetimes VARCHAR(500); reference key ( ct_esdservice.service_id ); diff --git a/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java b/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java index c66b59103..df56fda08 100755 --- a/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java +++ b/ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java @@ -17,7 +17,7 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.TextPage; +import com.arsdigita.cms.contenttypes.GenericArticle; import com.arsdigita.cms.ContentType; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; @@ -33,7 +33,7 @@ import java.math.BigDecimal; * @author Shashin Shinde sshinde@redhat.com * @version $Id: ESDService.java 287 2005-02-22 00:29:02Z sskracic $ */ -public class ESDService extends TextPage { +public class ESDService extends GenericArticle { /** data object type for this domain object */ public static final String BASE_DATA_OBJECT_TYPE =