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/12/18 13:29:54 UTC
[03/50] git commit: [KARAF-2133] Fix version filtering in the manual
title
[KARAF-2133] Fix version filtering in the manual title
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1437264 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/d4261cb2
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/d4261cb2
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/d4261cb2
Branch: refs/heads/cellar-2.2.x
Commit: d4261cb2e773e7eba2fc04cc100516edbf230c0a
Parents: 1680a24
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Jan 23 03:20:34 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Jan 23 03:20:34 2013 +0000
----------------------------------------------------------------------
manual/pom.xml | 8 +++++++-
manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml | 2 +-
manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/d4261cb2/manual/pom.xml
----------------------------------------------------------------------
diff --git a/manual/pom.xml b/manual/pom.xml
index 6019294..6fe8811 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -68,6 +68,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>
@@ -174,7 +180,7 @@
mvn jetty:run
to have a live web site
-->
- <webAppSourceDirectory>${basedir}/src/main/webapp</webAppSourceDirectory>
+ <webAppSourceDirectory>${project.build.directory}/webapp/</webAppSourceDirectory>
<systemProperties>
<systemProperty>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/d4261cb2/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
index 3b2080b..5a2e236 100644
--- a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
+++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
@@ -17,7 +17,7 @@
-#
-@ var body: String
--@ var title : String = "Apache Karaf Cellar ${cellar.version} Guide"
+-@ var title : String = "Apache Karaf Cellar ${cellar.version} Guides"
- response.setContentType("text/html")
-# Only include the console if it's available and the engine is in dev mode.
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/d4261cb2/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
index 29272a8..42202ba 100644
--- a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
+++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ var body: String %>
-<%@ var title: String = "Apache Karaf Cellar ${cellar.version}" %>
+<%@ var title: String = "Apache Karaf Cellar ${cellar.version} Guides" %>
<% escapeMarkup = false %>
<!DOCTYPE html>
<html>