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 48a9e96de..e105219d7 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 @@ -18,7 +18,7 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentSectionConfig; +import com.arsdigita.cms.CMSConfig; import com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel; //Unused import // import com.arsdigita.cms.search.ContentPageMetadataProvider; @@ -67,7 +67,7 @@ public class MultiPartArticleInitializer extends ContentTypeInitializer { ArticleSection.BASE_DATA_OBJECT_TYPE, new MultiPartArticleSectionURLFinder()); - ContentSectionConfig.registerExtraXMLGenerator(MultiPartArticle.class.getName(), + CMSConfig.registerExtraXMLGenerator(MultiPartArticle.class.getName(), new ArticleSectionPanel()); } } diff --git a/ccm-core/src/com/arsdigita/portal/PortletType.java b/ccm-core/src/com/arsdigita/portal/PortletType.java index 89c20c24d..830174ad6 100755 --- a/ccm-core/src/com/arsdigita/portal/PortletType.java +++ b/ccm-core/src/com/arsdigita/portal/PortletType.java @@ -117,12 +117,24 @@ public class PortletType extends ResourceType { return BASE_DATA_OBJECT_TYPE; } + /** + * + * @param title + * @param profile + * @param portletObjectType + * @return + */ public static PortletType createPortletType(String title, String profile, String portletObjectType) { return new PortletType (BASE_DATA_OBJECT_TYPE, title, profile, portletObjectType); } + /** + * + * @param id + * @return + */ public static PortletType retrievePortletType(BigDecimal id) { Assert.exists(id, "id"); @@ -130,6 +142,12 @@ public class PortletType extends ResourceType { (new OID(BASE_DATA_OBJECT_TYPE, id)); } + + /** + * + * @param oid + * @return + */ public static PortletType retrievePortletType(OID oid) { Assert.exists(oid, "oid"); diff --git a/ccm-core/src/com/arsdigita/xmlinterp/package.html b/ccm-core/src/com/arsdigita/xmlinterp/package.html index 8e8a7484d..12d78bb73 100755 --- a/ccm-core/src/com/arsdigita/xmlinterp/package.html +++ b/ccm-core/src/com/arsdigita/xmlinterp/package.html @@ -1,8 +1,9 @@ - + + Package com.arsdigita.xmlinterp - +

diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg index 66b4cdb52..09e88aeca 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg @@ -4,8 +4,10 @@ ccm-cms # Content assets ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink +## -- ccm-ldn-dublin ist das eigentlich ein asset? # Content types ccm-cms-types-address @@ -15,16 +17,10 @@ ccm-cms-types-bookmark ccm-cms-types-contact # -- ccm-cms-types-esdservice ccm-cms-types-event -# -- faqitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem -# -- glossaryitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-glossaryitem # -- ccm-cms-types-htmlform # -- ccm-cms-types-inlinesite @@ -39,7 +35,7 @@ ccm-cms-types-newsitem # -- ccm-cms-types-service ccm-cms-types-siteproxy # -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht -ccm-cms-types-xmlfeed +# -- ccm-cms-types-xmlfeed # Applications @@ -61,7 +57,6 @@ ccm-user-preferences # -- ccm-ldn-dublin # -- ccm-ldn-exporter # -- ccm-ldn-freeform -ccm-ldn-image-step # -- ccm-ldn-importer ccm-ldn-navigation ccm-ldn-portal diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties index a4e292238..c55f83cd5 100755 --- a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties @@ -3,7 +3,7 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true -waf.categorization.supported_languages=de,en +waf.categorization.supported_languages=en waf.dispatcher.default_expiry=3600 ; @@ -104,7 +104,7 @@ waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/handbook?user\=hbk&password\= waf.runtime.jdbc_pool_size=80 waf.web.server=localhost\:8080 -waf.admin.email=webmaster@handbook-state.pwi.uni-bremen.de +waf.admin.email=webmaster@handbook.state.uni-bremen.de waf.admin.name.given=CCM waf.admin.name.family=Administrator waf.admin.password=nge2015 diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg index 6abe49228..08d741617 100755 --- a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg @@ -7,7 +7,8 @@ ccm-cms-assets-fileattachment ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink -## -- ccm-ldn-dublin ist das eigentlich ein asset? +# is ccm-ldn-dublin really an asset? +## -- ccm-ldn-dublin # Content types # -- ccm-cms-types-address @@ -30,7 +31,6 @@ ccm-forum-categorised ccm-user-preferences # LDN extensions -# ccm-ldn-image-step ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties index 36b59a19f..9858dde19 100755 --- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties +++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties @@ -92,7 +92,7 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui. com.arsdigita.london.theme.default_theme_context= com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic -com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml +com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xml xsl # com.arsdigita.london.cms.dublin.audience_domain=LGAL diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg index 115e31a70..dc28cac64 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/complete/cfg/applications.cfg @@ -3,8 +3,12 @@ ccm-core ccm-cms # Content assets -ccm-cms-assets-relatedlink ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep +## ccm-cms-assets-notes +ccm-cms-assets-relatedlink +# is ldn-dublin really an asset? +ccm-ldn-dublin # Content types ccm-cms-types-address @@ -33,11 +37,8 @@ ccm-cms-types-service ccm-cms-types-siteproxy ccm-cms-types-xmlfeed -ccm-ldn-image-step - # Applications ccm-ldn-util -ccm-ldn-dublin ccm-ldn-atoz ccm-ldn-rss ccm-ldn-portal diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg index 6f53ec72f..2a2b45f33 100755 --- a/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/demo/cfg/applications.cfg @@ -3,7 +3,11 @@ ccm-core ccm-cms # Content assets +ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep +## ccm-cms-assets-notes ccm-cms-assets-relatedlink +# is ldn-dublin really an asset? ccm-ldn-dublin # Content types diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg index af3de3db0..fcad08b84 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/devel/cfg/applications.cfg @@ -3,7 +3,11 @@ ccm-core ccm-cms # Content assets +ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep +## ccm-cms-assets-notes ccm-cms-assets-relatedlink +# is ldn-dublin really an asset? ccm-ldn-dublin # Content types diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg index f931c0386..2a2b45f33 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg +++ b/ccm-ldn-aplaws/bundles/standard/cfg/applications.cfg @@ -3,8 +3,11 @@ ccm-core ccm-cms # Content assets -ccm-cms-assets-relatedlink ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep +## ccm-cms-assets-notes +ccm-cms-assets-relatedlink +# is ldn-dublin really an asset? ccm-ldn-dublin # Content types diff --git a/environment/project.xml.complete b/environment/project.xml.complete index 2ef1c9150..c3b4ef380 100755 --- a/environment/project.xml.complete +++ b/environment/project.xml.complete @@ -18,6 +18,7 @@ + @@ -59,7 +60,6 @@ - diff --git a/environment/project.xml.zes b/environment/project.xml.zes index ed87a08be..9df71dfd2 100644 --- a/environment/project.xml.zes +++ b/environment/project.xml.zes @@ -23,6 +23,7 @@ + @@ -79,7 +80,6 @@ -