svn commit: r679647 - in /lucene/solr/trunk: build.xml client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java src/java/org/apache/solr/schema/IndexSchema.java

[ry...@apache.org]

Author: ryan
Date: Thu Jul 24 19:46:02 2008
New Revision: 679647

URL: http://svn.apache.org/viewvc?rev=679647&view=rev
Log:
SOLR-655 -- Adds the compilation of solrj as a prerequisite for generating core-javadoc and the compiled classes and libraries to the classpath. Adds a missing import to IndexSchema. Fixes 2 javadoc comments with improper @param usage in ClientUtils. 

Modified:
    lucene/solr/trunk/build.xml
    lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java
    lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java

Modified: lucene/solr/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/build.xml?rev=679647&r1=679646&r2=679647&view=diff
==============================================================================
--- lucene/solr/trunk/build.xml (original)
+++ lucene/solr/trunk/build.xml Thu Jul 24 19:46:02 2008
@@ -160,13 +160,15 @@
     </solr-javac>
   </target>
 
-  <target name="core-javadoc" depends="compile"
+  <target name="core-javadoc" depends="compile,compile-solrj"
           description="Generates javadoc documentation.">
 
     <mkdir dir="${build.javadoc}"/>
         
     <path id="javadoc.classpath">
        <path refid="compile.classpath"/>
+       <path refid="compile.classpath.solrj"/>
+       <pathelement location="${dest}/client/solrj"/>
     </path>
 
     <javadoc

Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java?rev=679647&r1=679646&r2=679647&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java Thu Jul 24 19:46:02 2008
@@ -70,7 +70,7 @@
   }
   
   /**
-   * @param SolrDocument to convert
+   * @param d SolrDocument to convert
    * @return a SolrInputDocument with the same fields and values as the 
    *   SolrDocument.  All boosts are 1.0f
    */
@@ -84,7 +84,7 @@
   }
 
   /**
-   * @param SolrInputDocument to convert
+   * @param d SolrInputDocument to convert
    * @return a SolrDocument with the same fields and values as the SolrInputDocument
    */
   public static SolrDocument toSolrDocument( SolrInputDocument d )

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java?rev=679647&r1=679646&r2=679647&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java Thu Jul 24 19:46:02 2008
@@ -34,6 +34,7 @@
 import org.apache.solr.analysis.TokenizerFactory;
 import org.apache.solr.search.SolrQueryParser;
 import org.apache.solr.util.plugin.AbstractPluginLoader;
+import org.apache.solr.util.plugin.SolrCoreAware;
 import org.w3c.dom.*;
 
 import javax.xml.xpath.XPath;