karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1437266 - in /karaf/cave/trunk/manual: pom.xml src/main/webapp/WEB-INF/scalate/layouts/default.scaml src/main/webapp/WEB-INF/scalate/layouts/print.ssp
Date Wed, 23 Jan 2013 03:36:40 GMT
Author: jbonofre
Date: Wed Jan 23 03:36:39 2013
New Revision: 1437266

URL: http://svn.apache.org/viewvc?rev=1437266&view=rev
Log:
[KARAF-2133] Fix version filtering in the manual title

Modified:
    karaf/cave/trunk/manual/pom.xml
    karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
    karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp

Modified: karaf/cave/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/pom.xml?rev=1437266&r1=1437265&r2=1437266&view=diff
==============================================================================
--- karaf/cave/trunk/manual/pom.xml (original)
+++ karaf/cave/trunk/manual/pom.xml Wed Jan 23 03:36:39 2013
@@ -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>

Modified: karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1437266&r1=1437265&r2=1437266&view=diff
==============================================================================
--- karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Wed Jan
23 03:36:39 2013
@@ -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.

Modified: karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp?rev=1437266&r1=1437265&r2=1437266&view=diff
==============================================================================
--- karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp (original)
+++ karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp Wed Jan 23 03:36:39
2013
@@ -16,7 +16,7 @@ See the License for the specific languag
 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>



Mime
View raw message