diff --git a/ccm-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-bundle/src/com/arsdigita/bundle/Loader.java index 5925e3e05..4fc32e38c 100644 --- a/ccm-bundle/src/com/arsdigita/bundle/Loader.java +++ b/ccm-bundle/src/com/arsdigita/bundle/Loader.java @@ -115,7 +115,7 @@ public class Loader extends PackageLoader { private Parameter m_domainMappings = new StringArrayParameter( "com.arsdigita.bundle.loader.domain_mappings", Parameter.REQUIRED,new String[]{ "STD-NAV:/navigation/", - "STD-NAV:/content/", + "STD-NAV:/main/", "STD-NAV:/portal/" } ); diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java index 5054d4520..8cadfc4de 100755 --- a/ccm-cms/src/com/arsdigita/cms/Loader.java +++ b/ccm-cms/src/com/arsdigita/cms/Loader.java @@ -99,7 +99,7 @@ public class Loader extends PackageLoader { private final Parameter m_contentSectionNames = new StringArrayParameter( "com.arsdigita.cms.loader.section_names", Parameter.REQUIRED, - new String[]{"content"}); + new String[]{"main"}); // /////////////////////////////////////////////////////////////////// // Configurable parameters during load step END. // /////////////////////////////////////////////////////////////////// diff --git a/ccm-ldn-search/sql/ccm-ldn-search/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-ldn-search/sql/ccm-ldn-search/upgrade/postgres-6.6.1-6.6.2.sql index 6614dda79..a9d276fdc 100644 --- a/ccm-ldn-search/sql/ccm-ldn-search/upgrade/postgres-6.6.1-6.6.2.sql +++ b/ccm-ldn-search/sql/ccm-ldn-search/upgrade/postgres-6.6.1-6.6.2.sql @@ -20,7 +20,7 @@ \echo Red Hat Enterprise ccm-ldn-search 6.6.1 -> 6.6.2 Upgrade Script (PostgreSQL) begin; - +begin \i default/6.6.1-6.6.2/set_singleton.sql commit; diff --git a/ccm-sci-bundle/bundles/standard/cfg/project.xml b/ccm-sci-bundle/bundles/standard/cfg/project.xml index 63857792e..0811db5c5 100644 --- a/ccm-sci-bundle/bundles/standard/cfg/project.xml +++ b/ccm-sci-bundle/bundles/standard/cfg/project.xml @@ -8,8 +8,8 @@ ccmVersion="6.1" name="scientificcms" prettyName="Scientific CMS" - version="2-1-0" - release="SNAPSHOT-r2151" + version="2.1.0" + release="SNAPSHOT-r2164" webxml="web-sci.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java index 7fc8bd622..3269c769c 100644 --- a/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java +++ b/ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java @@ -119,7 +119,7 @@ public class Loader extends PackageLoader { private Parameter m_domainMappings = new StringArrayParameter( "com.arsdigita.bundle.loader.domain_mappings", Parameter.REQUIRED,new String[]{ "STD-NAV:/navigation/", - "STD-NAV:/content/", + "STD-NAV:/main/", "STD-NAV:/portal/" } ); // /////////////////////////////////////////////////////////////////////////////