LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verschiedene kleine Anpassungen an vorangegangene Änderungen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@685 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-01-16 11:54:06 +00:00
parent 45558e8327
commit 0ae4b22d5f
8 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-bookmarks/src/com/arsdigita/bookmarks/installer/Initializer.java
View File

@ -107,7 +107,6 @@ public class Initializer extends CompoundInitializer {
appsetup.setTitle("Bookmarks Application"); appsetup.setTitle("Bookmarks Application");
appsetup.setDescription("Bookmarks for a Portal"); appsetup.setDescription("Bookmarks for a Portal");
appsetup.setDispatcherClass("com.arsdigita.bookmarks.BookmarkDispatcher"); appsetup.setDispatcherClass("com.arsdigita.bookmarks.BookmarkDispatcher");
appsetup.setStylesheet("/packages/bookmarks/xsl/bookmarks.xsl");
appsetup.setPortalApplication(true); appsetup.setPortalApplication(true);
appsetup.setInstantiator(new ACSObjectInstantiator() { appsetup.setInstantiator(new ACSObjectInstantiator() {
protected DomainObject doNewInstance(DataObject dataObject) { protected DomainObject doNewInstance(DataObject dataObject) {

2
ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java
View File

@ -31,7 +31,7 @@ import com.arsdigita.search.MetadataProviderRegistry;
* The MultiPartArticle initializer. * The MultiPartArticle initializer.
* *
* @author Justin Ross <jross@redhat.com> * @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 { public class MultiPartArticleInitializer extends ContentTypeInitializer {

2
ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java
View File

@ -33,7 +33,7 @@ import org.apache.log4j.Logger;
* MultiPartArticle Loader. * MultiPartArticle Loader.
* *
* @author Justin Ross <jross@redhat.com> * @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 { public class MultiPartArticleLoader extends AbstractContentTypeLoader {

1
ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItem.java
View File

@ -142,6 +142,7 @@ public class NewsItem extends GenericArticle {
public void setNewsDate(Date newsDate) { public void setNewsDate(Date newsDate) {
set(NEWS_DATE, newsDate); set(NEWS_DATE, newsDate);
} }
public static final int SUMMARY_LENGTH = 200; public static final int SUMMARY_LENGTH = 200;
@Override @Override

22
ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java
View File

@ -28,16 +28,20 @@ import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ui.authoring.*; import com.arsdigita.cms.ui.authoring.*;
import com.arsdigita.kernel.ACSObject; 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; import com.arsdigita.london.terms.ui.TermWidget;
/** /**
* <p> cms specific Concrete implementation of
* <code>com.arsdigita.aplaws.ui.ACSObjectCategoryPicker</code>. </p>
* *
* *
* cms specific Concrete implementation of ACSObjectCategoryPicker
* *
* <p>Activated by pointing the parameter
* <code>com.arsdigita.cms.category_authoring_add_form<</code> to it.</p>
*/ */
public class ItemCategoryPicker extends ACSObjectCategoryPicker { public class ItemCategoryPicker extends ACSObjectCategoryPicker {
private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class); 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) { protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) {
s_log.debug("getForm"); s_log.debug("getForm");
return new ItemCategoryForm(root, mode, new TermWidget(mode, this)); 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() * @see com.arsdigita.aplaws.ui.ACSObjectCategoryPicker#getObject()
*/ */
protected ACSObject getObject(PageState state) { protected ACSObject getObject(PageState state) {
ContentItem item = CMS.getContext().getContentItem(); ContentItem item = CMS.getContext().getContentItem();
return item.getParent(); return item.getParent();
} }

20
ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java
View File

@ -23,32 +23,32 @@ import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
import com.arsdigita.london.atoz.AtoZCategoryProvider; import com.arsdigita.london.atoz.AtoZCategoryProvider;
import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Domain;
import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.Term;
import com.arsdigita.london.terms.Terms;
// import com.arsdigita.aplaws.Aplaws; import com.arsdigita.aplaws.Aplaws;
// import com.arsdigita.bebop.form.Widget; import com.arsdigita.bebop.form.Widget;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
// import com.arsdigita.bebop.parameters.ArrayParameter; import com.arsdigita.bebop.parameters.ArrayParameter;
// import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.StringParameter;
// import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.categorization.Category; import com.arsdigita.categorization.Category;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.london.terms.Terms;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
// import com.arsdigita.xml.XML; import com.arsdigita.xml.XML;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
// import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import java.math.BigDecimal; import java.math.BigDecimal;
// import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
// import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

4
ccm-ldn-types-esdservice/pdl/com/arsdigita/content-types/ESDService.pdl
View File

@ -17,10 +17,10 @@
model com.arsdigita.cms.contenttypes; 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 to hold Contact content type
object type ESDService extends TextPage { object type ESDService extends GenericArticle {
String[0..1] serviceTimes = ct_esdservice.servicetimes VARCHAR(500); String[0..1] serviceTimes = ct_esdservice.servicetimes VARCHAR(500);
reference key ( ct_esdservice.service_id ); reference key ( ct_esdservice.service_id );

4
ccm-ldn-types-esdservice/src/com/arsdigita/cms/contenttypes/ESDService.java
View File

@ -17,7 +17,7 @@
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.TextPage; import com.arsdigita.cms.contenttypes.GenericArticle;
import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentType;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
@ -33,7 +33,7 @@ import java.math.BigDecimal;
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a> * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
* @version $Id: ESDService.java 287 2005-02-22 00:29:02Z sskracic $ * @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 */ /** data object type for this domain object */
public static final String BASE_DATA_OBJECT_TYPE = public static final String BASE_DATA_OBJECT_TYPE =