From 3d13de16e27ef53935c44d6ce047ad316c4652d1 Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 14 Dec 2011 00:18:57 +0000 Subject: [PATCH] Diverse Verfeinerungen ccm-sci-bundle in Zusammenhang mit IAW. git-svn-id: https://svn.libreccm.org/ccm/trunk@1339 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ContactInitializer.java | 2 ++ ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java | 8 ++++---- ccm-sci-bundle/application.xml | 7 ++----- .../bundles/demo/cfg/integration.properties | 2 +- .../bundles/devel/cfg/integration.properties | 2 +- .../bundles/local/iaw-dev/cfg/integration.properties | 3 ++- .../bundles/local/iaw-std/cfg/integration.properties | 11 ++++++----- ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml | 6 +++--- ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java | 6 +++--- environment/local.ccm.properties | 11 +++++++++-- 10 files changed, 33 insertions(+), 25 deletions(-) diff --git a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java index 9f1455152..4981c21b1 100755 --- a/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java +++ b/ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactInitializer.java @@ -16,12 +16,14 @@ public class ContactInitializer extends ContentTypeInitializer { Contact.BASE_DATA_OBJECT_TYPE); } + @Override public String[] getStylesheets() { return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Contact.xsl" }; } + @Override public String getTraversalXML() { return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml"; } diff --git a/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java b/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java index 615fab387..e6b16fb38 100755 --- a/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java +++ b/ccm-ldn-rss/src/com/arsdigita/london/rss/Loader.java @@ -20,17 +20,17 @@ package com.arsdigita.london.rss; import com.arsdigita.categorization.CategoryPurpose; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.kernel.ACSObjectInstantiator; +// import com.arsdigita.domain.DomainObject; +// import com.arsdigita.kernel.ACSObjectInstantiator; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.loader.PackageLoader; -import com.arsdigita.persistence.DataObject; +// import com.arsdigita.persistence.DataObject; import com.arsdigita.portal.PortletType; import com.arsdigita.runtime.ScriptContext; import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet; import com.arsdigita.web.Application; -import com.arsdigita.web.ApplicationSetup; +// import com.arsdigita.web.ApplicationSetup; import com.arsdigita.web.ApplicationType; import com.arsdigita.web.URL; diff --git a/ccm-sci-bundle/application.xml b/ccm-sci-bundle/application.xml index 49353b8ab..3160a7062 100644 --- a/ccm-sci-bundle/application.xml +++ b/ccm-sci-bundle/application.xml @@ -8,14 +8,11 @@ - - - + + diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties index fe24ee817..4bf8fd64c 100644 --- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties @@ -118,7 +118,7 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ccm-sci-bundle (Loader only) -#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml +#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml # ============================================================================================= # runtime specific configurations diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties index 811782df8..9a495f330 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties @@ -118,7 +118,7 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ccm-sci-bundle (Loader only) -#com.arsdigita.bundle.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml +#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml # ============================================================================================= # runtime specific configurations diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties index b00bde445..0931650f1 100644 --- a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties @@ -118,7 +118,8 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ccm-sci-bundle (Loader only) -com.arsdigita.bundle.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/catgegories/iaw-nav-hierarchy-1.00.xml +com.arsdigita.bundle.loader.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/catgegories/iaw-nav-hierarchy-1.00.xml +com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/ # ============================================================================================= # runtime specific configurations diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties index 2889e405a..b7caf244d 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties @@ -1,4 +1,4 @@ -# Scientific CMS IAW-std bundle integration.properties +# Scientific CMS IAW-std bundle integration.properties Version 1.1.6 # waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # @@ -106,8 +106,8 @@ com.arsdigita.navigation.templates_file=bundle/navigation/iaw-templates.txt com.arsdigita.london.search.show_sponsored_links=true -# ccm-ldn-subsite application -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +# ccm-subsite application +com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker # ccm-ldn-themedirector application @@ -118,7 +118,8 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ccm-sci-bundle (Loader only) -com.arsdigita.bundle.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/catgegories/iaw-nav-hierarchy-1.00.xml +com.arsdigita.bundle.loader.category_files=bundle/categories/iaw-nav-domain-1.00.xml,bundle/categories/iaw-nav-hierarchy-1.00.xml +com.arsdigita.bundle.loader.domain_mappings=IAW-NAV:/navigation/,IAW-NAV:/content/,IAW-NAV:/portal/ # ============================================================================================= # runtime specific configurations @@ -130,7 +131,7 @@ waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-114?user\=iaw&password\=iaw24&stringtype\=unspecified +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/iaw-116?user\=iaw&password\=iaw24&stringtype\=unspecified waf.runtime.jdbc_pool_size=40 waf.web.server=localhost\:8080 diff --git a/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml index 08c4c045e..bfb5fc9f7 100644 --- a/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml +++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml @@ -71,12 +71,12 @@ - - - +