diff --git a/ccm-core/src/com/arsdigita/packaging/Loader.java b/ccm-core/src/com/arsdigita/packaging/Loader.java
index 756b7a86c..e8b146fdd 100755
--- a/ccm-core/src/com/arsdigita/packaging/Loader.java
+++ b/ccm-core/src/com/arsdigita/packaging/Loader.java
@@ -35,6 +35,7 @@ import com.arsdigita.runtime.Startup;
import com.arsdigita.util.Classes;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.parameter.ParameterReader;
+
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
@@ -43,6 +44,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import org.apache.log4j.Logger;
/**
@@ -131,8 +133,6 @@ class Loader {
}
}
- // deprecated:
- // public void loadData(Session ssn, ParameterLoader loader) {
public void loadData(Session ssn, ParameterReader prd) {
final List inits = m_info.getProvidedInitializers();
CompoundInitializer ini = new CompoundInitializer();
diff --git a/ccm-core/src/com/arsdigita/packaging/Unload.java b/ccm-core/src/com/arsdigita/packaging/Unload.java
index 540eb9004..32374d66e 100755
--- a/ccm-core/src/com/arsdigita/packaging/Unload.java
+++ b/ccm-core/src/com/arsdigita/packaging/Unload.java
@@ -20,15 +20,18 @@ package com.arsdigita.packaging;
import com.arsdigita.runtime.CCMResourceManager;
import com.arsdigita.util.Files;
+
import java.io.File;
import java.io.FileFilter;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+
import org.apache.log4j.Logger;
/**
@@ -43,7 +46,6 @@ class Unload extends Command {
private static final Logger logger = Logger.getLogger(Unload.class);
private static final Options OPTIONS = new Options();
-
static {
logger.debug("Static initalizer starting...");
OPTIONS.addOption
@@ -56,7 +58,6 @@ class Unload extends Command {
}
private static final Set EXCLUDE = new HashSet();
-
static {
logger.debug("Static initalizer starting...");
EXCLUDE.add("resin.conf");
diff --git a/ccm-ldn-dublin/application.xml b/ccm-ldn-dublin/application.xml
index 89a41dd03..129f3e112 100755
--- a/ccm-ldn-dublin/application.xml
+++ b/ccm-ldn-dublin/application.xml
@@ -8,8 +8,8 @@
+
-
diff --git a/ccm-ldn-types-esdservice/application.xml b/ccm-ldn-types-esdservice/application.xml
index d6f030814..f740a4d80 100755
--- a/ccm-ldn-types-esdservice/application.xml
+++ b/ccm-ldn-types-esdservice/application.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/ccm-ldn-types-esdservice/pdl/com/arsdigita/london/content-types/ESDService.pdl b/ccm-ldn-types-esdservice/pdl/com/arsdigita/london/contenttypes/ESDService.pdl
similarity index 100%
rename from ccm-ldn-types-esdservice/pdl/com/arsdigita/london/content-types/ESDService.pdl
rename to ccm-ldn-types-esdservice/pdl/com/arsdigita/london/contenttypes/ESDService.pdl
diff --git a/ccm-ldn-types-esdservice/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/ESDService.xml b/ccm-ldn-types-esdservice/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/ESDService.xml
index 83bb42ae0..0eeeeb641 100755
--- a/ccm-ldn-types-esdservice/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/ESDService.xml
+++ b/ccm-ldn-types-esdservice/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/ESDService.xml
@@ -1,8 +1,7 @@
-
+
-
+
diff --git a/ccm-ldn-userpreferences/src/com/arsdigita/london/userprefs/Initializer.java b/ccm-ldn-userpreferences/src/com/arsdigita/london/userprefs/Initializer.java
index 9df6de82e..5305a6184 100755
--- a/ccm-ldn-userpreferences/src/com/arsdigita/london/userprefs/Initializer.java
+++ b/ccm-ldn-userpreferences/src/com/arsdigita/london/userprefs/Initializer.java
@@ -35,10 +35,11 @@ public class Initializer extends CompoundInitializer {
add(new PDLInitializer
(new ManifestSource
- ("ccm-user-preferences.pdl.mf",
+ ("ccm-ldn-userpreferences.pdl.mf",
new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
}
+ @Override
public void init( DomainInitEvent evt ) {
PersistentUserPrefs.domainInit();
Pref.domainInit();
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql
index b57984d0b..788878ab6 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql
@@ -18,8 +18,6 @@
-- $Id: postgres-6.6.1-6.6.2.sql $
-- Navigation is now initialized as a legacy free type of application
--- NavigationDirectoryPortlet) to ccm-ldn-navigation because it depends on
--- navigation and was misplaced there (generating horizontal dependencies).
begin;
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 4c87c5df1..8270e070f 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -121,7 +121,6 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
themedirector.default_theme_context=
# themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
# ccm-auth-http application
auth.http.admin_email=webmaster@scientificcms.org
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 35e8c836b..b9ba5766e 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -31,23 +31,16 @@
-
-
-
-
-
-
-
@@ -62,36 +55,40 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
+
+ -->
@@ -101,6 +98,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -121,9 +129,9 @@
-
+ -->
@@ -165,13 +173,13 @@
-
+
-
+
@@ -180,7 +188,7 @@
-->
-
+
@@ -192,10 +200,6 @@
-->
-
-