Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Steven Rowe 2012-01-17 18:35:50 +00:00
parent 88dee37bb0
commit 961cc111a8
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev-tools/maven/solr/webapp/pom.xml.template
View File

@ -87,22 +87,21 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<!-- http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin -->
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>maven-jetty-plugin</artifactId>
<configuration> <configuration>
<scanIntervalSeconds>10</scanIntervalSeconds> <scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<webAppConfig> <webAppConfig>
<contextPath>/</contextPath> <contextPath>/solr</contextPath>
<baseResource implementation="org.mortbay.resource.ResourceCollection">
<resources>web</resources>
</baseResource>
</webAppConfig> </webAppConfig>
<webAppSourceDirectory>web</webAppSourceDirectory>
<systemProperties>
<systemProperty>
<name>solr.solr.home</name>
<value>../example/solr</value>
</systemProperty>
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

3
solr/CHANGES.txt
View File

@ -481,6 +481,9 @@ Bug Fixes
* SOLR-2542: Fixed DIH Context variables which were broken for all scopes other * SOLR-2542: Fixed DIH Context variables which were broken for all scopes other
then SCOPE_ENTITY (Linbin Chen & Frank Wesemann via hossman) then SCOPE_ENTITY (Linbin Chen & Frank Wesemann via hossman)
* SOLR-3042: Fixed Maven Jetty plugin configuration.
(David Smiley via Steve Rowe)
Other Changes Other Changes
---------------------- ----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji) * SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)