You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/05/21 15:40:02 UTC

svn commit: r1341015 [4/4] - in /lucene/dev/branches/lucene4055: ./ lucene/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/ lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ lucene/analysis/co...

Modified: lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java Mon May 21 13:39:57 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Reusable base class for UpdateProcessors that will consider 
- * AddUpdateCommands and mutate the values assocaited with configured 
+ * AddUpdateCommands and mutate the values associated with configured
  * fields.
  * <p>
  * Subclasses should override the mutate method to specify how individual 

Modified: lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/util/FileUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/util/FileUtils.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/util/FileUtils.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/java/org/apache/solr/util/FileUtils.java Mon May 21 13:39:57 2012
@@ -29,9 +29,9 @@ public class FileUtils {
    * Resolves a path relative a base directory.
    *
    * <p>
-   * This method does what "new File(base,path)" <b>Should</b> do, it wasn't
+   * This method does what "new File(base,path)" <b>Should</b> do, if it wasn't
    * completely lame: If path is absolute, then a File for that path is returned;
-   * if it's not absoluve, then a File is returnd using "path" as a child 
+   * if it's not absolute, then a File is returned using "path" as a child
    * of "base")
    * </p>
    */

Modified: lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Mon May 21 13:39:57 2012
@@ -20,13 +20,21 @@ package org.apache.solr;
 import org.apache.lucene.search.FieldCache;
 import org.apache.noggit.JSONUtil;
 import org.apache.noggit.ObjectBuilder;
+import org.apache.solr.client.solrj.impl.BinaryResponseParser;
+import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.GroupParams;
 import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.request.SolrRequestInfo;
+import org.apache.solr.response.BinaryResponseWriter;
+import org.apache.solr.response.ResultContext;
+import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.schema.IndexSchema;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.*;
 
 public class TestGroupingSearch extends SolrTestCaseJ4 {
@@ -37,7 +45,7 @@ public class TestGroupingSearch extends 
 
   @BeforeClass
   public static void beforeTests() throws Exception {
-    initCore("solrconfig.xml","schema12.xml");
+    initCore("solrconfig.xml", "schema12.xml");
   }
 
   @Before
@@ -75,18 +83,18 @@ public class TestGroupingSearch extends 
             ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
             );
 
-    assertQ(req("q","title:title", "group", "true", "group.field","group_si")
-            ,"//lst[@name='grouped']/lst[@name='group_si']"
-            ,"*[count(//arr[@name='groups']/lst) = 2]"
-
-            ,"//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='2']"
-            ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
-            ,"//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='1']"
-            ,"//arr[@name='groups']/lst[2]/result[@numFound='3']"
-            ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='5']"
-            );
+    assertQ(req("q", "title:title", "group", "true", "group.field", "group_si")
+        , "//lst[@name='grouped']/lst[@name='group_si']"
+        , "*[count(//arr[@name='groups']/lst) = 2]"
+
+        , "//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='2']"
+        , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
+
+        , "//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='1']"
+        , "//arr[@name='groups']/lst[2]/result[@numFound='3']"
+        , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='5']"
+    );
   }
 
   @Test
@@ -117,19 +125,19 @@ public class TestGroupingSearch extends 
             ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
             );
 
-    assertQ(req("q","title:title", "group", "true", "group.field","group_si", "group.ngroups", "true")
-            ,"//lst[@name='grouped']/lst[@name='group_si']/int[@name='matches'][.='5']"
-            ,"//lst[@name='grouped']/lst[@name='group_si']/int[@name='ngroups'][.='2']"
-            ,"*[count(//arr[@name='groups']/lst) = 2]"
-
-            ,"//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='2']"
-            ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
-            ,"//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='1']"
-            ,"//arr[@name='groups']/lst[2]/result[@numFound='3']"
-            ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='5']"
-            );
+    assertQ(req("q", "title:title", "group", "true", "group.field", "group_si", "group.ngroups", "true")
+        , "//lst[@name='grouped']/lst[@name='group_si']/int[@name='matches'][.='5']"
+        , "//lst[@name='grouped']/lst[@name='group_si']/int[@name='ngroups'][.='2']"
+        , "*[count(//arr[@name='groups']/lst) = 2]"
+
+        , "//arr[@name='groups']/lst[1]/int[@name='groupValue'][.='2']"
+        , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
+
+        , "//arr[@name='groups']/lst[2]/int[@name='groupValue'][.='1']"
+        , "//arr[@name='groups']/lst[2]/result[@numFound='3']"
+        , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='5']"
+    );
   }
 
   @Test
@@ -141,22 +149,22 @@ public class TestGroupingSearch extends 
     assertU(add(doc("id", "5","name", "author3", "title", "the title of a title")));
     assertU(commit());
 
-    assertQ(req("q","title:title", "group", "true", "group.field","name", "sort", "score desc", "group.sort", "score desc")
-            ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author2']"
-    //        ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
-            ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
-
-            ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author1']"
-    //        ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
-            ,"//arr[@name='groups']/lst[2]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='2']"
-
-            ,"//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author3']"
-    //        ,"//arr[@name='groups']/lst[3]/int[@name='matches'][.='1']"
-            ,"//arr[@name='groups']/lst[3]/result[@numFound='1']"
-            ,"//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
-            );
+    assertQ(req("q", "title:title", "group", "true", "group.field", "name", "sort", "score desc", "group.sort", "score desc")
+        , "//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author2']"
+        //        ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
+        , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='4']"
+
+        , "//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author1']"
+        //        ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
+        , "//arr[@name='groups']/lst[2]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='2']"
+
+        , "//arr[@name='groups']/lst[3]/str[@name='groupValue'][.='author3']"
+        //        ,"//arr[@name='groups']/lst[3]/int[@name='matches'][.='1']"
+        , "//arr[@name='groups']/lst[3]/result[@numFound='1']"
+        , "//arr[@name='groups']/lst[3]/result/doc/*[@name='id'][.='5']"
+    );
   }
 
 
@@ -168,18 +176,18 @@ public class TestGroupingSearch extends 
     assertU(add(doc("id", "4","name", "author2", "weight", "0.11")));
     assertU(commit());
 
-    assertQ(req("q","*:*", "group", "true", "group.field","name", "sort", "id asc", "group.sort", "weight desc")
-            ,"*[count(//arr[@name='groups']/lst) = 2]"
-            ,"//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author1']"
-    //        ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
-            ,"//arr[@name='groups']/lst[1]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='1']"
-
-            ,"//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author2']"
-    //        ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
-            ,"//arr[@name='groups']/lst[2]/result[@numFound='2']"
-            ,"//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
-            );
+    assertQ(req("q", "*:*", "group", "true", "group.field", "name", "sort", "id asc", "group.sort", "weight desc")
+        , "*[count(//arr[@name='groups']/lst) = 2]"
+        , "//arr[@name='groups']/lst[1]/str[@name='groupValue'][.='author1']"
+        //        ,"//arr[@name='groups']/lst[1]/int[@name='matches'][.='2']"
+        , "//arr[@name='groups']/lst[1]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[1]/result/doc/*[@name='id'][.='1']"
+
+        , "//arr[@name='groups']/lst[2]/str[@name='groupValue'][.='author2']"
+        //        ,"//arr[@name='groups']/lst[2]/int[@name='matches'][.='2']"
+        , "//arr[@name='groups']/lst[2]/result[@numFound='2']"
+        , "//arr[@name='groups']/lst[2]/result/doc/*[@name='id'][.='4']"
+    );
   }
 
   @Test
@@ -215,6 +223,37 @@ public class TestGroupingSearch extends 
   }
 
   @Test
+  public void testGroupingSimpleFormatArrayIndexOutOfBoundsExceptionWithJavaBin() throws Exception {
+    assertU(add(doc("id", "1", "nullfirst", "1")));
+    assertU(add(doc("id", "2", "nullfirst", "1")));
+    assertU(add(doc("id", "3", "nullfirst", "2")));
+    assertU(add(doc("id", "4", "nullfirst", "2")));
+    assertU(add(doc("id", "5", "nullfirst", "2")));
+    assertU(add(doc("id", "6", "nullfirst", "3")));
+    assertU(commit());
+
+    SolrQueryRequest request =
+        req("q", "*:*","group", "true", "group.field", "nullfirst", "group.main", "true", "wt", "javabin", "start", "4", "rows", "10");
+
+    SolrQueryResponse response = new SolrQueryResponse();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    try {
+      SolrRequestInfo.setRequestInfo(new SolrRequestInfo(request, response));
+      String handlerName = request.getParams().get(CommonParams.QT);
+      h.getCore().execute(h.getCore().getRequestHandler(handlerName), request, response);
+      BinaryResponseWriter responseWriter = new BinaryResponseWriter();
+      responseWriter.write(out, request, response);
+    } finally {
+      request.close();
+      SolrRequestInfo.clearRequestInfo();
+    }
+
+    assertEquals(6, ((ResultContext) response.getValues().get("response")).docs.matches());
+    new BinaryResponseParser().processResponse(new ByteArrayInputStream(out.toByteArray()), "");
+    out.close();
+  }
+
+  @Test
   public void testGroupingWithTimeAllowed() throws Exception {
     assertU(add(doc("id", "1")));
     assertU(add(doc("id", "2")));
@@ -530,9 +569,9 @@ public class TestGroupingSearch extends 
     );
 
     ///////////////////////// group.format == simple
-    assertJQ(req("fq",filt,  "q","{!func}"+f2, "group","true", "group.field",f, "fl","id", "rows","3", "start","1", "group.limit","2", "group.format","simple")
-    , "/grouped/foo_i=={'matches':10,'doclist':"
-        +"{'numFound':10,'start':1,'docs':[{'id':'10'},{'id':'3'},{'id':'6'}]}}"
+    assertJQ(req("fq", filt, "q", "{!func}" + f2, "group", "true", "group.field", f, "fl", "id", "rows", "3", "start", "1", "group.limit", "2", "group.format", "simple")
+        , "/grouped/foo_i=={'matches':10,'doclist':"
+        + "{'numFound':10,'start':1,'docs':[{'id':'10'},{'id':'3'},{'id':'6'}]}}"
     );
   }
 

Modified: lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java Mon May 21 13:39:57 2012
@@ -17,6 +17,7 @@
 package org.apache.solr.core;
 
 import org.apache.lucene.index.IndexCommit;
+import org.apache.lucene.util.Constants;
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -109,6 +110,9 @@ public class TestSolrDeletionPolicy1 ext
 
   @Test
   public void testCommitAge() throws InterruptedException {
+    assumeFalse("This test is not working on Windows (or maybe machines with only 2 CPUs)",
+      Constants.WINDOWS);
+  
     IndexDeletionPolicyWrapper delPolicy = h.getCore().getDeletionPolicy();
     addDocs();
     Map<Long, IndexCommit> commits = delPolicy.getCommits();

Modified: lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java Mon May 21 13:39:57 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.Constants;
 import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
@@ -1213,6 +1214,7 @@ public class TestRealTimeGet extends Sol
   // and tests the ability to buffer updates and apply them later
   @Test
   public void testStressRecovery() throws Exception {
+    assumeFalse("FIXME: This test is horribly slow sometimes on Windows!", Constants.WINDOWS);
     clearIndex();
     assertU(commit());
 

Modified: lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java Mon May 21 13:39:57 2012
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEqu
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.apache.lucene.util.Constants;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.core.SolrEventListener;
@@ -62,6 +63,9 @@ public class SoftAutoCommitTest extends 
     
   @Before
   public void createMonitor() throws Exception {
+    assumeFalse("This test is not working on Windows (or maybe machines with only 2 CPUs)",
+      Constants.WINDOWS);
+  
     SolrCore core = h.getCore();
 
     updater = (DirectUpdateHandler2) core.getUpdateHandler();

Modified: lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java (original)
+++ lucene/dev/branches/lucene4055/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java Mon May 21 13:39:57 2012
@@ -614,7 +614,7 @@ public class FieldMutatingUpdateProcesso
   }
 
   /** 
-   * Convinience method for building up SolrInputDocuments
+   * Convenience method for building up SolrInputDocuments
    */
   SolrInputDocument doc(SolrInputField... fields) {
     SolrInputDocument d = new SolrInputDocument();
@@ -625,7 +625,7 @@ public class FieldMutatingUpdateProcesso
   }
 
   /** 
-   * Convinience method for building up SolrInputFields
+   * Convenience method for building up SolrInputFields
    */
   SolrInputField field(String name, float boost, Object... values) {
     SolrInputField f = new SolrInputField(name);
@@ -637,7 +637,7 @@ public class FieldMutatingUpdateProcesso
   }
 
   /** 
-   * Convinience method for building up SolrInputFields with default boost
+   * Convenience method for building up SolrInputFields with default boost
    */
   SolrInputField f(String name, Object... values) {
     return field(name, 1.0F, values);
@@ -647,7 +647,7 @@ public class FieldMutatingUpdateProcesso
   /**
    * Runs a document through the specified chain, and returns the final 
    * document used when the chain is completed (NOTE: some chains may 
-   * modifiy the document in place
+   * modify the document in place
    */
   SolrInputDocument processAdd(final String chain, 
                                final SolrInputDocument docIn) 

Modified: lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/schema.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/schema.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/schema.xml Mon May 21 13:39:57 2012
@@ -19,14 +19,16 @@
 <schema name="example core zero" version="1.1">
   <types>
    <fieldtype name="string"  class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+   <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
   </types>
 
  <fields>   
   <!-- general -->
-  <field name="id"      type="string"   indexed="true"  stored="true"  multiValued="false" required="true"/>
-  <field name="type"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
-  <field name="name"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
-  <field name="core0"   type="string"   indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="id"        type="string"   indexed="true"  stored="true"  multiValued="false" required="true"/>
+  <field name="type"      type="string"   indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="name"      type="string"   indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="core0"     type="string"   indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="_version_" type="long"     indexed="true"  stored="true"/>
  </fields>
 
  <!-- field to use to determine and enforce document uniqueness. -->

Modified: lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/solrconfig.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/multicore/core0/conf/solrconfig.xml Mon May 21 13:39:57 2012
@@ -29,16 +29,41 @@
 
   <dataDir>${solr.core0.data.dir:}</dataDir>
 
-  <updateHandler class="solr.DirectUpdateHandler2" />
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.core0.data.dir:}</str>
+    </updateLog>
+  </updateHandler>
+
+  <!-- realtime get handler, guaranteed to return the latest stored fields 
+    of any document, without the need to commit or open a new searcher. The current 
+    implementation relies on the updateLog feature being enabled. -->
+  <requestHandler name="/get" class="solr.RealTimeGetHandler">
+    <lst name="defaults">
+      <str name="omitHeader">true</str>
+    </lst>
+  </requestHandler>  
+  
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
 
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
   <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-      
+     
+  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
+    <lst name="invariants">
+      <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+  </requestHandler>
+   
   <!-- config for the admin interface --> 
   <admin>
     <defaultQuery>solr</defaultQuery>

Modified: lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/schema.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/schema.xml Mon May 21 13:39:57 2012
@@ -19,14 +19,16 @@
 <schema name="example core one" version="1.1">
   <types>
    <fieldtype name="string"  class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+   <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
   </types>
 
  <fields>   
   <!-- general -->
-  <field name="id"       type="string"    indexed="true"  stored="true"  multiValued="false" required="true"/>
-  <field name="type"     type="string"    indexed="true"  stored="true"  multiValued="false" /> 
-  <field name="name"     type="string"    indexed="true"  stored="true"  multiValued="false" /> 
-  <field name="core1"    type="string"    indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="id"        type="string"    indexed="true"  stored="true"  multiValued="false" required="true"/>
+  <field name="type"      type="string"    indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="name"      type="string"    indexed="true"  stored="true"  multiValued="false" /> 
+  <field name="core1"     type="string"    indexed="true"  stored="true"  multiValued="false" />
+  <field name="_version_" type="long"      indexed="true"  stored="true"/>
  </fields>
 
  <!-- field to use to determine and enforce document uniqueness. -->

Modified: lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/solrconfig.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/multicore/core1/conf/solrconfig.xml Mon May 21 13:39:57 2012
@@ -29,16 +29,41 @@
 
   <dataDir>${solr.core1.data.dir:}</dataDir>
 
-  <updateHandler class="solr.DirectUpdateHandler2" />
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.core1.data.dir:}</str>
+    </updateLog>
+  </updateHandler>
+
+  <!-- realtime get handler, guaranteed to return the latest stored fields 
+    of any document, without the need to commit or open a new searcher. The current 
+    implementation relies on the updateLog feature being enabled. -->
+  <requestHandler name="/get" class="solr.RealTimeGetHandler">
+    <lst name="defaults">
+      <str name="omitHeader">true</str>
+    </lst>
+  </requestHandler>
+  
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
 
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
   
   <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-      
+
+  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
+    <lst name="invariants">
+      <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+  </requestHandler>
+
   <!-- config for the admin interface --> 
   <admin>
     <defaultQuery>solr</defaultQuery>

Modified: lucene/dev/branches/lucene4055/solr/example/multicore/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/multicore/solr.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/multicore/solr.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/multicore/solr.xml Mon May 21 13:39:57 2012
@@ -28,7 +28,7 @@
   adminPath: RequestHandler path to manage cores.  
     If 'null' (or absent), cores will not be manageable via request handler
   -->
-  <cores adminPath="/admin/cores">
+  <cores adminPath="/admin/cores" host="${host:}" hostPort="${jetty.port:}">
     <core name="core0" instanceDir="core0" />
     <core name="core1" instanceDir="core1" />
   </cores>

Modified: lucene/dev/branches/lucene4055/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/solr/conf/solrconfig.xml?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene4055/solr/example/solr/conf/solrconfig.xml Mon May 21 13:39:57 2012
@@ -1261,12 +1261,13 @@
 
        http://wiki.apache.org/solr/ClusteringComponent
 
-       You'll need to set the solr.cluster.enabled system property 
+       You'll need to set the solr.cluster.enabled system property
        when running solr to run with clustering enabled:
 
-       java -Dsolr.clustering.enabled=true -jar start.jar
+            java -Dsolr.clustering.enabled=true -jar start.jar
+
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->

Modified: lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/VM_global_library.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/VM_global_library.vm?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/VM_global_library.vm (original)
+++ lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/VM_global_library.vm Mon May 21 13:39:57 2012
@@ -1,7 +1,10 @@
 
 #macro(param $key)$request.params.get($key)#end
 
-#macro(url_for_solr)/solr#if($request.core.name != "")/$request.core.name#end#end
+#macro(url_root)/solr#end
+
+## TODO: s/url_for_solr/url_for_core/ and s/url_root/url_for_solr/
+#macro(url_for_solr)#{url_root}#if($request.core.name != "")/$request.core.name#end#end
 #macro(url_for_home)#url_for_solr/browse#end
 
 #macro(q)&q=$!{esc.url($params.get('q'))}#end

Modified: lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/head.vm?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/head.vm (original)
+++ lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/head.vm Mon May 21 13:39:57 2012
@@ -3,7 +3,7 @@
     <title>#param('title')</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
 
-  <script type="text/javascript" src="#{url_for_solr}/js/lib/jquery-1.7.2.min.js"></script>
+  <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>

Modified: lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/header.vm?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/header.vm (original)
+++ lucene/dev/branches/lucene4055/solr/example/solr/conf/velocity/header.vm Mon May 21 13:39:57 2012
@@ -1,3 +1,3 @@
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_for_solr}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
 </div>
\ No newline at end of file

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/admin.html?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/admin.html (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/admin.html Mon May 21 13:39:57 2012
@@ -76,12 +76,30 @@ limitations under the License.
         <div>
                   
           <ul id="menu">
+
             <li id="index" class="global"><p><a href="#/">Dashboard</a></p></li>
-            <li id="logging" class="global"><p><a href="#/~logging">Logging</a></p></li>
-            <li id="cloud" class="global optional"><p><a href="#/~cloud">Cloud</a></p></li>
-            <li id="cores" class="global optional"><p><a href="#/~cores">Core Admin</a></p></li>
+
+            <li id="logging" class="global"><p><a href="#/~logging">Logging</a></p>
+              <ul>
+                <li class="level"><a href="#/~logging/level">Level</a></li>
+              </ul>
+            </li>
+
+            <li id="cloud" class="global optional"><p><a href="#/~cloud">Cloud</a></p>
+              <ul>
+                <li class="tree"><a href="#/~cloud">Tree</a></li>
+                <li class="graph"><a href="#/~cloud?view=graph">Graph</a></li>
+                <li class="rgraph"><a href="#/~cloud?view=rgraph">Graph (Radial)</a></li>
+                <li class="dump"><a href="#/~cloud">Dump</a></li>
+              </ul>
+            </li>
+
+            <li id="cores" class="global"><p><a href="#/~cores">Core Admin</a></p></li>
+
             <li id="java-properties" class="global"><p><a href="#/~java-properties">Java Properties</a></li>
+
             <li id="threads" class="global"><p><a href="#/~threads">Thread Dump</a></p></li>
+            
           </ul>
 
           <ul id="menu-selector">

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/cloud.css?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/cloud.css Mon May 21 13:39:57 2012
@@ -3,32 +3,6 @@
   position: relative;
 }
 
-#content #cloud #navigation
-{
-  width: 11%;
-}
-
-#content #cloud #navigation .tree a { background-image: url( ../../img/ico/folder-tree.png ); }
-#content #cloud #navigation .graph a { background-image: url( ../../img/ico/molecule.png ); }
-#content #cloud #navigation .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
-#content #cloud #navigation .dump a { background-image: url( ../../img/ico/download-cloud.png ); }
-
-#content #cloud #navigation .dump
-{
-  margin-top: 10px;
-}
-
-#content #cloud #navigation .dump a:hover
-{
-  color: #008;
-}
-
-#content #cloud #frame
-{
-  float: right;
-  width: 88%;
-}
-
 #content #cloud #frame .content
 {
   display: none;
@@ -262,17 +236,17 @@
   stroke-width: 1.5px;
 }
 
-#content #graph-content .node.lvl-2 text
+#content #graph-content .node.lvl-3 text
 {
   cursor: pointer;
 }
 
-#content #graph-content .node.lvl-2:hover circle
+#content #graph-content .node.lvl-3:hover circle
 {
   stroke: #000 !important;
 }
 
-#content #graph-content .node.lvl-2:hover text
+#content #graph-content .node.lvl-3:hover text
 {
   fill: #000 !important;
 }
@@ -340,8 +314,18 @@
   fill: #000;
 }
 
-#content #graph-content .link.lvl-1,
+#content #graph-content .link.lvl-2,
 #content #graph-content .link.leader
 {
   stroke: #c0c0c0;
+}
+
+#content #graph-content .node.lvl-0 circle
+{
+  stroke: #fff;
+}
+
+#content #graph-content .link.lvl-1
+{
+  stroke: #fff;
 }
\ No newline at end of file

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/logging.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/logging.css?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/logging.css Mon May 21 13:39:57 2012
@@ -1,17 +1,3 @@
-#content #logging #navigation
-{
-  width: 8%;
-}
-
-#content #logging #navigation .viewer a { background-image: url( ../../img/ico/document-text.png ); }
-#content #logging #navigation .level a { background-image: url( ../../img/ico/gear.png ); }
-
-#content #logging #frame
-{
-  float: right;
-  width: 90%;
-}
-
 #content #logging .loader
 {
   background-position: 0 50%;

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/menu.css?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/css/styles/menu.css Mon May 21 13:39:57 2012
@@ -17,7 +17,8 @@
   border-color: #c0c0c0;
 }
 
-#menu-wrapper p a
+#menu-wrapper p a,
+#menu a
 {
   background-position: 5px 50%;
   padding-left: 26px;
@@ -138,19 +139,27 @@
   background-image: url( ../../img/ico/box.png );
 }
 
-#menu-selector ul
+#menu-selector ul,
+#menu ul
 {
   display: none;
   padding-top: 5px;
   padding-bottom: 10px;
 }
 
-#menu-selector .active ul
+#menu-selector .active ul,
+#menu .active ul
 {
   display: block;
 }
 
-#menu-selector ul li a
+#menu ul li
+{
+  border-bottom: 0;
+}
+
+#menu-selector ul li a,
+#menu ul li a
 {
   background-position: 7px 50%;
   border-bottom: 1px solid #f0f0f0;
@@ -159,18 +168,21 @@
   padding-left: 26px;
 }
 
-#menu-selector ul li:last-child a
+#menu-selector ul li:last-child a,
+#menu ul li:last-child a
 {
   border-bottom: 0;
 }
 
-#menu-selector ul li a:hover
+#menu-selector ul li a:hover,
+#menu ul li a:hover
 {
   background-color: #f0f0f0;
   color: #333;
 }
 
-#menu-selector ul li.active a
+#menu-selector ul li.active a,
+#menu ul li.active a
 {
   background-color: #d0d0d0;
   border-color: #d0d0d0;
@@ -178,11 +190,21 @@
 }
 
 #menu #index.global p a { background-image: url( ../../img/ico/dashboard.png ); }
+
 #menu #logging.global p a { background-image: url( ../../img/ico/inbox-document-text.png ); }
+#menu #logging.global .level a { background-image: url( ../../img/ico/gear.png ); }
+
 #menu #java-properties.global p a { background-image: url( ../../img/ico/jar.png ); }
+
 #menu #threads.global p a { background-image: url( ../../img/ico/ui-accordion.png ); }
+
 #menu #cores.global p a { background-image: url( ../../img/ico/databases.png ); }
+
 #menu #cloud.global p a { background-image: url( ../../img/ico/network-cloud.png ); }
+#menu #cloud.global .tree a { background-image: url( ../../img/ico/folder-tree.png ); }
+#menu #cloud.global .graph a { background-image: url( ../../img/ico/molecule.png ); }
+#menu #cloud.global .rgraph a { background-image: url( ../../img/ico/asterisk.png ); }
+#menu #cloud.global .dump a { background-image: url( ../../img/ico/download-cloud.png ); }
 
 #menu-selector .ping.error a
 {

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/js/lib/d3.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/js/lib/d3.js?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/js/lib/d3.js (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/js/lib/d3.js Mon May 21 13:39:57 2012
@@ -1,3 +1,34 @@
+/*
+
+Copyright (c) 2012, Michael Bostock
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* The name Michael Bostock may not be used to endorse or promote products
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
 (function(){if (!Date.now) Date.now = function() {
   return +new Date;
 };

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/analysis.js?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/analysis.js Mon May 21 13:39:57 2012
@@ -129,7 +129,7 @@ sammy.get
                 {
                   fields++;
                   $( '[name="' + key + '"]', analysis_form )
-                    .val( context.params[key] );
+                    .val( decodeURIComponent( context.params[key].replace( /\+/g, '%20' ) ) );
                 }
               }
 

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/app.js?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/app.js Mon May 21 13:39:57 2012
@@ -131,7 +131,7 @@ var sammy = $.sammy
 
 var solr_admin = function( app_config )
 {
-	self = this,
+  self = this,
 
   menu_element = null,
 
@@ -168,41 +168,29 @@ var solr_admin = function( app_config )
         {
           self.cores_data = response.status;
 
-          var core_count = 0; for( var i in response.status ) { core_count++; }
-          is_multicore = core_count > 1;
-
-          if( is_multicore )
-          {
-            self.menu_element
-              .addClass( 'multicore' );
-
-            $( '#cores', menu_element )
-              .show();
-          }
-          else
-          {
-            self.menu_element 
-              .addClass( 'singlecore' );
-          }
-
           for( var core_name in response.status )
           {
             var core_path = config.solr_path + '/' + core_name;
             var schema =  response['status'][core_name]['schema'];
             var solrconfig =  response['status'][core_name]['config'];
-			
-            if( !core_name )
-            {
-              core_name = 'singlecore';
-              core_path = config.solr_path
-            }
+            var classes = [];
 
             if( !environment_basepath )
             {
               environment_basepath = core_path;
             }
 
-            var core_tpl = '<li id="' + core_name + '" data-basepath="' + core_path + '" schema="' + schema + '" config="' + solrconfig + '">' + "\n"
+            if( response['status'][core_name]['isDefaultCore'] )
+            {
+              classes.push( 'default' );
+            }
+
+            var core_tpl = '<li id="' + core_name + '" '
+                         + '    class="' + classes.join( ' ' ) + '"'
+                         + '    data-basepath="' + core_path + '"'
+                         + '    schema="' + schema + '"'
+                         + '    config="' + solrconfig + '"'
+                         + '>' + "\n"
                          + '  <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
                          + '  <ul>' + "\n"
 
@@ -213,7 +201,7 @@ var solr_admin = function( app_config )
                          + '    <li class="replication"><a href="#/' + core_name + '/replication"><span>Replication</span></a></li>' + "\n"
                          + '    <li class="analysis"><a href="#/' + core_name + '/analysis"><span>Analysis</span></a></li>' + "\n"
                          + '    <li class="schema-browser"><a href="#/' + core_name + '/schema-browser"><span>Schema Browser</span></a></li>' + "\n"
-                         + '    <li class="plugins"><a href="#/' + core_name + '/plugins"><span>Plugins</span></a></li>' + "\n"
+                         + '    <li class="plugins"><a href="#/' + core_name + '/plugins"><span>Plugins / Stats</span></a></li>' + "\n"
                          + '    <li class="dataimport"><a href="#/' + core_name + '/dataimport"><span>Dataimport</span></a></li>' + "\n"
 
                          + '    </ul>' + "\n"

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/cloud.js?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/cloud.js Mon May 21 13:39:57 2012
@@ -18,7 +18,7 @@
 var init_debug = function( cloud_element )
 {
   var debug_element = $( '#debug', cloud_element );
-  var debug_button = $( '.dump a', cloud_element );
+  var debug_button = $( '#menu #cloud .dump a' );
 
   var clipboard_element = $( '.clipboard', debug_element );
   var clipboard_button = $( 'a', clipboard_element );
@@ -65,7 +65,6 @@ var init_debug = function( cloud_element
       'show',
       function( event )
       {
-        debug_button.hide();
         debug_element.show();
 
         $.ajax
@@ -147,7 +146,6 @@ var init_debug = function( cloud_element
 
         clipboard_client.destroy();
 
-        debug_button.show();
         debug_element.hide();
       }
     );
@@ -158,12 +156,12 @@ var helper_path_class = function( p )
   var classes = [ 'link' ];
   classes.push( 'lvl-' + p.target.depth );
 
-  if( p.target.data.leader )
+  if( p.target.data && p.target.data.leader )
   {
     classes.push( 'leader' );
   }
 
-  if( p.target.data.state )
+  if( p.target.data && p.target.data.state )
   {
     classes.push( p.target.data.state );
   }
@@ -176,12 +174,12 @@ var helper_node_class = function( d )
   var classes = [ 'node' ];
   classes.push( 'lvl-' + d.depth );
 
-  if( d.data.leader )
+  if( d.data && d.data.leader )
   {
     classes.push( 'leader' );
   }
 
-  if( d.data.state )
+  if( d.data && d.data.state )
   {
     classes.push( d.data.state );
   }
@@ -199,7 +197,7 @@ var helper_data = {
 
 var helper_node_text = function( d )
 {
-  if( !d.data.uri )
+  if( !d.data || !d.data.uri )
   {
     return d.name;
   }
@@ -363,7 +361,11 @@ var prepare_graph = function( graph_elem
               eval( 'state = ' + response.znode.data + ';' );
               
               var leaf_count = 0;
-              var collections = [];
+              var graph_data = {
+                name: null,
+                children : []
+              };
+
               for( var c in state )
               {
                 var shards = [];
@@ -426,10 +428,8 @@ var prepare_graph = function( graph_elem
                   },
                   children: shards
                 };
-                collections.push( collection );
+                graph_data.children.push( collection );
               }
-
-              var graph_data = collections.shift();
               
               helper_data.protocol = $.unique( helper_data.protocol );
               helper_data.host = $.unique( helper_data.host );
@@ -675,7 +675,7 @@ sammy.get
           .html( template );
 
         var cloud_element = $( '#cloud', content_element );
-        var navigation_element = $( '#navigation', content_element );
+        var navigation_element = $( '#menu #cloud' );
 
         init_debug( cloud_element );
 
@@ -686,7 +686,7 @@ sammy.get
             'activate',
             function( event )
             {
-              $( this ).addClass( 'current' );
+              $( this ).addClass( 'active' );
               init_tree( $( '#tree-content', cloud_element ) );
             }
           );
@@ -698,7 +698,7 @@ sammy.get
             'activate',
             function( event )
             {
-              $( this ).addClass( 'current' );
+              $( this ).addClass( 'active' );
               init_graph( $( '#graph-content', cloud_element ) );
             }
           );
@@ -710,7 +710,7 @@ sammy.get
             'activate',
             function( event )
             {
-              $( this ).addClass( 'current' );
+              $( this ).addClass( 'active' );
               init_rgraph( $( '#graph-content', cloud_element ) );
             }
           );

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/logging.js?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/js/scripts/logging.js Mon May 21 13:39:57 2012
@@ -398,9 +398,6 @@ sammy.get
         content_element
           .html( template );
 
-        $( '#navigation a[href="' + context.path + '"]', content_element )
-          .parent().addClass( 'current' );
-
         frame_element = $( '#frame', content_element );
         frame_element
           .html
@@ -472,7 +469,7 @@ sammy.get
 // #/~logging/level
 sammy.get
 (
-  /^#\/~(logging)\/level$/,
+  /^#\/(~logging)\/level$/,
   function( context )
   {
     var core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' );
@@ -487,8 +484,8 @@ sammy.get
         content_element
           .html( template );
 
-        $( '#navigation a[href="' + context.path + '"]', content_element )
-          .parent().addClass( 'current' );
+        $( '#menu a[href="' + context.path + '"]' )
+          .parent().addClass( 'active' );
                       
         $.ajax
         (

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/tpl/cloud.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/tpl/cloud.html?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/tpl/cloud.html (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/tpl/cloud.html Mon May 21 13:39:57 2012
@@ -43,23 +43,12 @@ limitations under the License.
 
   </div>
 
-  <div id="navigation" class="clearfix">
-
-    <ul>
-      <li class="tree"><a href="#/~cloud">Tree</a></li>
-      <li class="graph"><a href="#/~cloud?view=graph">Graph</a></li>
-      <li class="rgraph"><a href="#/~cloud?view=rgraph">Graph (Radial)</a></li>
-      <li class="dump"><a href="#/~cloud">Dump</a></li>
+  <div id="debug">
+    <ul class="clearfix">
+      <li class="clipboard"><a href="#" data-copied="Copied to Clipboard!">Copy to Clipboard (BUGGY!)</a></li>
+      <li class="close"><a href="#">Close</a></li>
     </ul>
-
-    <div id="debug">
-      <ul class="clearfix">
-        <li class="clipboard"><a href="#" data-copied="Copied to Clipboard!">Copy to Clipboard (BUGGY!)</a></li>
-        <li class="close"><a href="#">Close</a></li>
-      </ul>
-      <pre class="debug"></pre>
-    </div>
-
+    <pre class="debug"></pre>
   </div>
 
 </div>
\ No newline at end of file

Modified: lucene/dev/branches/lucene4055/solr/webapp/web/tpl/logging.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/solr/webapp/web/tpl/logging.html?rev=1341015&r1=1341014&r2=1341015&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/solr/webapp/web/tpl/logging.html (original)
+++ lucene/dev/branches/lucene4055/solr/webapp/web/tpl/logging.html Mon May 21 13:39:57 2012
@@ -20,13 +20,4 @@ limitations under the License.
 
   </div>
 
-  <div id="navigation" class="clearfix">
-
-    <ul>
-      <li class="viewer"><a href="#/~logging">Viewer</a></li>
-      <li class="level"><a href="#/~logging/level">Level</a></li>
-    </ul>
-  
-  </div>
-
 </div>