You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/10/22 16:08:16 UTC
svn commit: r1026335 - in /servicemix/documentation/trunk: pom.xml
src/main/webapp/WEB-INF/scalate/layouts/default.ssp
Author: gertv
Date: Fri Oct 22 14:08:16 2010
New Revision: 1026335
URL: http://svn.apache.org/viewvc?rev=1026335&view=rev
Log:
Improve mvn jetty:run for viewing live website while editing
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1026335&r1=1026334&r2=1026335&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Fri Oct 22 14:08:16 2010
@@ -37,14 +37,18 @@
<properties>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+
<jetty-port>8080</jetty-port>
- <jetty-war-dir>${basedir}/target/webapp/</jetty-war-dir>
- <karaf.version>2.1.99-SNAPSHOT</karaf.version>
+
+ <webapp.srcdir>${project.basedir}/src/main/webapp</webapp.srcdir>
+ <webapp.dir>${project.build.directory}/webapp</webapp.dir>
+
<maven.wagon.version>1.0-beta-6</maven.wagon.version>
<scalate.version>1.4-SNAPSHOT</scalate.version>
- <scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
+
+ <karaf.version>2.1.99-SNAPSHOT</karaf.version>
<servicemix.version>4.3.0-SNAPSHOT</servicemix.version>
</properties>
@@ -152,10 +156,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/webapp</outputDirectory>
+ <outputDirectory>${webapp.dir}</outputDirectory>
<resources>
<resource>
- <directory>src/main/webapp</directory>
+ <directory>${webapp.srcdir}</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -174,12 +178,12 @@
</goals>
<phase>prepare-package</phase>
<configuration>
- <warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
+ <warSourceDirectory>${webapp.dir}</warSourceDirectory>
</configuration>
</execution>
</executions>
<configuration>
- <warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
+ <warSourceDirectory>${webapp.dir}</warSourceDirectory>
<remoteServerId>people.apache.org</remoteServerId>
<remoteServerUrl>scp://people.apache.org/www/servicemix.apache.org/docs/${servicemix.version}</remoteServerUrl>
</configuration>
@@ -195,29 +199,27 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
<configuration>
- <warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
+ <warSourceDirectory>${webapp.dir}</warSourceDirectory>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.1.5.v20100705</version>
<configuration>
- <!-- When editing the conf files, you can comment this line to run
- mvn jetty:run
- to have a live web site
- -->
- <webAppSourceDirectory>${jetty-war-dir}</webAppSourceDirectory>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+ <baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection">
+ <resources>${webapp.srcdir},${webapp.dir}</resources>
+ </baseResource>
+ </webAppConfig>
<systemProperties>
<systemProperty>
- <name>scalate.editor</name>
- <value>${scalate.editor}</value>
- </systemProperty>
- <systemProperty>
<name>scalate.workdir</name>
<value>${scalate.workdir}</value>
</systemProperty>
@@ -232,6 +234,7 @@
</systemProperties>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -277,7 +280,7 @@
<goals>
<goal>run</goal>
</goals>
- <phase>verify</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -313,17 +316,7 @@
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>live</id>
- <properties>
- <jetty-war-dir>${basedir}/src/main/webapp/</jetty-war-dir>
- <scalate.mode>development</scalate.mode>
- </properties>
- </profile>
- </profiles>
-
+
<!-- Scalate snapshots -->
<repositories>
<repository>
Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1026335&r1=1026334&r2=1026335&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp Fri Oct 22 14:08:16 2010
@@ -50,8 +50,6 @@ limitations under the License.
${title}
</header>
-
-
<div id="main">
<% if (navigation) { %>
<nav>