From a572a55ba73b0efe1094edb11f854a324ffc5a93 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 30 Aug 2005 17:22:04 +0000
Subject: [PATCH] MPJETTY-2: Allow JSP compilation by adding tools.jar to the
 jetty execution classpath

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@264817 13f79535-47bb-0310-9956-ffa450edef68
---
 jetty/announcements/1.0.ann | 22 ----------------------
 jetty/plugin.jelly          |  3 ++-
 jetty/xdocs/changes.xml     |  5 ++++-
 3 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 jetty/announcements/1.0.ann

diff --git a/jetty/announcements/1.0.ann b/jetty/announcements/1.0.ann
deleted file mode 100644
index b6a167f3..00000000
--- a/jetty/announcements/1.0.ann
+++ /dev/null
@@ -1,22 +0,0 @@
-The Maven team is pleased to announce the Jetty plugin 1.0 release!
-
-http://maven.apache.org/reference/plugins/jetty
-
-The Maven Jetty plugin allows easy deployment and execution of Jetty.
-
-Features in this version includes:
-
-o Ability to automatically generate the Jetty XML configuration file
-o Ability to start Jetty
-o Deployment of WAR defined as dependencies and tagged with the 
-  jetty.bundle property
-o Deployment of the current project if it's a WAR project
-
-Note that this plugin has been tested with Maven 1.0-rc2. Using it with
-another version of Maven is at your own risks! :-)
-
-You can download the Jetty Maven plugin here:
-http://www.ibiblio.org/maven/maven/jars/maven-jetty-plugin-1.0.jar
-
-Have fun!
--Vincent
\ No newline at end of file
diff --git a/jetty/plugin.jelly b/jetty/plugin.jelly
index 8c375f0b..56eea4cc 100644
--- a/jetty/plugin.jelly
+++ b/jetty/plugin.jelly
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,6 +109,7 @@
         <ant:pathelement location="${plugin.getDependencyPath('servletapi:servletapi')}"/>
         <ant:pathelement location="${plugin.getDependencyPath('tomcat:jasper-compiler')}"/>
         <ant:pathelement location="${plugin.getDependencyPath('tomcat:jasper-runtime')}"/>
+        <ant:pathelement location="${tools.jar}"/>
       </ant:classpath>
     </ant:java>
 
diff --git a/jetty/xdocs/changes.xml b/jetty/xdocs/changes.xml
index ba98b713..dc24c54d 100644
--- a/jetty/xdocs/changes.xml
+++ b/jetty/xdocs/changes.xml
@@ -24,7 +24,10 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
-    <release version="1.2-SNAPSHOT" date="in CVS">
+    <release version="1.2-SNAPSHOT" date="in SVN">
+      <action dev="vmassol" type="fix" due-to="Peter Ryan" issue="MPJETTY-2">
+        Added tools.jar to the Jetty execution classpath to support JSP compilation.
+      </action>
       <action dev="vmassol" type="update" due-to="Adam Fisk" issue="MPJETTY-4">
         Upgraded dependency to Jasper Compiler and Runtime 4.1.30.
       </action>