You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/01/17 19:35:50 UTC
svn commit: r1232527 - in /lucene/dev/trunk:
dev-tools/maven/solr/webapp/pom.xml.template solr/CHANGES.txt
Author: sarowe
Date: Tue Jan 17 18:35:50 2012
New Revision: 1232527
URL: http://svn.apache.org/viewvc?rev=1232527&view=rev
Log:
SOLR-3042: Fixed Maven Jetty plugin configuration.
Modified:
lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
lucene/dev/trunk/solr/CHANGES.txt
Modified: lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template?rev=1232527&r1=1232526&r2=1232527&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template Tue Jan 17 18:35:50 2012
@@ -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>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1232527&r1=1232526&r2=1232527&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jan 17 18:35:50 2012
@@ -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
----------------------