You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/01/23 01:01:34 UTC
svn commit: r1437241 - in /karaf/trunk/manual: pom.xml
src/main/webapp/WEB-INF/scalate/layouts/default.scaml
src/main/webapp/WEB-INF/scalate/layouts/print.ssp
Author: jbonofre
Date: Wed Jan 23 00:01:33 2013
New Revision: 1437241
URL: http://svn.apache.org/viewvc?rev=1437241&view=rev
Log:
[KARAF-2133] Fix version filtering in the manual title
Modified:
karaf/trunk/manual/pom.xml
karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1437241&r1=1437240&r2=1437241&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Wed Jan 23 00:01:33 2013
@@ -108,6 +108,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
<executions>
<execution>
<id>filter</id>
Modified: karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1437241&r1=1437240&r2=1437241&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Wed Jan 23 00:01:33 2013
@@ -17,7 +17,7 @@
-#
-@ var body: String
--@ var title : String = "Apache Karaf ${project.version} Guide"
+-@ var title : String = "Apache Karaf ${karaf.version} Guides"
- response.setContentType("text/html")
-# Only include the console if it's available and the engine is in dev mode.
Modified: karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp?rev=1437241&r1=1437240&r2=1437241&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp (original)
+++ karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp Wed Jan 23 00:01:33 2013
@@ -16,7 +16,7 @@ See the License for the specific languag
limitations under the License.
--%>
<%@ var body: String %>
-<%@ var title: String = "Apache Karaf ${karaf.version}" %>
+<%@ var title: String = "Apache Karaf ${karaf.version} Guides" %>
<% escapeMarkup = false %>
<!DOCTYPE html>
<html>