LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
pb 2014-05-22 22:15:34 +00:00
parent 7dd986442b
commit 503263eeb2
15 changed files with 133 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ccm-bundle/bundles/base/cfg/web-ccm.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-bundle/bundles/demo/cfg/web-ccm.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-bundle/bundles/devel/cfg/web-ccm.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-bundle/bundles/standard/cfg/web-ccm.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-ldn-aplaws/bundles/base/cfg/web.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-ldn-aplaws/bundles/complete/cfg/web.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-ldn-aplaws/bundles/demo/cfg/web.xml
View File

@ -549,14 +549,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-ldn-aplaws/bundles/devel/cfg/web.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-ldn-aplaws/bundles/standard/cfg/web.xml
View File

@ -578,14 +578,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-sci-bundle/bundles/base/cfg/web-sci.xml
View File

@ -523,14 +523,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
View File

@ -523,14 +523,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
View File

@ -530,14 +530,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

18
ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
View File

@ -522,14 +522,16 @@
TAG LIBS TAG LIBS
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<taglib> <jsp-config>
<taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> <taglib>
<taglib-location>/WEB-INF/bebop-show.tld</taglib-location> <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
</taglib> <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
</taglib>
<taglib> <taglib>
<taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
<taglib-location>/WEB-INF/bebop-define.tld</taglib-location> <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
</taglib> </taglib>
</jsp-config>
</web-app> </web-app>

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/CollectedVolume.xsl
View File

@ -230,6 +230,7 @@
<xsl:with-param name="default" select="'true'" /> <xsl:with-param name="default" select="'true'" />
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<!--
<xsl:variable name="setArticles"> <xsl:variable name="setArticles">
<xsl:call-template name="mandalay:getSetting"> <xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciPublications'"/> <xsl:with-param name="module" select="'SciPublications'"/>
@ -237,6 +238,7 @@
<xsl:with-param name="default" select="'true'"/> <xsl:with-param name="default" select="'true'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
-->
<xsl:variable name="setYearFirstPublished"> <xsl:variable name="setYearFirstPublished">
<xsl:call-template name="mandalay:getSetting"> <xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciPublications'" /> <xsl:with-param name="module" select="'SciPublications'" />

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Expertise.xsl
View File

@ -185,7 +185,7 @@
<xsl:call-template name="mandalay:getSetting"> <xsl:call-template name="mandalay:getSetting">
<xsl:with-param name="module" select="'SciPublications'" /> <xsl:with-param name="module" select="'SciPublications'" />
<xsl:with-param name="setting" select="'expertise/setSeriesVolume'" /> <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:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="setUrl"> <xsl:variable name="setUrl">