You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/10/25 15:10:51 UTC

svn commit: r1402140 [17/17] - in /lucene/dev/branches/LUCENE-2878: ./ dev-tools/ dev-tools/eclipse/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/classification/ dev-tools/maven/ dev-tools/maven/lucene/classific...

Modified: lucene/dev/branches/LUCENE-2878/solr/licenses/servlet-api-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/licenses/servlet-api-NOTICE.txt?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/licenses/servlet-api-NOTICE.txt (original)
+++ lucene/dev/branches/LUCENE-2878/solr/licenses/servlet-api-NOTICE.txt Thu Oct 25 13:10:25 2012
@@ -1,111 +1,2 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head><body lang="EN-US" link="blue" vlink="purple">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the
-Eclipse Foundation is provided to you under the terms and conditions of
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
-provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") in CVS modules ("Modules") and made available
-as downloadable archives ("Downloads").</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to
-facilitate delivering, extending, and upgrading the Content. Typical
-modules may include plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features").</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
-	<li>A
-Feature is a bundle of one or more Plug-ins and/or Fragments and
-associated material. Each Feature may be packaged as a sub-directory in
-a directory named "features". Within a Feature, files named
-"feature.xml" may contain a list of the names and version numbers of
-the Plug-ins and/or Fragments associated with that Feature.</li>
-	<li>Features
-may also include other Features ("Included Features"). Within a
-Feature, files named "feature.xml" may contain a list of the names and
-version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
-conditions governing Features and
-Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named "src" of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is
-installed using the Eclipse Update Manager, you must agree to a license
-("Feature Update License") during the
-installation process. If the Feature contains Included Features, the
-Feature Update License should either provide you with the terms and
-conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be
-found in the "license" property of files named "feature.properties"
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the
-terms and conditions (or references to such terms and conditions) that
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions
-govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you
-are currently may have restrictions on the import, possession, and use,
-and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
-regulations and policies concerning the import, possession, or use, and
-re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body></html>
\ No newline at end of file
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php

Modified: lucene/dev/branches/LUCENE-2878/solr/site/xsl/index.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/site/xsl/index.xsl?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/site/xsl/index.xsl (original)
+++ lucene/dev/branches/LUCENE-2878/solr/site/xsl/index.xsl Thu Oct 25 13:10:25 2012
@@ -56,6 +56,7 @@
         <h2>Reference Documents</h2>
           <ul>
             <li><a href="changes/Changes.html">Changes</a>: List of changes in this release.</li>
+            <li><a href="SYSTEM_REQUIREMENTS.html">System Requirements</a>: Minimum and supported Java versions.</li>
             <li><a href="tutorial.html">Solr Tutorial</a>: This document covers the basics of running Solr using an example schema, and some sample data.</li>
             <li><a href="{$luceneJavadocUrl}index.html">Lucene Documentation</a></li>
           </ul>

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/build.xml?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/build.xml Thu Oct 25 13:10:25 2012
@@ -46,6 +46,20 @@
      </sequential>
   </target>
 
+  <!-- Specialized to use lucene's classpath too, because it refs e.g. qp syntax 
+       (even though it doesnt compile with it) 
+       TODO: would be nice to fix this up better, but its hard because of
+       the different ways solr links to lucene javadocs -->
+  <target name="-ecj-javadoc-lint-src" depends="-ecj-resolve">
+    <ecj-macro srcdir="${src.dir}" configuration="${common.dir}/tools/javadoc/ecj.javadocs.prefs">
+      <classpath>
+        <path refid="classpath"/>
+        <path refid="solr.lucene.libs"/>
+      </classpath>
+    </ecj-macro>
+  </target>
+
+
   <target name="dist" depends="common-solr.dist">
     <mkdir  dir="${dist}/solrj-lib" />
     <copy todir="${dist}/solrj-lib">

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java Thu Oct 25 13:10:25 2012
@@ -742,11 +742,8 @@ public class SolrQuery extends Modifiabl
   }
 
   /**
-   * @see ModifiableSolrParams#set(String,String[])
-   * @param name
-   * @param values
-   *  
    * @return this
+   * @see ModifiableSolrParams#set(String,String[])
    */
   public SolrQuery setParam(String name, String ... values) {
     this.set(name, values);
@@ -754,10 +751,8 @@ public class SolrQuery extends Modifiabl
   }
 
   /**
-   * @see org.apache.solr.common.params.ModifiableSolrParams#set(String, boolean)
-   * @param name
-   * @param value
    * @return this
+   * @see org.apache.solr.common.params.ModifiableSolrParams#set(String, boolean)
    */
   public SolrQuery setParam(String name, boolean value) {
     this.set(name, value);

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java Thu Oct 25 13:10:25 2012
@@ -48,8 +48,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a collection of documents
    * @param docs  the collection of documents
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse add(Collection<SolrInputDocument> docs) throws SolrServerException, IOException {
     return add(docs, -1);
@@ -59,8 +58,7 @@ public abstract class SolrServer impleme
    * Adds a collection of documents, specifying max time before they become committed
    * @param docs  the collection of documents
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse add(Collection<SolrInputDocument> docs, int commitWithinMs) throws SolrServerException, IOException {
@@ -73,8 +71,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a collection of beans
    * @param beans  the collection of beans
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse addBeans(Collection<?> beans ) throws SolrServerException, IOException {
     return addBeans(beans, -1);
@@ -84,8 +81,7 @@ public abstract class SolrServer impleme
    * Adds a collection of beans specifying max time before they become committed
    * @param beans  the collection of beans
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse addBeans(Collection<?> beans, int commitWithinMs) throws SolrServerException, IOException {
@@ -100,8 +96,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a single document
    * @param doc  the input document
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse add(SolrInputDocument doc ) throws SolrServerException, IOException {
     return add(doc, -1);
@@ -111,8 +106,7 @@ public abstract class SolrServer impleme
    * Adds a single document specifying max time before it becomes committed
    * @param doc  the input document
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse add(SolrInputDocument doc, int commitWithinMs) throws SolrServerException, IOException {
@@ -125,8 +119,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a single bean
    * @param obj  the input bean
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse addBean(Object obj) throws IOException, SolrServerException {
     return addBean(obj, -1);
@@ -136,8 +129,7 @@ public abstract class SolrServer impleme
    * Adds a single bean specifying max time before it becomes committed
    * @param obj  the input bean
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse addBean(Object obj, int commitWithinMs) throws IOException, SolrServerException {
@@ -148,8 +140,7 @@ public abstract class SolrServer impleme
    * Performs an explicit commit, causing pending documents to be committed for indexing
    * <p>
    * waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( ) throws SolrServerException, IOException {
     return commit(true, true);
@@ -161,8 +152,7 @@ public abstract class SolrServer impleme
    * waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
    * <p>
    * Note: In most cases it is not required to do explicit optimize
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize( ) throws SolrServerException, IOException {
     return optimize(true, true, 1);
@@ -172,8 +162,7 @@ public abstract class SolrServer impleme
    * Performs an explicit commit, causing pending documents to be committed for indexing
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main query searcher, making the changes visible 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( boolean waitFlush, boolean waitSearcher ) throws SolrServerException, IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.COMMIT, waitFlush, waitSearcher ).process( this );
@@ -184,8 +173,7 @@ public abstract class SolrServer impleme
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main query searcher, making the changes visible
    * @param softCommit makes index changes visible while neither fsync-ing index files nor writing a new index descriptor
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( boolean waitFlush, boolean waitSearcher, boolean softCommit ) throws SolrServerException, IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.COMMIT, waitFlush, waitSearcher, softCommit ).process( this );
@@ -197,8 +185,7 @@ public abstract class SolrServer impleme
    * Note: In most cases it is not required to do explicit optimize
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main query searcher, making the changes visible 
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize( boolean waitFlush, boolean waitSearcher ) throws SolrServerException, IOException {
     return optimize(waitFlush, waitSearcher, 1);
@@ -211,8 +198,7 @@ public abstract class SolrServer impleme
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main query searcher, making the changes visible 
    * @param maxSegments  optimizes down to at most this number of segments
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize(boolean waitFlush, boolean waitSearcher, int maxSegments ) throws SolrServerException, IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.OPTIMIZE, waitFlush, waitSearcher, maxSegments ).process( this );
@@ -224,8 +210,7 @@ public abstract class SolrServer impleme
    * Note that this is not a true rollback as in databases. Content you have previously
    * added may have been committed due to autoCommit, buffer full, other client performing
    * a commit etc.
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse rollback() throws SolrServerException, IOException {
     return new UpdateRequest().rollback().process( this );
@@ -234,8 +219,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes a single document by unique ID
    * @param id  the ID of the document to delete
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteById(String id) throws SolrServerException, IOException {
     return deleteById(id, -1);
@@ -245,8 +229,7 @@ public abstract class SolrServer impleme
    * Deletes a single document by unique ID, specifying max time before commit
    * @param id  the ID of the document to delete
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteById(String id, int commitWithinMs) throws SolrServerException, IOException {
@@ -259,8 +242,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes a list of documents by unique ID
    * @param ids  the list of document IDs to delete 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteById(List<String> ids) throws SolrServerException, IOException {
     return deleteById(ids, -1);
@@ -270,8 +252,7 @@ public abstract class SolrServer impleme
    * Deletes a list of documents by unique ID, specifying max time before commit
    * @param ids  the list of document IDs to delete 
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteById(List<String> ids, int commitWithinMs) throws SolrServerException, IOException {
@@ -284,8 +265,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes documents from the index based on a query
    * @param query  the query expressing what documents to delete
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteByQuery(String query) throws SolrServerException, IOException {
     return deleteByQuery(query, -1);
@@ -295,8 +275,7 @@ public abstract class SolrServer impleme
    * Deletes documents from the index based on a query, specifying max time before commit
    * @param query  the query expressing what documents to delete
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteByQuery(String query, int commitWithinMs) throws SolrServerException, IOException {
@@ -308,8 +287,7 @@ public abstract class SolrServer impleme
 
   /**
    * Issues a ping request to check if the server is alive
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public SolrPingResponse ping() throws SolrServerException, IOException {
     return new SolrPing().process( this );
@@ -318,7 +296,6 @@ public abstract class SolrServer impleme
   /**
    * Performs a query to the Solr server
    * @param params  an object holding all key/value parameters to send along the request
-   * @throws SolrServerException
    */
   public QueryResponse query(SolrParams params) throws SolrServerException {
     return new QueryRequest( params ).process( this );
@@ -328,7 +305,6 @@ public abstract class SolrServer impleme
    * Performs a query to the Solr server
    * @param params  an object holding all key/value parameters to send along the request
    * @param method  specifies the HTTP method to use for the request, such as GET or POST
-   * @throws SolrServerException
    */
   public QueryResponse query(SolrParams params, METHOD method) throws SolrServerException {
     return new QueryRequest( params, method ).process( this );

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Thu Oct 25 13:10:25 2012
@@ -156,9 +156,9 @@ public class ConcurrentUpdateSolrServer 
                       if (params != null) {
                         String fmt = null;
                         if (params.getBool(UpdateParams.OPTIMIZE, false)) {
-                          fmt = "<optimize waitSearcher=\"%s\" waitFlush=\"%s\" />";
+                          fmt = "<optimize waitSearcher=\"%s\" />";
                         } else if (params.getBool(UpdateParams.COMMIT, false)) {
-                          fmt = "<commit waitSearcher=\"%s\" waitFlush=\"%s\" />";
+                          fmt = "<commit waitSearcher=\"%s\" />";
                         }
                         if (fmt != null) {
                           byte[] content = String.format(Locale.ROOT,

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Thu Oct 25 13:10:25 2012
@@ -166,8 +166,7 @@ public class HttpSolrServer extends Solr
    * @param request
    *          The {@link org.apache.solr.client.solrj.SolrRequest} to process
    * @return The {@link org.apache.solr.common.util.NamedList} result
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * 
    * @see #request(org.apache.solr.client.solrj.SolrRequest,
    *      org.apache.solr.client.solrj.ResponseParser)

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Thu Oct 25 13:10:25 2012
@@ -230,8 +230,7 @@ public class LBHttpSolrServer extends So
    *
    * @return the result of the request
    *
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public Rsp request(Req req) throws SolrServerException, IOException {
     Rsp rsp = new Rsp();
@@ -419,8 +418,7 @@ public class LBHttpSolrServer extends So
    *
    * @return response
    *
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   @Override
   public NamedList<Object> request(final SolrRequest request)

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java Thu Oct 25 13:10:25 2012
@@ -163,7 +163,6 @@ public class ClientUtils 
   /**
    * Returns a formatter that can be use by the current thread if needed to
    * convert Date objects to the Internal representation.
-   * @throws ParseException
    *
    * @deprecated Use {@link org.apache.solr.common.util.DateUtil#parseDate(String)}
    */

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Thu Oct 25 13:10:25 2012
@@ -59,9 +59,6 @@ public class ClusterState implements JSO
    * Use this constr when ClusterState is meant for publication.
    * 
    * hashCode and equals will only depend on liveNodes and not clusterStateVersion.
-   * 
-   * @param liveNodes
-   * @param collectionStates
    */
   public ClusterState(Set<String> liveNodes,
       Map<String, Map<String,Slice>> collectionStates) {
@@ -70,10 +67,6 @@ public class ClusterState implements JSO
   
   /**
    * Use this constr when ClusterState is meant for consumption.
-   * 
-   * @param zkClusterStateVersion
-   * @param liveNodes
-   * @param collectionStates
    */
   public ClusterState(Integer zkClusterStateVersion, Set<String> liveNodes,
       Map<String, Map<String,Slice>> collectionStates) {

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java Thu Oct 25 13:10:25 2012
@@ -89,9 +89,7 @@ public class HashPartitioner {
   }
 
   /**
-   *
-   * @param partitions
-   * @return Range for each partition
+   * Returns the range for each partition
    */
   public List<Range> partitionRange(int partitions, int min, int max) {
     assert max >= min;

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Thu Oct 25 13:10:25 2012
@@ -75,10 +75,6 @@ public class SolrZkClient {
   private volatile boolean isClosed = false;
   private ZkClientConnectionStrategy zkClientConnectionStrategy;
   
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout) {
     this(zkServerAddress, zkClientTimeout, new DefaultConnectionStrategy(), null);
   }
@@ -87,24 +83,11 @@ public class SolrZkClient {
     this(zkServerAddress, zkClientTimeout, new DefaultConnectionStrategy(), onReonnect, zkClientConnectTimeout);
   }
 
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   * @param strat
-   * @param onReconnect
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout,
       ZkClientConnectionStrategy strat, final OnReconnect onReconnect) {
     this(zkServerAddress, zkClientTimeout, strat, onReconnect, DEFAULT_CLIENT_CONNECT_TIMEOUT);
   }
 
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   * @param strat
-   * @param onReconnect
-   * @param clientConnectTimeout
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout,
       ZkClientConnectionStrategy strat, final OnReconnect onReconnect, int clientConnectTimeout) {
     this.zkClientConnectionStrategy = strat;
@@ -146,19 +129,12 @@ public class SolrZkClient {
   }
 
   /**
-   * @return true if client is connected
+   * Returns true if client is connected
    */
   public boolean isConnected() {
     return keeper != null && keeper.getState() == ZooKeeper.States.CONNECTED;
   }
   
-  /**
-   * @param path
-   * @param version
-   * @param retryOnConnLoss 
-   * @throws InterruptedException
-   * @throws KeeperException
-   */
   public void delete(final String path, final int version, boolean retryOnConnLoss)
       throws InterruptedException, KeeperException {
     if (retryOnConnLoss) {
@@ -185,7 +161,6 @@ public class SolrZkClient {
    *
    * @param path the node path
    * @param watcher explicit watcher
-   * @param retryOnConnLoss 
    * @return the stat of the node of the given path; return null if no such a
    *         node exists.
    * @throws KeeperException If the server signals an error
@@ -207,11 +182,7 @@ public class SolrZkClient {
   }
   
   /**
-   * @param path
-   * @return true if path exists
-   * @param retryOnConnLoss  
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns true if path exists
    */
   public Boolean exists(final String path, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -228,14 +199,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param data
-   * @param acl
-   * @param createMode
-   * @param retryOnConnLoss 
-   * @return path of created node
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns path of created node
    */
   public String create(final String path, final byte data[], final List<ACL> acl,
       final CreateMode createMode, boolean retryOnConnLoss) throws KeeperException, InterruptedException {
@@ -252,12 +216,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param watcher
-   * @param retryOnConnLoss 
-   * @return children of the node at the path
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns children of the node at the path
    */
   public List<String> getChildren(final String path, final Watcher watcher, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -274,13 +233,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param watcher
-   * @param stat
-   * @param retryOnConnLoss 
-   * @return node's data
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns node's data
    */
   public byte[] getData(final String path, final Watcher watcher, final Stat stat, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -297,13 +250,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param data
-   * @param version
-   * @param retryOnConnLoss 
-   * @return node's state
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns node's state
    */
   public Stat setData(final String path, final byte data[], final int version, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -320,14 +267,7 @@ public class SolrZkClient {
   }
   
   /**
-   * 
-   * @param path
-   * @param data
-   * @param createMode
-   * @return path of created node
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns path of created node
    */
   public String create(final String path, final byte[] data,
       final CreateMode createMode, boolean retryOnConnLoss) throws KeeperException,
@@ -350,11 +290,6 @@ public class SolrZkClient {
    * 
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
-   * 
-   * @param path
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -385,11 +320,7 @@ public class SolrZkClient {
   /**
    * Creates the path in ZooKeeper, creating each node as necessary.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -402,12 +333,7 @@ public class SolrZkClient {
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param createMode
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -420,13 +346,7 @@ public class SolrZkClient {
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param createMode
-   * @param watcher
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode,
       Watcher watcher, boolean retryOnConnLoss) throws KeeperException, InterruptedException {
@@ -443,15 +363,6 @@ public class SolrZkClient {
    * 
    * Note: retryOnConnLoss is only respected for the final node - nodes
    * before that are always retried on connection loss.
-   * 
-   * @param path
-   * @param data
-   * @param createMode
-   * @param watcher
-   * @param failOnExists
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode,
       Watcher watcher, boolean failOnExists, boolean retryOnConnLoss) throws KeeperException, InterruptedException {
@@ -520,14 +431,6 @@ public class SolrZkClient {
     }
   }
 
-  /**
-   * @param zkPath
-   * @param createMode
-   * @param watcher
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
-   */
   public void makePath(String zkPath, CreateMode createMode, Watcher watcher, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
     makePath(zkPath, null, createMode, watcher, retryOnConnLoss);
@@ -535,12 +438,6 @@ public class SolrZkClient {
 
   /**
    * Write data to ZooKeeper.
-   * 
-   * @param path
-   * @param data
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void setData(String path, byte[] data, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -552,10 +449,6 @@ public class SolrZkClient {
    * 
    * @param path path to upload file to e.g. /solr/conf/solrconfig.xml
    * @param file path to file to be uploaded
-   * @param retryOnConnLoss
-   * @throws IOException
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void setData(String path, File file, boolean retryOnConnLoss) throws IOException,
       KeeperException, InterruptedException {
@@ -569,11 +462,6 @@ public class SolrZkClient {
 
   /**
    * Fills string with printout of current ZooKeeper layout.
-   * 
-   * @param path
-   * @param indent
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void printLayout(String path, int indent, StringBuilder string)
       throws KeeperException, InterruptedException {
@@ -619,9 +507,6 @@ public class SolrZkClient {
 
   /**
    * Prints current ZooKeeper layout to stdout.
-   * 
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void printLayoutToStdOut() throws KeeperException,
       InterruptedException {
@@ -667,9 +552,6 @@ public class SolrZkClient {
 
   /**
    * Allows package private classes to update volatile ZooKeeper.
-   * 
-   * @param keeper
-   * @throws InterruptedException 
    */
   void updateKeeper(SolrZooKeeper keeper) throws InterruptedException {
    SolrZooKeeper oldKeeper = this.keeper;

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java Thu Oct 25 13:10:25 2012
@@ -53,10 +53,6 @@ public class ZkCmdExecutor {
 
   /**
    * Perform the given operation, retrying if the connection fails
-   * 
-   * @param operation
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   @SuppressWarnings("unchecked")
   public <T> T retryOperation(ZkOperation operation)
@@ -107,7 +103,6 @@ public class ZkCmdExecutor {
    * 
    * @param attemptCount
    *          the number of the attempts performed so far
-   * @throws InterruptedException 
    */
   protected void retryDelay(int attemptCount) throws InterruptedException {
     if (attemptCount > 0) {

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java Thu Oct 25 13:10:25 2012
@@ -32,8 +32,6 @@ public abstract class ZkOperation {
      * to ZooKeeper closes during this operation
      *
      * @return the result of the operation or null
-     * @throws KeeperException
-     * @throws InterruptedException
      */
     public abstract Object execute() throws KeeperException, InterruptedException;
 }

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Thu Oct 25 13:10:25 2012
@@ -186,7 +186,7 @@ public class ZkStateReader {
           if (EventType.None.equals(event.getType())) {
             return;
           }
-          log.info("A cluster state change has occurred - updating...");
+          log.info("A cluster state change has occurred - updating... ({})", ZkStateReader.this.clusterState.getLiveNodes().size());
           try {
             
             // delayed approach
@@ -235,13 +235,13 @@ public class ZkStateReader {
               if (EventType.None.equals(event.getType())) {
                 return;
               }
-              log.info("Updating live nodes");
               try {
                 // delayed approach
                 // ZkStateReader.this.updateClusterState(false, true);
                 synchronized (ZkStateReader.this.getUpdateLock()) {
                   List<String> liveNodes = zkClient.getChildren(
                       LIVE_NODES_ZKNODE, this, true);
+                  log.info("Updating live nodes... ({})", liveNodes.size());
                   Set<String> liveNodesSet = new HashSet<String>();
                   liveNodesSet.addAll(liveNodes);
                   ClusterState clusterState = new ClusterState(
@@ -296,7 +296,7 @@ public class ZkStateReader {
           
           clusterState = ClusterState.load(zkClient, liveNodesSet);
         } else {
-          log.info("Updating live nodes from ZooKeeper... ");
+          log.info("Updating live nodes from ZooKeeper... ({})", liveNodesSet.size());
           clusterState = new ClusterState(
               ZkStateReader.this.clusterState.getZkClusterStateVersion(), liveNodesSet,
               ZkStateReader.this.clusterState.getCollectionStates());

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java Thu Oct 25 13:10:25 2012
@@ -32,6 +32,7 @@ public interface HighlightParams {
   public static final String FORMATTER   = HIGHLIGHT+".formatter";
   public static final String ENCODER     = HIGHLIGHT+".encoder";
   public static final String FRAGMENTER  = HIGHLIGHT+".fragmenter";
+  public static final String PRESERVE_MULTI = HIGHLIGHT+".preserveMulti";
   public static final String FRAG_LIST_BUILDER = HIGHLIGHT+".fragListBuilder";
   public static final String FRAGMENTS_BUILDER = HIGHLIGHT+".fragmentsBuilder";
   public static final String BOUNDARY_SCANNER = HIGHLIGHT+".boundaryScanner";

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java Thu Oct 25 13:10:25 2012
@@ -102,7 +102,6 @@ public class FastOutputStream extends Ou
 
   /** reserve at least len bytes at the end of the buffer.
    * Invalid if len > buffer.length
-   * @param len
    */
   public void reserve(int len) throws IOException {
     if (len > (buf.length - pos))

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java Thu Oct 25 13:10:25 2012
@@ -619,10 +619,7 @@ public class JavaBinCodec {
    * collection/array/map In most of the cases the length can be represented in one byte (length < 127) so it saves 3
    * bytes/object
    *
-   * @param i
-   * @param out
-   *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static void writeVInt(int i, FastOutputStream out) throws IOException {
     while ((i & ~0x7F) != 0) {
@@ -633,13 +630,9 @@ public class JavaBinCodec {
   }
 
   /**
-   * The counterpart for the above
-   *
-   * @param in
-   *
-   * @return the int value
+   * The counterpart for {@link #writeVInt(int, FastOutputStream)}
    *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static int readVInt(FastInputStream in) throws IOException {
     byte b = in.readByte();

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java Thu Oct 25 13:10:25 2012
@@ -97,7 +97,6 @@ public class NamedList<T> implements Clo
    * indexed elements (0,2,4. ..etc) are Strings and odd elements (1,3,5,) are of
    * the type "T".
    *
-   * @param nameValuePairs
    * @return Modified List as per the above description
    * @deprecated This a temporary placeholder method until the guts of the class
    * are actually replaced by List&lt;String, ?&gt;.
@@ -273,8 +272,6 @@ public class NamedList<T> implements Clo
    *
    * Helper class implementing Map.Entry&lt;String, T&gt; to store the key-value
    * relationship in NamedList (the keys of which are String-s) 
-   * 
-   * @param <T>
    */
   public static final class NamedListEntry<T> implements Map.Entry<String, T> {
 

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java Thu Oct 25 13:10:25 2012
@@ -241,8 +241,6 @@ public class StrUtils {
 
   /**
    * {@link NullPointerException} and {@link SolrException} free version of {@link #parseBool(String)}
-   * @param s
-   * @param def
    * @return parsed boolean value (or def, if s is null or invalid)
    */
   public static boolean parseBool(String s, boolean def) {

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/XML.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/XML.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/XML.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/XML.java Thu Oct 25 13:10:25 2012
@@ -71,9 +71,7 @@ public class XML {
 
 /*********
  *
- * @param str
- * @param out
- * @throws IOException
+ * @throws IOException If there is a low-level I/O error.
  */
   public static void escapeCharData(String str, Writer out) throws IOException {
     escape(str, out, chardata_escapes);

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Thu Oct 25 13:10:25 2012
@@ -39,7 +39,7 @@ import org.junit.Test;
 public abstract class MultiCoreExampleTestBase extends SolrExampleTestBase 
 {
   // protected static final CoreContainer cores = new CoreContainer();
-  protected static CoreContainer cores;
+  protected CoreContainer cores;
   private File dataDir2;
 
   @Override public String getSolrHome() { return ExternalPaths.EXAMPLE_MULTICORE_HOME; }
@@ -73,6 +73,8 @@ public abstract class MultiCoreExampleTe
         System.err.println("!!!! WARNING: best effort to remove " + dataDir2.getAbsolutePath() + " FAILED !!!!!");
       }
     }
+    
+    cores = null;
   }
 
   @Override

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Thu Oct 25 13:10:25 2012
@@ -1134,6 +1134,36 @@ abstract public class SolrExampleTests e
       assertEquals( null, p.getPivot() );
     }
 
+    // -- SOLR-2255 Test excluding a filter Query --
+    // this test is a slight modification to the first pivot facet test
+    query = new SolrQuery( "*:*" );
+    query.addFacetPivotField( "{!ex=mytag key=mykey}features,cat" );
+    query.addFilterQuery("{!tag=mytag}-(features:bbb AND cat:a AND inStock:true)");//filters out one
+    query.setFacetMinCount( 0 );
+    query.setRows( 0 );
+
+    rsp = server.query( query );
+    assertEquals( docs.size() - 1, rsp.getResults().getNumFound() );//one less due to filter
+
+    //The rest of this test should be just like the original since we've
+    // excluded the 'fq' from the facet count
+    pivots = rsp.getFacetPivot();
+    pivot = pivots.getVal(0);
+    assertEquals( "mykey", pivots.getName( 0 ) );
+    assertEquals( 2, pivot.size() );
+
+    ff = pivot.get( 0 );
+    assertEquals( "features", ff.getField() );
+    assertEquals( "bbb", ff.getValue() );
+    assertEquals( 6, ff.getCount() );
+    counts = ff.getPivot();
+    assertEquals( 2, counts.size() );
+    assertEquals( "cat", counts.get(0).getField() );
+    assertEquals( "b", counts.get(0).getValue() );
+    assertEquals(   4, counts.get(0).getCount() );
+    assertEquals( "a", counts.get(1).getValue() );
+    assertEquals(   2, counts.get(1).getCount() );
+
   }
   
   public static SolrInputDocument makeTestDoc( Object ... kvp )

Modified: lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java Thu Oct 25 13:10:25 2012
@@ -23,9 +23,17 @@ import org.apache.solr.client.solrj.Solr
 import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.apache.solr.client.solrj.request.RequestWriter;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.util.ExternalPaths;
-import org.junit.BeforeClass;
 
+import java.util.EnumSet;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.junit.BeforeClass;
+import org.junit.After;
 
 /**
  * 
@@ -34,6 +42,9 @@ import org.junit.BeforeClass;
  */
 @Slow
 public class SolrExampleStreamingTest extends SolrExampleTests {
+
+  protected Throwable handledException = null;
+
   @BeforeClass
   public static void beforeTest() throws Exception {
     createJetty(ExternalPaths.EXAMPLE_HOME, null, null);
@@ -50,7 +61,7 @@ public class SolrExampleStreamingTest ex
         public Throwable lastError = null;
         @Override
         public void handleError(Throwable ex) {
-          lastError = ex;
+          handledException = lastError = ex;
         }
       };
 
@@ -63,4 +74,39 @@ public class SolrExampleStreamingTest ex
       throw new RuntimeException( ex );
     }
   }
+
+  public void testWaitOptions() throws Exception {
+    // SOLR-3903
+    final List<Throwable> failures = new ArrayList<Throwable>();
+    ConcurrentUpdateSolrServer s = new ConcurrentUpdateSolrServer
+      ("http://127.0.0.1:"+port+context, 2, 2) {
+        @Override
+        public void handleError(Throwable ex) {
+          failures.add(ex);
+        }
+      };
+      
+    int docId = 42;
+    for (UpdateRequest.ACTION action : EnumSet.allOf(UpdateRequest.ACTION.class)) {
+      for (boolean waitSearch : Arrays.asList(true, false)) {
+        for (boolean waitFlush : Arrays.asList(true, false)) {
+          UpdateRequest updateRequest = new UpdateRequest();
+          SolrInputDocument document = new SolrInputDocument();
+          document.addField("id", docId++ );
+          updateRequest.add(document);
+          updateRequest.setAction(action, waitSearch, waitFlush);
+          s.request(updateRequest);
+        }
+      }
+    }
+    s.commit();
+    s.blockUntilFinished();
+    s.shutdown();
+
+    if (0 != failures.size()) {
+      assertEquals(failures.size() + " Unexpected Exception, starting with...", 
+                   null, failures.get(0));
+    }
+  }
+
 }

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/README.txt?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/README.txt (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/README.txt Thu Oct 25 13:10:25 2012
@@ -1,6 +1,6 @@
 The Solr test-framework products base classes and utility classes for 
 writting JUnit tests excercising Solr functionality.
 
-This test framework replies on the lucene components found in in the 
+This test framework relies on the lucene components found in in the 
 ./lucene-libs/ directory, as well as the third-party libraries found 
 in the ./lib directory.

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/build.xml?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/build.xml Thu Oct 25 13:10:25 2012
@@ -43,6 +43,9 @@
     </compile>
   </target>
 
+  <!-- redefine the clover setup, because we dont want to run clover for the test-framework -->
+  <target name="-clover.setup" if="run.clover"/>
+
   <!-- Override common-solr.javadocs to include JUnit links -->
   <!-- and to copy the built javadocs to ${dest}/docs/api/test-framework -->
   <target name="javadocs"

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/ivy.xml?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/ivy.xml (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/ivy.xml Thu Oct 25 13:10:25 2012
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.1" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.1" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Thu Oct 25 13:10:25 2012
@@ -719,8 +719,6 @@ public abstract class BaseDistributedSea
    * causing a spelling index not to get built:  both control & shard data would have no results
    * but because they match the test would pass.  This method gives us a chance to ensure something
    * exists in the control data.
-   * 
-   * @throws Exception
    */
   public void validateControlData(QueryResponse control) throws Exception {
     /* no-op */

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Oct 25 13:10:25 2012
@@ -27,6 +27,7 @@ import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.QuickPatchThreadsFilter;
 import org.apache.noggit.*;
+import org.apache.solr.client.solrj.util.ClientUtils;
 import org.apache.solr.common.*;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.params.*;
@@ -81,6 +82,7 @@ public abstract class SolrTestCaseJ4 ext
   @BeforeClass 
   @SuppressWarnings("unused")
   private static void beforeClass() {
+    System.setProperty("jetty.testMode", "true");
     setupLogging();
     startTrackingSearchers();
     startTrackingZkClients();
@@ -95,6 +97,7 @@ public abstract class SolrTestCaseJ4 ext
     endTrackingSearchers();
     endTrackingZkClients();
     resetFactory();
+    System.clearProperty("jetty.testMode");
   }
 
   private static boolean changedFactory = false;
@@ -665,14 +668,15 @@ public abstract class SolrTestCaseJ4 ext
    * Generates a simple &lt;add&gt;&lt;doc&gt;... XML String with no options
    */
   public static String adoc(SolrInputDocument sdoc) {
-    List<String> fields = new ArrayList<String>();
-    for (SolrInputField sf : sdoc) {
-      for (Object o : sf.getValues()) {
-        fields.add(sf.getName());
-        fields.add(o.toString());
-      }
+    StringWriter out = new StringWriter(512);
+    try {
+      out.append("<add>");
+      ClientUtils.writeXML(sdoc, out);
+      out.append("</add>");
+    } catch (IOException e) {
+      throw new RuntimeException("Inexplicable IO error from StringWriter", e);
     }
-    return adoc(fields.toArray(new String[fields.size()]));
+    return out.toString();
   }
 
 

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Thu Oct 25 13:10:25 2012
@@ -280,12 +280,10 @@ public abstract class AbstractFullDistri
   
 
   /**
-   * @param numJettys
    * @param checkCreatedVsState
    *          if true, make sure the number created (numJettys) matches the
    *          number in the cluster state - if you add more jetties this may not
    *          be the case
-   * @throws Exception
    */
   protected List<JettySolrRunner> createJettys(int numJettys, boolean checkCreatedVsState) throws Exception {
     List<JettySolrRunner> jettys = new ArrayList<JettySolrRunner>();

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java Thu Oct 25 13:10:25 2012
@@ -83,7 +83,7 @@ public class ZkTestServer {
     /**
      * Run from a ServerConfig.
      * @param config ServerConfig to use.
-     * @throws IOException
+     * @throws IOException If there is a low-level I/O error.
      */
     public void runFromConfig(ServerConfig config) throws IOException {
       try {
@@ -110,7 +110,7 @@ public class ZkTestServer {
 
     /**
      * Shutdown the serving instance
-     * @throws IOException 
+     * @throws IOException If there is a low-level I/O error.
      */
     protected void shutdown() throws IOException {
       zooKeeperServer.shutdown();
@@ -287,7 +287,7 @@ public class ZkTestServer {
    * @param host the destination host
    * @param port the destination port
    * @param cmd the 4letterword
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static String send4LetterWord(String host, int port, String cmd)
       throws IOException

Modified: lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java (original)
+++ lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java Thu Oct 25 13:10:25 2012
@@ -47,7 +47,7 @@ public class MockDirectoryFactory extend
   @Override
   public boolean exists(String path) {
     String fullPath = new File(path).getAbsolutePath();
-    synchronized (DirectoryFactory.class) {
+    synchronized (this) {
       CacheValue cacheValue = byPathCache.get(fullPath);
       Directory directory = null;
       if (cacheValue != null) {

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/build.xml?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/build.xml Thu Oct 25 13:10:25 2012
@@ -48,7 +48,7 @@
          webxml="web/WEB-INF/web.xml"
          manifest="${manifest.file}">
       <lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
-        <exclude name="servlet-api*.jar" />
+        <exclude name="*servlet-api*.jar" />
         <exclude name="easymock-*.jar" />
       </lib>
       <lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/css/styles/schema-browser.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/css/styles/schema-browser.css?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/css/styles/schema-browser.css (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/css/styles/schema-browser.css Thu Oct 25 13:10:25 2012
@@ -114,6 +114,18 @@
   padding-left: 5px;
 }
 
+#content #schema-browser #data #field .partial
+{
+  display: none;
+}
+
+#content #schema-browser #data #field .partial p
+{
+  background-image: url( ../../img/ico/exclamation-button.png );
+  background-position: 0 50%;
+  padding-left: 21px;
+}
+
 #content #schema-browser #data #field .field-options .options dt,
 #content #schema-browser #data #field .field-options .options dd
 {

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cloud.js?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cloud.js Thu Oct 25 13:10:25 2012
@@ -372,11 +372,12 @@ var prepare_graph = function( graph_elem
                 for( var s in state[c] )
                 {
                   var nodes = [];
-                  for( var n in state[c][s] )
+                  for( var n in state[c][s].replicas )
                   {
                     leaf_count++;
+                    var replica = state[c][s].replicas[n]
 
-                    var uri = state[c][s][n].base_url;
+                    var uri = replica.base_url;
                     var parts = uri.match( /^(\w+:)\/\/(([\w\d\.-]+)(:(\d+))?)(.+)$/ );
                     var uri_parts = {
                       protocol: parts[1],
@@ -392,9 +393,9 @@ var prepare_graph = function( graph_elem
                     helper_data.port.push( uri_parts.port );
                     helper_data.pathname.push( uri_parts.pathname );
 
-                    var status = state[c][s][n].state;
+                    var status = replica.state;
 
-                    if( !live_nodes[state[c][s][n].node_name] )
+                    if( !live_nodes[replica.node_name] )
                     {
                       status = 'gone';
                     }
@@ -404,7 +405,7 @@ var prepare_graph = function( graph_elem
                       data: {
                         type : 'node',
                         state : status,
-                        leader : 'true' === state[c][s][n].leader,
+                        leader : 'true' === replica.leader,
                         uri : uri_parts
                       }
                     };
@@ -715,4 +716,4 @@ sammy.get
       }
     );
   }
-);
\ No newline at end of file
+);

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cores.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cores.js?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cores.js (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/cores.js Thu Oct 25 13:10:25 2012
@@ -201,13 +201,13 @@ sammy.get
                   .html( core_data.index.maxDoc );
 
                 $( '.optimized dd', index_data_element )
-                  .addClass( core_data.index.optimized ? 'ico-1' : 'ico-0' );
+                  .addClass( !core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );
 
                 $( '#actions #optimize', cores_element )
                   .show();
 
                 $( '.optimized dd span', index_data_element )
-                  .html( core_data.index.optimized ? 'yes' : 'no' );
+                  .html( !core_data.index.hasDeletions ? 'yes' : 'no' );
 
                 $( '.current dd', index_data_element )
                   .addClass( core_data.index.current ? 'ico-1' : 'ico-0' );
@@ -215,12 +215,6 @@ sammy.get
                 $( '.current dd span', index_data_element )
                   .html( core_data.index.current ? 'yes' : 'no' );
 
-                $( '.hasDeletions dd', index_data_element )
-                  .addClass( core_data.index.hasDeletions ? 'ico-1' : 'ico-0' );
-
-                $( '.hasDeletions dd span', index_data_element )
-                  .html( core_data.index.hasDeletions ? 'yes' : 'no' );
-
                 $( '.directory dd', index_data_element )
                   .html
                   (

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/logging.js?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/logging.js Thu Oct 25 13:10:25 2012
@@ -317,6 +317,18 @@ var load_logging_viewer = function()
         for( var i = 0; i < docs_count; i++ )
         {
           var doc = docs[i];
+
+          if( !doc.trace )
+          {
+            var lines = doc.message.split( "\n" );
+            if( 1 < lines.length )
+            {
+              doc.message = lines[0];
+              doc.trace = doc.message;
+              delete lines;
+            }
+          }
+
           var has_trace = 'undefined' !== typeof( doc.trace );
 
           doc.logger = '<abbr title="' + doc.logger.esc() + '">' + doc.logger.split( '.' ).pop().esc() + '</abbr>';

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/schema-browser.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/schema-browser.js?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/schema-browser.js (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/js/scripts/schema-browser.js Thu Oct 25 13:10:25 2012
@@ -267,19 +267,23 @@ sammy.bind
       if( 'field' === type )
       {
         navigation_data.fields.push( value );
-        navigation_data.types.push( app.schema_browser_data.relations.f_t[value] );
+
+        if( app.schema_browser_data.relations.f_t[value] )
+        {
+          navigation_data.types.push( app.schema_browser_data.relations.f_t[value] );
+        }
 
         if( app.schema_browser_data.relations.f_df[value] )
         {
           navigation_data.dynamic_fields.push( app.schema_browser_data.relations.f_df[value] );
         }
 
-        if( 0 !== app.schema_browser_data.fields[value].copySources.length )
+        if( app.schema_browser_data.fields[value].copySources && 0 !== app.schema_browser_data.fields[value].copySources.length )
         {
           navigation_data.copyfield_source = app.schema_browser_data.fields[value].copySources;
         }
 
-        if( 0 !== app.schema_browser_data.fields[value].copyDests.length )
+        if( app.schema_browser_data.fields[value].copyDests && 0 !== app.schema_browser_data.fields[value].copyDests.length )
         {
           navigation_data.copyfield_dest = app.schema_browser_data.fields[value].copyDests;
         }
@@ -490,30 +494,39 @@ sammy.bind
 
                 for( var field in app.schema_browser_data.fields )
                 {
-                  app.schema_browser_data.fields[field].copySourcesRaw = null;
-
-                  if( app.schema_browser_data.fields[field].copySources &&
-                    0 !== app.schema_browser_data.fields[field].copySources.length )
+                  var copy_dests = app.schema_browser_data.fields[field].copyDests;
+                  for( var i in copy_dests )
                   {
-                    app.schema_browser_data.fields[field].copySourcesRaw =
-                      app.schema_browser_data.fields[field].copySources;
+                    var copy_dest = copy_dests[i];
+                    if( !app.schema_browser_data.fields[copy_dest] )
+                    {
+                      app.schema_browser_data.fields[copy_dest] = {
+                        partial : true,
+                        copySources : []
+                      };
+                    }
+
+                    if( app.schema_browser_data.fields[copy_dest].partial )
+                    {
+                      app.schema_browser_data.fields[copy_dest].copySources.push( field );
+                    }
                   }
-                                        
-                  app.schema_browser_data.fields[field].copyDests = [];
-                  app.schema_browser_data.fields[field].copySources = [];
-                }
 
-                for( var field in app.schema_browser_data.fields )
-                {
-                  if( app.schema_browser_data.fields[field].copySourcesRaw )
+                  var copy_sources = app.schema_browser_data.fields[field].copySources;
+                  for( var i in copy_sources )
                   {
-                    var copy_sources = app.schema_browser_data.fields[field].copySourcesRaw;
-                    for( var i in copy_sources )
+                    var copy_source = copy_sources[i];
+                    if( !app.schema_browser_data.fields[copy_source] )
                     {
-                      var target = copy_sources[i].replace( /^.+:(.+)\{.+$/, '$1' );
+                      app.schema_browser_data.fields[copy_source] = {
+                        partial : true,
+                        copyDests : []
+                      };
+                    }
 
-                      app.schema_browser_data.fields[field].copySources.push( target );
-                      app.schema_browser_data.fields[target].copyDests.push( field );
+                    if( app.schema_browser_data.fields[copy_source].partial )
+                    {
+                      app.schema_browser_data.fields[copy_source].copyDests.push( field );
                     }
                   }
 
@@ -763,6 +776,16 @@ sammy.get
         }
         $( '.name', head_element ).html( field.esc() );
 
+
+        var partial_state = false;
+        if( is_f )
+        {
+          partial_state = !!schema_browser_data.fields[field].partial;
+        }
+
+        $( '.partial', data_element )
+          .toggle( partial_state );
+
         // -- properties
         var properties_element = $( 'dt.properties', options_element );
         if( flags )

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/cores.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/cores.html?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/cores.html (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/cores.html Thu Oct 25 13:10:25 2012
@@ -194,11 +194,6 @@ limitations under the License.
                 <dd class="ico"><span></span></dd>
             </dl></li>
 
-            <li class="hasDeletions"><dl class="clearfix">
-              <dt><span>hasDeletions:</span></dt>
-                <dd class="ico"><span></span></dd>
-            </dl></li>
-
             <li class="directory"><dl class="clearfix">
               <dt><span>directory:</span></dt>
                 <dd></dd>

Modified: lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/schema-browser.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/schema-browser.html?rev=1402140&r1=1402139&r2=1402140&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/schema-browser.html (original)
+++ lucene/dev/branches/LUCENE-2878/solr/webapp/web/tpl/schema-browser.html Thu Oct 25 13:10:25 2012
@@ -31,6 +31,12 @@ limitations under the License.
             </h2>
           </div>
 
+          <div class="partial">
+
+            <p>Because your Index is empty, we have not enough Information about this Field</p>
+
+          </div>
+
           <dl class="options clearfix">
 
             <dt class="field-type">Field-Type:</dt>