You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/03/19 03:17:13 UTC

svn commit: r1083131 - in /lucene/dev/branches/lucene_solr_3_1/solr: ./ build.xml src/java/org/apache/solr/schema/IndexSchema.java

Author: hossman
Date: Sat Mar 19 02:17:13 2011
New Revision: 1083131

URL: http://svn.apache.org/viewvc?rev=1083131&view=rev
Log:
merge r1083126 from 3x branch to fix javadoc warnings

Modified:
    lucene/dev/branches/lucene_solr_3_1/solr/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/build.xml   (contents, props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/src/java/org/apache/solr/schema/IndexSchema.java

Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1083131&r1=1083130&r2=1083131&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Sat Mar 19 02:17:13 2011
@@ -186,6 +186,7 @@
          <path refid="compile.classpath.solrj"/>
           <fileset dir="contrib">
             <include name="**/lib/**/*.jar"/>
+            <include name="**/lucene-libs/**/*.jar"/>
           </fileset>
          <pathelement location="${dest}/client/solrj"/>
       </path>
@@ -197,6 +198,7 @@
           <packageset dir="${src}/java" />
           <packageset dir="${src}/webapp/src" />
           <packageset dir="contrib/dataimporthandler/src/main/java" />
+          <packageset dir="contrib/dataimporthandler/src/extras/main/java" />
           <packageset dir="contrib/clustering/src/main/java" />
           <packageset dir="contrib/extraction/src/main/java" />
           <packageset dir="contrib/uima/src/main/java" />

Modified: lucene/dev/branches/lucene_solr_3_1/solr/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/src/java/org/apache/solr/schema/IndexSchema.java?rev=1083131&r1=1083130&r2=1083131&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/src/java/org/apache/solr/schema/IndexSchema.java Sat Mar 19 02:17:13 2011
@@ -99,7 +99,7 @@ public final class IndexSchema {
    * Config path directory searching rules.
    *
    * @see Config#openResource
-   * @deprecated Use {@link #IndexSchema(SolrConfig, String, InputStream)} instead.
+   * @deprecated Use {@link #IndexSchema(SolrConfig, String, InputSource)} instead.
    */
   @Deprecated
   public IndexSchema(SolrConfig solrConfig, String name) {