Author: hossman
Date: Tue Mar 27 22:40:30 2012
New Revision: 1306036
URL: http://svn.apache.org/viewvc?rev=1306036&view=rev
Log:
tweak example <lib/> declarations so license files aren't added to classpath, also fix
so langid deps are included (merge r1306033)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/src/test/org/apache/lucene/analysis/ (props
changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1306036&r1=1306035&r2=1306036&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Tue Mar 27 22:40:30
2012
@@ -64,35 +64,44 @@
<lib dir="./lib" />
-->
- <!-- A dir option by itself adds any files found in the directory to
- the classpath, this is useful for including all jars in a
+ <!-- A 'dir' option by itself adds any files found in the directory
+ to the classpath, this is useful for including all jars in a
directory.
-->
- <lib dir="../../contrib/extraction/lib" />
- <lib dir="../../contrib/clustering/lib/" />
- <lib dir="../../contrib/velocity/lib" />
+ <!--
+ <lib dir="../add-everything-found-in-this-dir-to-the-classpath" />
+ -->
- <!-- When a regex is specified in addition to a directory, only the
+ <!-- When a 'regex' is specified in addition to a 'dir', only the
files in that directory which completely match the regex
(anchored on both ends) will be included.
-->
<lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
+ <lib dir="../../contrib/extraction/lib" regex=".*\.jar" />
+
<lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+ <lib dir="../../contrib/clustering/lib/" regex=".*\.jar" />
+
<lib dir="../../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
+ <lib dir="../../contrib/dataimporthandler/lib/" regex=".*\.jar" />
+
<lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />
+ <lib dir="../../contrib/langid/lib/" regex=".*\.jar" />
+
<lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" />
+ <lib dir="../../contrib/velocity/lib" regex=".*\.jar" />
- <!-- If a dir option (with or without a regex) is used and nothing
+ <!-- If a 'dir' option (with or without a regex) is used and nothing
is found that matches, it will be ignored
-->
- <lib dir="../../contrib/clustering/lib/" />
<lib dir="/total/crap/dir/ignored" />
- <!-- an exact path can be used to specify a specific file. This
- will cause a serious error to be logged if it can't be loaded.
+ <!-- an exact 'path' can be used instead of a 'dir' to specify a
+ specific file. This will cause a serious error to be logged if
+ it can't be loaded.
-->
<!--
- <lib path="../a-jar-that-does-not-exist.jar" />
+ <lib path="../a-jar-that-does-not-exist.jar" />
-->
<!-- Data Directory
|