Index: src/assemble/jetty.xml
===================================================================
--- src/assemble/jetty.xml	(revision 0)
+++ src/assemble/jetty.xml	(revision 0)
@@ -0,0 +1,45 @@
+<!--
+ *
+ * Copyright 2007, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<assembly>
+  <id>${xwiki.db}</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <files>
+    <file>
+      <source>${basedir}/target/maven-shared-archive-resources/hibernate.cfg.xml</source>
+      <outputDirectory>WEB-INF/</outputDirectory>
+    </file>
+    <file>
+      <source>${basedir}/target/maven-shared-archive-resources/xwiki.cfg</source>
+      <outputDirectory>WEB-INF/</outputDirectory>
+    </file>
+    <file>
+      <source>${basedir}/src/main/resources/version.properties</source>
+      <outputDirectory>WEB-INF/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
+</assembly>
+    

Property changes on: src/assemble/jetty.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Index: pom.xml
===================================================================
--- pom.xml	(revision 3940)
+++ pom.xml	(working copy)
@@ -52,40 +52,85 @@
           </resourceBundles>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/assemble/war.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!-- Run 'mvn org.mortbay.jetty:maven-jetty-plugin:run-war' to generate the WAR and
-             execute it in Jetty. Useful for testing
-             Note: You'll need a database set up and running. If you use the HSQLDB profile
-             the database is looked for in database/ so it's very likely you'll get an
-             empty wiki. You'll need to import some pages in it using a XAR for example. -->
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <contextPath>/xwiki</contextPath>
-          <webApp>${project.build.directory}/${project.build.finalName}-${xwiki.db}.war</webApp>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <profiles>
     <profile>
+      <id>war</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <descriptors>
+                <descriptor>src/assemble/war.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>jettyrun</id>
+      <properties>
+        <assemblewhat>jetty.xml</assemblewhat>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <descriptors>
+                <descriptor>src/assemble/jetty.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>compile</phase>
+                <goals>
+                  <goal>directory</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <!-- Run 'mvn install -Pjettyrun' to execute xwiki in Jetty. Useful for testing.
+                 Note: You'll need a database set up and running. If you use the HSQLDB profile
+                 the database is looked for in database/ so it's very likely you'll get an
+                 empty wiki. You'll need to import some pages in it using a XAR for example. -->
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>maven-jetty-plugin</artifactId>
+            <configuration>
+              <contextPath>/xwiki</contextPath>
+              <classesDirectory>${project.build.directory}/${project.build.finalName}-${xwiki.db}.dir/WEB-INF</classesDirectory>
+              <webApp>${project.build.directory}/${project.build.finalName}-${xwiki.db}.war</webApp>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>ci</id>
       <activation>
         <property>