Diverse Verfeinerungen ccm-sci-bundle in Zusammenhang mit IAW.
git-svn-id: https://svn.libreccm.org/ccm/trunk@1339 8810af33-2d31-482b-a856-94f89814c4dfmaster
pb
parent
deec8db23e
commit
3d13de16e2
|
|
@ -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";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,11 @@
|
|||
<ccm:dependencies>
|
||||
<ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
|
||||
<!-- not required anymore (2007-06-09)
|
||||
<ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
|
||||
-->
|
||||
<ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
|
||||
</ccm:dependencies>
|
||||
|
||||
<ccm:directories>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@
|
|||
<ccm:application name="ccm-cms-types-siteproxy"/>
|
||||
|
||||
<!-- Applications -->
|
||||
<ccm:application name="ccm-cms-dabinpersonimporter"/>
|
||||
<ccm:application name="ccm-cms-publicpersonalprofile"/>
|
||||
<ccm:application name="ccm-user-preferences"/>
|
||||
|
||||
<!-- LDN extension -->
|
||||
<ccm:application name="ccm-ldn-rss"/>
|
||||
<!--
|
||||
<ccm:application name="ccm-ldn-rss"/>
|
||||
-->
|
||||
|
||||
<!-- SCI extension -->
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public class Loader extends PackageLoader {
|
|||
* FULL_QUALIFIED_CLASS_NAME : URL : TITLE "
|
||||
*/
|
||||
private Parameter m_customApplicationInstances = new StringArrayParameter(
|
||||
"com.arsdigita.bundle.local_app_instances",
|
||||
"com.arsdigita.bundle.loader.local_app_instances",
|
||||
Parameter.OPTIONAL, null
|
||||
);
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ public class Loader extends PackageLoader {
|
|||
* Files are stored as part of the jar, so classloader can find them.
|
||||
*/
|
||||
private Parameter m_categoryFiles = new StringArrayParameter(
|
||||
"com.arsdigita.bundle.category_files",
|
||||
"com.arsdigita.bundle.loader.category_files",
|
||||
Parameter.REQUIRED,new String[]{
|
||||
"bundle/categories/sci-nav-domain-1.00.xml",
|
||||
"bundle/categories/sci-nav-hierarchy-1.00.xml" }
|
||||
|
|
@ -107,7 +107,7 @@ public class Loader extends PackageLoader {
|
|||
*
|
||||
*/
|
||||
private Parameter m_domainMappings = new StringArrayParameter(
|
||||
"com.arsdigita.bundle.domain_mappings",
|
||||
"com.arsdigita.bundle.loader.domain_mappings",
|
||||
Parameter.REQUIRED,new String[]{ "STD-NAV:/navigation/",
|
||||
"STD-NAV:/content/",
|
||||
"STD-NAV:/portal/" }
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
|
||||
ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/ccm
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/igb
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/nsh
|
||||
#
|
||||
|
|
@ -28,7 +29,7 @@
|
|||
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/demo
|
||||
ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
|
||||
#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/iaw-std
|
||||
|
||||
|
||||
|
|
@ -43,10 +44,16 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
|
|||
|
||||
|
||||
# ---------------------------------------------------------------------
|
||||
# Update von rel. 1.1.4 auf 1.1.x (trunk)
|
||||
# Update von rel. 1.1.4 auf 1.1.8
|
||||
# Müssen NACH dem (regulären) Update 1.1.3 -> 1.1.4 durchgeführt werden
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
# Alle Versionen / Bundles:
|
||||
# (hb r1331/: ccm-ldn-subsite umbenannt nach ccm-subsite.)
|
||||
#ccm.upgrade.package=ccm-subsite
|
||||
#ccm.upgrade.from.version=6.6.0
|
||||
#ccm.upgrade.to.version=6.6.1
|
||||
|
||||
# Alle Versionen / Bundles:
|
||||
# (hb r1257/: ccm-ldn-navigation umbenannt nach ccm-navigation.)
|
||||
#ccm.upgrade.package=ccm-navigation
|
||||
|
|
|
|||
Loading…
Reference in New Issue