From 503263eeb224124113bb67592320d0a06fe788ac Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 22 May 2014 22:15:34 +0000
Subject: [PATCH] Fixed bug in web.xml's (missing surrounding <jsp-config>),
 fixed bug in mandalay (#2076 )

git-svn-id: https://svn.libreccm.org/ccm/trunk@2645 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle/bundles/base/cfg/web-ccm.xml        | 18 ++++++++++--------
 ccm-bundle/bundles/demo/cfg/web-ccm.xml        | 18 ++++++++++--------
 ccm-bundle/bundles/devel/cfg/web-ccm.xml       | 18 ++++++++++--------
 ccm-bundle/bundles/standard/cfg/web-ccm.xml    | 18 ++++++++++--------
 ccm-ldn-aplaws/bundles/base/cfg/web.xml        | 18 ++++++++++--------
 ccm-ldn-aplaws/bundles/complete/cfg/web.xml    | 18 ++++++++++--------
 ccm-ldn-aplaws/bundles/demo/cfg/web.xml        | 18 ++++++++++--------
 ccm-ldn-aplaws/bundles/devel/cfg/web.xml       | 18 ++++++++++--------
 ccm-ldn-aplaws/bundles/standard/cfg/web.xml    | 18 ++++++++++--------
 ccm-sci-bundle/bundles/base/cfg/web-sci.xml    | 18 ++++++++++--------
 ccm-sci-bundle/bundles/demo/cfg/web-sci.xml    | 18 ++++++++++--------
 ccm-sci-bundle/bundles/devel/cfg/web-sci.xml   | 18 ++++++++++--------
 .../bundles/standard/cfg/web-sci.xml           | 18 ++++++++++--------
 .../types/SciPublications/CollectedVolume.xsl  |  2 ++
 .../types/SciPublications/Expertise.xsl        |  2 +-
 15 files changed, 133 insertions(+), 105 deletions(-)

diff --git a/ccm-bundle/bundles/base/cfg/web-ccm.xml b/ccm-bundle/bundles/base/cfg/web-ccm.xml
index fd3f469d1..09b706eb5 100644
--- a/ccm-bundle/bundles/base/cfg/web-ccm.xml
+++ b/ccm-bundle/bundles/base/cfg/web-ccm.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-bundle/bundles/demo/cfg/web-ccm.xml b/ccm-bundle/bundles/demo/cfg/web-ccm.xml
index fd3f469d1..09b706eb5 100644
--- a/ccm-bundle/bundles/demo/cfg/web-ccm.xml
+++ b/ccm-bundle/bundles/demo/cfg/web-ccm.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-bundle/bundles/devel/cfg/web-ccm.xml b/ccm-bundle/bundles/devel/cfg/web-ccm.xml
index 44bc11423..c007093d5 100644
--- a/ccm-bundle/bundles/devel/cfg/web-ccm.xml
+++ b/ccm-bundle/bundles/devel/cfg/web-ccm.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-bundle/bundles/standard/cfg/web-ccm.xml b/ccm-bundle/bundles/standard/cfg/web-ccm.xml
index fd3f469d1..09b706eb5 100644
--- a/ccm-bundle/bundles/standard/cfg/web-ccm.xml
+++ b/ccm-bundle/bundles/standard/cfg/web-ccm.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-ldn-aplaws/bundles/base/cfg/web.xml b/ccm-ldn-aplaws/bundles/base/cfg/web.xml
index ba84d532a..1069b45d4 100755
--- a/ccm-ldn-aplaws/bundles/base/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/base/cfg/web.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
index ba84d532a..1069b45d4 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index 80b5967e8..0aba6cd71 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -549,14 +549,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index ba84d532a..1069b45d4 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index ba84d532a..1069b45d4 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -578,14 +578,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-sci-bundle/bundles/base/cfg/web-sci.xml b/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
index 21310b174..07aec2f11 100644
--- a/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
@@ -523,14 +523,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
index 21310b174..07aec2f11 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
@@ -523,14 +523,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
index 27961f12b..5a18481ea 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
@@ -530,14 +530,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
index 85712b67a..2263f4d99 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
@@ -522,14 +522,16 @@
      TAG LIBS
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+    </taglib>
 
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+      <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 
 </web-app>
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
index b9cd8a68b..a098eb337 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
@@ -230,6 +230,7 @@
                 <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>
+<!--
         <xsl:variable name="setArticles">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'"/>
@@ -237,6 +238,7 @@
                 <xsl:with-param name="default" select="'true'"/>
             </xsl:call-template>
         </xsl:variable>
+-->
         <xsl:variable name="setYearFirstPublished">
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
index d5f48c012..446246081 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
@@ -185,7 +185,7 @@
             <xsl:call-template name="mandalay:getSetting">
                 <xsl:with-param name="module" select="'SciPublications'" />
                 <xsl:with-param name="setting" select="'expertise/setSeriesVolume'" />
-                <xsl:with-param name="setting" select="'true'" />
+                <xsl:with-param name="default" select="'true'" />
             </xsl:call-template>
         </xsl:variable>    
         <xsl:variable name="setUrl">