diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.java
index 27ae47dba..a7237f914 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.java
@@ -48,7 +48,7 @@ public class LegacyCategoryBrowserApplication extends Application {
private DocFolder m_root = null;
/**
- * Retreives a repository from the database usings its OID.
+ * Retrieves a repository from the database usings its OID.
*
* @param oid the OID of the repository
*/
diff --git a/ccm-forum/src/ccm-forum.upgrade b/ccm-forum/src/ccm-forum.upgrade
index 6076232f8..c0bad59be 100755
--- a/ccm-forum/src/ccm-forum.upgrade
+++ b/ccm-forum/src/ccm-forum.upgrade
@@ -9,10 +9,10 @@
-
+
-
+
diff --git a/ccm-forum/src/com/arsdigita/forum/upgrade/CreateGroupsAndPortletType.java b/ccm-forum/src/com/arsdigita/forum/upgrade/CreateGroupsAndPortletType.java
index f956ba889..e74c7664c 100644
--- a/ccm-forum/src/com/arsdigita/forum/upgrade/CreateGroupsAndPortletType.java
+++ b/ccm-forum/src/com/arsdigita/forum/upgrade/CreateGroupsAndPortletType.java
@@ -89,7 +89,7 @@ public class CreateGroupsAndPortletType extends Program {
}.run();
}
- public static final void main(final String[] args) {
+ public static void main(final String[] args) {
new CreateGroupsAndPortletType().run(args);
}
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
index b5c7fea67..66d860d7a 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -266,10 +266,20 @@ public class Loader extends PackageLoader {
registerDomain(customNavKey, "/content/", customNavUseContext);
// Switch /portal/ to use 1 column layout for funky aplaws stuff.
+ // pboy: This will have no effect at all. A portal page created at
+ // url /portal/ (and beneath) will always use the homepage jsp's which
+ // are hardcoded to create a three column design and ignore any
+ // column configuration. All portal pages at other urls are not
+ // affect by this setting which touches only the one application (portal)
+ // at url /portal/. Portal pages at other urls use the corresponding
+ // configuration parameter for its initial value and number of columns
+ // may be modified at any time using configuration ui.
+ /*
Workspace portal = (Workspace)Application
.retrieveApplicationForPath("/portal/");
portal.setDefaultLayout(PageLayout
.findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));
+ */
}
public void registerServicesTemplate(String appURL) {
@@ -283,7 +293,8 @@ public class Loader extends PackageLoader {
"APLAWS ESD Toolkit Services",
"/packages/navigation/templates/aplaws-services.jsp");
- new TemplateMapping( template, root, Template.DEFAULT_DISPATCHER_CONTEXT, Template.DEFAULT_USE_CONTEXT );
+ new TemplateMapping( template, root, Template.DEFAULT_DISPATCHER_CONTEXT,
+ Template.DEFAULT_USE_CONTEXT );
}
public void registerPortalTemplate() {
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/head.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/head.xsl
index d92c8db7e..4eacbf3dc 100755
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/head.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/head.xsl
@@ -23,6 +23,10 @@
+
diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
index bc0f67c8a..aa5b2e89c 100755
--- a/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
@@ -42,6 +42,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
new KernelExcursion() {
public void excurse() {
setEffectiveParty(Kernel.getSystemParty());
+
setupThemeDirector();
}
}.run();
@@ -49,7 +50,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
/**
- * Creates theme manager as a legacy-free application type.
+ * Creates theme director as a legacy-free application type.
*
* NOTE: The wording in the title parameter of ApplicationType determines
* the name of the subdirectory for the XSL stylesheets.
@@ -63,13 +64,6 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
*/
private void setupThemeDirector() {
- // create application type
- // legacy compatible style of creation
- // ApplicationType type = ApplicationType.createApplicationType(
- // "themedirector",
- // "CCM Themes Administration",
- // ThemeDirector.BASE_DATA_OBJECT_TYPE);
- // EXPERIMENTAL legacy free style of creation
ApplicationType type =
new ApplicationType( "Theme Director",
ThemeDirector.BASE_DATA_OBJECT_TYPE );
@@ -78,7 +72,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
Application admin = Application.retrieveApplicationForPath("/admin/");
- // create application instance as a legacy compatible app
+ // create application instance as a legacy free app.
// Whether a legacy compatible or a legacy free application is
// created depends on the type of ApplicationType above. No need to
// modify anything here
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index b94594323..c21a12e86 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -53,7 +53,8 @@ import java.util.Iterator;
import java.util.Set;
/**
- * Loader.
+ *
Loader executes nonrecurring at install time and loads (installs and
+ * initializes) the APLAWS integration module persistently into database.