From 961cc111a8cbdd136377c1e3bb2dc1aa8386c2b9 Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Tue, 17 Jan 2012 18:35:50 +0000
Subject: [PATCH] SOLR-3042: Fixed Maven Jetty plugin configuration.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1232527 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/maven/solr/webapp/pom.xml.template | 19 +++++++++----------
 solr/CHANGES.txt                             |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev-tools/maven/solr/webapp/pom.xml.template b/dev-tools/maven/solr/webapp/pom.xml.template
index 1a9ac36bcfe..a3b7b0f0e63 100644
--- a/dev-tools/maven/solr/webapp/pom.xml.template
+++ b/dev-tools/maven/solr/webapp/pom.xml.template
@@ -87,22 +87,21 @@
         </configuration>
       </plugin>
       <plugin>
+        <!-- http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin -->
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8080</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
           <webAppConfig>
-            <contextPath>/</contextPath>
-            <baseResource implementation="org.mortbay.resource.ResourceCollection">
-              <resources>web</resources>
-            </baseResource>
+            <contextPath>/solr</contextPath>
           </webAppConfig>
+          <webAppSourceDirectory>web</webAppSourceDirectory>
+          <systemProperties>
+            <systemProperty>
+              <name>solr.solr.home</name>
+              <value>../example/solr</value>
+            </systemProperty>
+          </systemProperties>
         </configuration>
       </plugin>
     </plugins>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 62a295c2179..1954f7ea3cb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -480,6 +480,9 @@ Bug Fixes
   
 * SOLR-2542: Fixed DIH Context variables which were broken for all scopes other 
   then SCOPE_ENTITY (Linbin Chen & Frank Wesemann via hossman)
+  
+* SOLR-3042: Fixed Maven Jetty plugin configuration. 
+  (David Smiley via Steve Rowe)
 
 Other Changes
 ----------------------