[KARAF-2133] Fix version filtering in the manual title git-svn-id: https://svn.apache.org/repos/asf/karaf/eik/trunk@1437633 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-eik/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-eik/commit/05e5d7dc Tree: http://git-wip-us.apache.org/repos/asf/karaf-eik/tree/05e5d7dc Diff: http://git-wip-us.apache.org/repos/asf/karaf-eik/diff/05e5d7dc Branch: refs/heads/master Commit: 05e5d7dce798892844217f525d66c26d8043e922 Parents: 312991c Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Jan 23 19:10:14 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Jan 23 19:10:14 2013 +0000 ---------------------------------------------------------------------- manual/pom.xml | 8 +++++++- manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade | 2 +- manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade | 2 +- manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/05e5d7dc/manual/pom.xml ---------------------------------------------------------------------- diff --git a/manual/pom.xml b/manual/pom.xml index 47a81d1..180fad9 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -69,6 +69,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> @@ -143,7 +149,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-eik/blob/05e5d7dc/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade index 2d29fea..ee5f39a 100644 --- a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade +++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade @@ -13,7 +13,7 @@ -# See the License for the specific language governing permissions and -# limitations under the License. -@ var body: String --@ var title : String = "Apache Karaf EIK ${eik.version}" +-@ var title : String = "Apache Karaf EIK ${eik.version} Guides" - layout("/WEB-INF/scalate/layouts/headers.jade") body http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/05e5d7dc/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade b/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade index e26f3e7..ed76a3b 100644 --- a/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade +++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade @@ -13,7 +13,7 @@ -# See the License for the specific language governing permissions and -# limitations under the License. -@ var body: String --@ var title : String = "Apache Karaf EIK ${eik.version}" +-@ var title : String = "Apache Karaf EIK ${eik.version} Guides" - response.setContentType("text/html") http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/05e5d7dc/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade index d3ae69d..18b5831 100644 --- a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade +++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade @@ -13,7 +13,7 @@ -# See the License for the specific language governing permissions and -# limitations under the License. -@ var body: String --@ var title: String = "Apache Karaf EIK ${eik.version}" +-@ var title: String = "Apache Karaf EIK ${eik.version} Guides" -@ var css : String = load("/css/print.css") html
