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 20:10:15 UTC
svn commit: r1437633 - in /karaf/eik/trunk/manual: pom.xml
src/main/webapp/WEB-INF/scalate/layouts/default.jade
src/main/webapp/WEB-INF/scalate/layouts/headers.jade
src/main/webapp/WEB-INF/scalate/layouts/print.jade
Author: jbonofre
Date: Wed Jan 23 19:10:14 2013
New Revision: 1437633
URL: http://svn.apache.org/viewvc?rev=1437633&view=rev
Log:
[KARAF-2133] Fix version filtering in the manual title
Modified:
karaf/eik/trunk/manual/pom.xml
karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade
karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade
Modified: karaf/eik/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/pom.xml?rev=1437633&r1=1437632&r2=1437633&view=diff
==============================================================================
--- karaf/eik/trunk/manual/pom.xml (original)
+++ karaf/eik/trunk/manual/pom.xml Wed Jan 23 19:10:14 2013
@@ -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>
Modified: karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade?rev=1437633&r1=1437632&r2=1437633&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade (original)
+++ karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.jade Wed Jan 23 19:10:14 2013
@@ -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
Modified: karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade?rev=1437633&r1=1437632&r2=1437633&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade (original)
+++ karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/headers.jade Wed Jan 23 19:10:14 2013
@@ -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")
Modified: karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade?rev=1437633&r1=1437632&r2=1437633&view=diff
==============================================================================
--- karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade (original)
+++ karaf/eik/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.jade Wed Jan 23 19:10:14 2013
@@ -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