You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2011/03/03 18:03:07 UTC

svn commit: r1076683 - in /camel/trunk/components/camel-web: pom.xml src/main/webapp/WEB-INF/com/

Author: jstrachan
Date: Thu Mar  3 17:03:06 2011
New Revision: 1076683

URL: http://svn.apache.org/viewvc?rev=1076683&view=rev
Log:
upgraded camel-web to the latest greatest scalate release and removed old templates

Removed:
    camel/trunk/components/camel-web/src/main/webapp/WEB-INF/com/
Modified:
    camel/trunk/components/camel-web/pom.xml

Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1076683&r1=1076682&r2=1076683&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Thu Mar  3 17:03:06 2011
@@ -30,7 +30,7 @@
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
-        <scalate-version>1.3.1</scalate-version>
+        <scalate-version>1.4.1</scalate-version>
         <jersey-version>1.5</jersey-version>
         <logback-version>0.9.24</logback-version>
         <jetty-port>8080</jetty-port>
@@ -135,6 +135,13 @@
             <artifactId>scalate-core</artifactId>
             <version>${scalate-version}</version>
         </dependency>
+
+        <!-- even when pre-compiling the tempaltes this still seems to be a requirement - maybe can remove it later? -->
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+            <version>${scala-version}</version>
+        </dependency>
         <!--
             <dependency>
               <groupId>ch.qos.logback</groupId>
@@ -233,6 +240,20 @@
             </plugin>
 
             <plugin>
+                <groupId>org.fusesource.scalate</groupId>
+                <artifactId>maven-scalate-plugin</artifactId>
+                <version>${scalate-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>precompile</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty-version}</version>