[KARAF-2133] Fix version filtering in the manual title git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1437266 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/854d1f55 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/854d1f55 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/854d1f55 Branch: refs/heads/master Commit: 854d1f55e9ac06926facbe274693448ca956de2c Parents: 1db89f7 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Jan 23 03:36:39 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Jan 23 03:36:39 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-cave/blob/854d1f55/manual/pom.xml ---------------------------------------------------------------------- diff --git a/manual/pom.xml b/manual/pom.xml index f0884d7..4048b3f 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> @@ -169,7 +175,7 @@ <artifactId>jetty-maven-plugin</artifactId> <version>7.1.5.v20100705</version> <configuration> - <webAppSourceDirectory>${basedir}/src/main/webapp</webAppSourceDirectory> + <webAppSourceDirectory>${project.build.directory}/webapp/</webAppSourceDirectory> <systemProperties> <systemProperty> <name>scalate.editor</name> http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/854d1f55/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 bdebb26..4ac4cca 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 Cave ${cave.version} Guide" +-@ var title : String = "Apache Karaf Cave ${cave.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-cave/blob/854d1f55/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 b14ae8c..d2c427f 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 Cave ${cave.version}" %> +<%@ var title: String = "Apache Karaf Cave ${cave.version} Guides" %> <% escapeMarkup = false %> <!DOCTYPE html> <html>
