From 906654b4602b56357fb732f2714a27c13165f635 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 2 Jul 2017 16:06:09 +0000 Subject: [PATCH] Moved saxon-6.5.5 from core to ldn-aplaws. It causes errors in Tomcat8 in some circumstances and will only used in old APLAWS installations. Marked UNUSED and has to be activated when needed. git-svn-id: https://svn.libreccm.org/ccm/trunk@4834 8810af33-2d31-482b-a856-94f89814c4df --- ccm-lcs-bundle/bundles/slimline/cfg/project.xml | 2 +- ccm-lcs-bundle/bundles/slimline/themes/master/dummy | 4 ---- .../web/WEB-INF/lib/saxon-6.5.5.jar.UNUSED | Bin 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 ccm-lcs-bundle/bundles/slimline/themes/master/dummy rename ccm-core/lib/saxon-6.5.5.jar => ccm-ldn-aplaws/web/WEB-INF/lib/saxon-6.5.5.jar.UNUSED (100%) diff --git a/ccm-lcs-bundle/bundles/slimline/cfg/project.xml b/ccm-lcs-bundle/bundles/slimline/cfg/project.xml index 11df48141..fbb8d9390 100644 --- a/ccm-lcs-bundle/bundles/slimline/cfg/project.xml +++ b/ccm-lcs-bundle/bundles/slimline/cfg/project.xml @@ -15,7 +15,7 @@ ccmVersion="6.1" name="LibreCMS-SL" prettyName="LibreCMS (Slimline Bundle)" - version="2.3.x" + version="2.3.99" release="trunk-r4792" webxml="libre-web.xml" webapp="ROOT" diff --git a/ccm-lcs-bundle/bundles/slimline/themes/master/dummy b/ccm-lcs-bundle/bundles/slimline/themes/master/dummy deleted file mode 100644 index 29e760753..000000000 --- a/ccm-lcs-bundle/bundles/slimline/themes/master/dummy +++ /dev/null @@ -1,4 +0,0 @@ -Just a dummy file as a placeholder. This directory may contain theme files -which are used by themedirector for download a base theme to be further -customized by a site designer. If it should be used this way, ccm-themedirector -must be configured appropriately \ No newline at end of file diff --git a/ccm-core/lib/saxon-6.5.5.jar b/ccm-ldn-aplaws/web/WEB-INF/lib/saxon-6.5.5.jar.UNUSED similarity index 100% rename from ccm-core/lib/saxon-6.5.5.jar rename to ccm-ldn-aplaws/web/WEB-INF/lib/saxon-6.5.5.jar.UNUSED