From 8b5474a42ac36565d20625ac1f4c523825e195a2 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 3 Apr 2011 13:31:39 +0000 Subject: [PATCH] themedirector jetzt korriegiert, so dass in dem Standard Theme die Dateiliste wieder angezeigt wird. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Für Mandalay muss in den folgenden Dateien: fallback/admin-themes.xsl: xmlns:theme="http://ccm.redhat.com/london/theme/1.0" includes/theme/themeFile.xsl: xmlns:theme="http://ccm.redhat.com/london/theme/1.0" includes/theme/themeFileList.xsl: xmlns:theme="http://ccm.redhat.com/london/theme/1.0" includes/theme/themeErrorInfo.xsl: xmlns:theme="http://ccm.redhat.com/london/theme/1.0" includes/theme/themeFolder.xsl: xmlns:theme="http://ccm.redhat.com/london/theme/1.0" aus london/theme themedirector gemacht werden. git-svn-id: https://svn.libreccm.org/ccm/trunk@817 8810af33-2d31-482b-a856-94f89814c4df --- .../default/1.0.0-1.0.1/default-theme.sql | 0 .../upgrade/oracle-se-1.0.0-1.0.1.sql | 0 .../upgrade/oracle-se-1.0.1-1.0.2.sql | 0 .../upgrade/oracle-se-6.3.0-6.3.1.sql | 0 .../oracle-se/6.3.0-6.3.1/add-is_deleted.sql | 0 .../upgrade/postgres-1.0.0-1.0.1.sql | 0 .../upgrade/postgres-1.0.1-1.0.2.sql | 0 .../upgrade/postgres-6.3.0-6.3.1.sql | 0 .../1.0.1-1.0.2/date-to-timestamptz.sql | 0 .../postgres/6.3.0-6.3.1/add-is_deleted.sql | 0 .../upgrade/oracle-se-6.6.0-6.6.1.sql | 4 +-- .../upgrade/postgres-6.6.0-6.6.1.sql | 4 +-- .../themedirector/ThemeDirectorConstants.java | 36 ++++++++++--------- .../ui/ThemeXSLParameterGenerator.java | 9 +++-- .../themedirector/util/ManifestReader.java | 6 ++-- .../heirloom/apps/themedirector/xsl/index.xsl | 2 +- 16 files changed, 33 insertions(+), 28 deletions(-) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/default/1.0.0-1.0.1/default-theme.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/oracle-se-1.0.0-1.0.1.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/oracle-se-1.0.1-1.0.2.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/oracle-se-6.3.0-6.3.1.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/postgres-1.0.0-1.0.1.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/postgres-1.0.1-1.0.2.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/postgres-6.3.0-6.3.1.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql (100%) rename ccm-themedirector/sql/{ccm-themedirector => ccm-ldn-theme}/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql (100%) diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/default/1.0.0-1.0.1/default-theme.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/default/1.0.0-1.0.1/default-theme.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql similarity index 100% rename from ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql rename to ccm-themedirector/sql/ccm-ldn-theme/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql index 9f6fdb94b..4e916a1b4 100644 --- a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -18,5 +18,5 @@ -- $DateTime: 2011/03/27 23:15:09 $ -- $Id: oracle-se-6.6.0-6.6.1 pboy $ -@@ default/6.3.0-6.3.1/upd_theme_app_table.sql -@@ default/6.3.0-6.3.1/upd_system_tables.sql +@@ default/6.6.0-6.6.1/upd_theme_app_table.sql +@@ default/6.6.0-6.6.1/upd_system_tables.sql diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql index 6d66821db..ca750c91d 100644 --- a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql @@ -21,7 +21,7 @@ begin; -\i default/6.3.0-6.3.1/upd_theme_app_table.sql -\i default/6.3.0-6.3.1/upd_system_tables.sql +\i default/6.6.0-6.6.1/upd_theme_app_table.sql +\i default/6.6.0-6.6.1/upd_system_tables.sql commit; diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java index 90bd55d1f..abf43c8b2 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java @@ -24,32 +24,34 @@ package com.arsdigita.themedirector; */ public interface ThemeDirectorConstants { -// public final static String PROD_DIR_STUB = "themes-prod"; -// public final static String DEV_DIR_STUB = "themes-dev"; + /** Name of the base directory for all themes (usually themes) */ + public final static String THEMES_DIR = "themes"; + /** Name of the directory for production themes (sub-dir of THEMES_DIR) */ public final static String PROD_DIR_STUB = "published-themedir"; + /** Name of the directory for themes under development (sub-dir of THEMES_DIR) */ public final static String DEV_DIR_STUB = "devel-themedir"; - // TODO: it would be nice if this value in com.arsdigita.web.URL - // was public - // public final static String CCM_PREFIX = "__ccm__"; - public final static String CCM_PREFIX = "themes"; - public final static String WEB_APP_NAME = "ROOT"; - // The location of the sync jsp used to sync up the multiple servers. + public final static String PROD_THEMES_BASE_DIR = + THEMES_DIR + "/" + PROD_DIR_STUB+ "/"; + public final static String DEV_THEMES_BASE_DIR = + THEMES_DIR + "/" + DEV_DIR_STUB + "/"; + + // ccm-themedirector (formerly ccm-ldn-theme) is no longer installed in its + // own web context (ROOT or ccm-ldn-theme/ccm-themedirector) so it is not + // needed anymore. We we want to install it in its own context again, we + // should find a way to determin the context from a central configuration. + // public final static String WEB_APP_NAME = "ROOT"; + + /** The location of the sync jsp used to sync up the multiple servers. */ public final static String SYNC_JSP = "sync-theme.jsp"; - // This can be used to find the root webapp directory that is used - // by default for most of the applications in WAF + /** This can be used to find the root webapp directory that is used + by default for most of the applications in CCM */ public final static String ROOT_WEBAPP_PATH = "/ROOT"; - public final static String PROD_THEMES_BASE_DIR = - // CCM_PREFIX + "/" + PROD_DIR_STUB+ "/"; - "themes" + "/" + PROD_DIR_STUB+ "/"; - public final static String DEV_THEMES_BASE_DIR = - // CCM_PREFIX + "/" + DEV_DIR_STUB + "/"; - "themes" + "/" + DEV_DIR_STUB + "/"; public static final String THEME_XML_PREFIX = "theme:"; public final static String XML_NS = - "http://ccm.redhat.com/theme/1.0"; + "http://ccm.redhat.com/themedirector/1.0"; public final static String PREVIEW_PREFIX = "/theme"; diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java index a0460a723..392a83687 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java @@ -45,6 +45,7 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator, * stylesheets */ public String generateValue(HttpServletRequest request) { + String themeURL = InternalThemePrefixerServlet.getThemePreviewURL(request); @@ -74,12 +75,14 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator, if (themeURL != null) { // modified as ccm-ldn-theme is no longer installed in its own context - // return "/" + WEB_APP_NAME + "/" + CCM_PREFIX + "/" + - return "/" + CCM_PREFIX + "/" + + // return "/" + WEB_APP_NAME + "/" + THEMES_DIR + "/" + + // If we want to install it as a separate web application again we + // should find a way to determin the name from a central configuration + return "/" + THEMES_DIR + "/" + Web.getContext().getRequestURL().getContextPath() + baseDir + themeURL; } else { - // this means that there is not theme associated with the + // this means that there is no theme associated with the // given subsite, so we return the default theme themeURL = ThemeDirector.getConfig().getDefaultThemeContext() + diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java index 51320f8a8..b356dccf4 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java @@ -172,8 +172,7 @@ public abstract class ManifestReader implements ThemeDirectorConstants { /** * This provides a way for child classes to look for the resource - * in multiple places. By default, it only looks in the - * ServletContext + * in multiple places. By default, it only looks in the ServletContext */ protected InputStream getResourceAsStream(String line, String possibleServletContext) { @@ -196,7 +195,8 @@ public abstract class ManifestReader implements ThemeDirectorConstants { stream = Web.getServletContext().getContext(ROOT_WEBAPP_PATH) .getResourceAsStream(line); if (stream != null) { - setActualContext(line, Web.getServletContext().getContext(ROOT_WEBAPP_PATH)); + setActualContext(line, Web.getServletContext() + .getContext(ROOT_WEBAPP_PATH)); } } else { setActualContext(line, Web.getServletContext()); diff --git a/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl index 3ddead6b7..42ede51f8 100755 --- a/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl +++ b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl @@ -2,7 +2,7 @@