From 11a215ddd00a37e061b192c0da34cf09ea7969de Mon Sep 17 00:00:00 2001
From: Pablo Lalloni <plalloni@gmail.com>
Date: Sat, 12 Nov 2011 21:59:34 -0300
Subject: [PATCH] Configure jetty-maven-plugin, build final name, wtp context
 path.

Add project name to maven pom.

Configure maven-eclipse-plugin wtp contextpath to "plantuml" for running
from eclipse embedded servers.

Add jetty-maven-plugin to maven pom allowing to run the webapp by
executing jetty:run-exploded or jetty:run-war maven goals.

Downgrade servlet-api dependency version to 2.4 to match web.xml
setting.

Remove development "leaked" dependency on jersey-server.

Changed maven build final name to produce "plantuml.war" as the previous
ant build.
---
 pom.xml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index b928ce2..6ed5b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,16 @@
 	<groupId>org.sourceforge.plantuml</groupId>
 	<artifactId>plantumlservlet</artifactId>
 	<version>1-SNAPSHOT</version>
+	<name>PlantUML Servlet</name>
 	<packaging>war</packaging>
 	<build>
+		<finalName>plantuml</finalName>
 		<plugins>
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<configuration>
 					<wtpversion>1.5</wtpversion>
+					<wtpContextName>plantuml</wtpContextName>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -20,8 +23,22 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jetty.version}</version>
+				<configuration>
+					<scanIntervalSeconds>5</scanIntervalSeconds>
+					<webApp>
+						<contextPath>/plantuml</contextPath>
+					</webApp>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+	<properties>
+		<jetty.version>8.0.4.v20111024</jetty.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>net.sourceforge.plantuml</groupId>
@@ -36,7 +53,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<version>2.4</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -60,7 +77,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
 			<artifactId>jetty-all</artifactId>
-			<version>7.5.4.v20111024</version>
+			<version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -69,11 +86,5 @@
 			<version>2.1.v20100127</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-server</artifactId>
-			<version>1.10</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>