lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1297785 [16/16] - in /lucene/dev/branches/lucene3795_lsp_spatial_module: ./ dev-tools/eclipse/ dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/demo/ dev-tools/maven/lucene/contrib/highlighter/ dev-tools/maven/lucene...
Date Tue, 06 Mar 2012 23:17:23 GMT
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
(original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
Tue Mar  6 23:17:08 2012
@@ -29,6 +29,7 @@ import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.SystemPropertiesRestoreRule;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -43,7 +44,10 @@ import org.apache.solr.core.CoreContaine
 import org.apache.solr.util.AbstractSolrTestCase;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -59,6 +63,10 @@ public class TestSolrProperties extends 
   private File home;
   private File solrXml;
   
+  @Rule
+  public TestRule solrTestRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+
   private static final XPathFactory xpathFactory = XPathFactory.newInstance();
 
   public String getSolrHome() {
@@ -244,6 +252,43 @@ public class TestSolrProperties extends 
     } finally {
       fis.close();
     }
+    
+    coreadmin = getRenamedSolrAdmin();
+    CoreAdminRequest.createCore("newCore", home.getAbsolutePath(), coreadmin);
+    
+//    fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+//    solrPersistXml = IOUtils.toString(fis);
+//    System.out.println("xml:" + solrPersistXml);
+//    fis.close();
+    
+    mcr = CoreAdminRequest.persist("solr-persist.xml", getRenamedSolrAdmin());
+    
+//    fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+//    solrPersistXml = IOUtils.toString(fis);
+//    System.out.println("xml:" + solrPersistXml);
+//    fis.close();
+    
+    fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+    try {
+      Document document = builder.parse(fis);
+      assertTrue(exists("/solr/cores/core[@name='collection1' and (@instanceDir='./' or @instanceDir='.\\')]",
document));
+    } finally {
+      fis.close();
+    }
+    
+    // test reload and parse
+    cores.shutdown();
+    
+    cores = new CoreContainer(home.getAbsolutePath(), new File(solrXml.getParent(), "solr-persist.xml"));

+ 
+    
+    mcr = CoreAdminRequest.persist("solr-persist.xml", getRenamedSolrAdmin());
+    
+//     fis = new FileInputStream(new File(solrXml.getParent(),
+//     "solr-persist.xml"));
+//     solrPersistXml = IOUtils.toString(fis);
+//     System.out.println("xml:" + solrPersistXml);
+//     fis.close();
   }
   
   public static boolean exists(String xpathStr, Node node)

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
(original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Tue Mar  6 23:17:08 2012
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.solr.client.solrj.SolrServer;
@@ -652,7 +653,7 @@ public abstract class BaseDistributedSea
     cmp = compare(a.getResponse(), b.getResponse(), flags, handle);
     if (cmp != null) {
       log.error("Mismatched responses:\n" + a + "\n" + b);
-      TestCase.fail(cmp);
+      Assert.fail(cmp);
     }
   }
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
(original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Tue Mar  6 23:17:08 2012
@@ -19,8 +19,25 @@
 package org.apache.solr;
 
 
-import org.apache.lucene.store.MockDirectoryWrapper;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+
+import javax.xml.xpath.XPathExpressionException;
+
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.SystemPropertiesInvariantRule;
+import org.apache.lucene.util.SystemPropertiesRestoreRule;
 import org.apache.noggit.CharArr;
 import org.apache.noggit.JSONUtil;
 import org.apache.noggit.ObjectBuilder;
@@ -45,16 +62,14 @@ import org.apache.solr.servlet.DirectSol
 import org.apache.solr.util.TestHarness;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-import javax.xml.xpath.XPathExpressionException;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.*;
-
 /**
  * A junit4 Solr test harness that extends LuceneTestCaseJ4.
  * Unlike AbstractSolrTestCase, a new core is not created for each test method.
@@ -62,8 +77,17 @@ import java.util.*;
  */
 public abstract class SolrTestCaseJ4 extends LuceneTestCase {
 
+  @ClassRule
+  public static TestRule solrClassRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+
+  @Rule
+  public TestRule solrTestRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+
   @BeforeClass
   public static void beforeClassSolrTestCase() throws Exception {
+    setupLogging();
     startTrackingSearchers();
     startTrackingZkClients();
     ignoreException("ignore_exception");
@@ -89,6 +113,34 @@ public abstract class SolrTestCaseJ4 ext
     super.tearDown();
   }
 
+  public static SolrLogFormatter formatter;
+
+  public static void setupLogging() {
+    boolean register = false;
+    Handler[] handlers = java.util.logging.Logger.getLogger("").getHandlers();
+    ConsoleHandler consoleHandler = null;
+    for (Handler handler : handlers) {
+      if (handler instanceof ConsoleHandler) {
+        consoleHandler = (ConsoleHandler)handler;
+        break;
+      }
+    }
+
+    if (consoleHandler == null) {
+      consoleHandler = new ConsoleHandler();
+      register = true;
+    }
+
+    consoleHandler.setLevel(Level.ALL);
+    formatter = new SolrLogFormatter();
+    consoleHandler.setFormatter(formatter);
+
+    if (register) {
+      java.util.logging.Logger.getLogger("").addHandler(consoleHandler);
+    }
+  }
+
+
   /** Call initCore in @BeforeClass to instantiate a solr core in your test class.
    * deleteCore will be called for you via SolrTestCaseJ4 @AfterClass */
   public static void initCore(String config, String schema) throws Exception {
@@ -148,7 +200,14 @@ public abstract class SolrTestCaseJ4 ext
      if (endNumOpens-numOpens != endNumCloses-numCloses) {
        String msg = "ERROR: SolrIndexSearcher opens=" + (endNumOpens-numOpens) + " closes="
+ (endNumCloses-numCloses);
        log.error(msg);
-        testsFailed = true;
+       testsFailed = true;
+
+       // For debugging
+//       Set<Entry<SolrCore,Exception>> coreEntries = SolrCore.openHandles.entrySet();

+//       for (Entry<SolrCore,Exception> entry : coreEntries) {
+//         entry.getValue().printStackTrace();
+//       }
+        
         fail(msg);
      }
   }
@@ -288,7 +347,7 @@ public abstract class SolrTestCaseJ4 ext
   }
 
   public static void createCore() throws Exception {
-    solrConfig = h.createConfig(getSolrConfigFile());
+    solrConfig = TestHarness.createConfig(getSolrConfigFile());
     h = new TestHarness( dataDir.getAbsolutePath(),
             solrConfig,
             getSchemaFile());
@@ -553,13 +612,13 @@ public abstract class SolrTestCaseJ4 ext
    * @see TestHarness#optimize
    */
   public static String optimize(String... args) {
-    return h.optimize(args);
+    return TestHarness.optimize(args);
   }
   /**
    * @see TestHarness#commit
    */
   public static String commit(String... args) {
-    return h.commit(args);
+    return TestHarness.commit(args);
   }
 
   /**
@@ -624,7 +683,7 @@ public abstract class SolrTestCaseJ4 ext
    * @see TestHarness#deleteById
    */
   public static String delI(String id) {
-    return h.deleteById(id);
+    return TestHarness.deleteById(id);
   }
   /**
    * Generates a &lt;delete&gt;... XML string for an query
@@ -632,7 +691,7 @@ public abstract class SolrTestCaseJ4 ext
    * @see TestHarness#deleteByQuery
    */
   public static String delQ(String q) {
-    return h.deleteByQuery(q);
+    return TestHarness.deleteByQuery(q);
   }
 
   /**
@@ -643,7 +702,7 @@ public abstract class SolrTestCaseJ4 ext
    */
   public static XmlDoc doc(String... fieldsAndValues) {
     XmlDoc d = new XmlDoc();
-    d.xml = h.makeSimpleDoc(fieldsAndValues).toString();
+    d.xml = TestHarness.makeSimpleDoc(fieldsAndValues).toString();
     return d;
   }
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
(original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
Tue Mar  6 23:17:08 2012
@@ -19,27 +19,34 @@
 package org.apache.solr.util;
 
 
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.xml.xpath.XPathExpressionException;
+
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.SystemPropertiesRestoreRule;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.core.SolrConfig;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.SolrInputField;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.XML;
-import org.apache.solr.request.*;
+import org.apache.solr.core.SolrConfig;
+import org.apache.solr.request.SolrQueryRequest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-
-import org.xml.sax.SAXException;
-import org.slf4j.LoggerFactory;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
 import org.slf4j.Logger;
-import javax.xml.xpath.XPathExpressionException;
-
-import java.io.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ArrayList;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
 
 /**
  * An Abstract base class that makes writing Solr JUnit tests "easier"
@@ -55,7 +62,8 @@ import java.util.ArrayList;
  * @see #tearDown
  */
 public abstract class AbstractSolrTestCase extends LuceneTestCase {
-    protected SolrConfig solrConfig;
+  protected SolrConfig solrConfig;
+
   /**
    * Harness initialized by initTestHarness.
    *
@@ -94,6 +102,14 @@ public abstract class AbstractSolrTestCa
     return SolrTestCaseJ4.TEST_HOME();
   }
   
+  @ClassRule
+  public static TestRule solrClassRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+
+  @Rule
+  public TestRule solrTestRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+  
   @BeforeClass
   public static void beforeClassAbstractSolrTestCase() throws Exception {
     SolrTestCaseJ4.startTrackingSearchers();
@@ -139,7 +155,7 @@ public abstract class AbstractSolrTestCa
     System.setProperty("solr.solr.home", getSolrHome());
     if (configFile != null) {
 
-      solrConfig = h.createConfig(getSolrConfigFile());
+      solrConfig = TestHarness.createConfig(getSolrConfigFile());
       h = new TestHarness( dataDir.getAbsolutePath(),
               solrConfig,
               getSchemaFile());
@@ -296,13 +312,13 @@ public abstract class AbstractSolrTestCa
    * @see TestHarness#optimize
    */
   public String optimize(String... args) {
-    return h.optimize(args);
+    return TestHarness.optimize(args);
   }
   /**
    * @see TestHarness#commit
    */
   public String commit(String... args) {
-    return h.commit(args);
+    return TestHarness.commit(args);
   }
 
   /**
@@ -381,7 +397,7 @@ public abstract class AbstractSolrTestCa
    * @see TestHarness#deleteById
    */
   public String delI(String id, String... args) {
-    return h.deleteById(id, args);
+    return TestHarness.deleteById(id, args);
   }
   
   /**
@@ -390,7 +406,7 @@ public abstract class AbstractSolrTestCa
    * @see TestHarness#deleteByQuery
    */
   public String delQ(String q, String... args) {
-    return h.deleteByQuery(q, args);
+    return TestHarness.deleteByQuery(q, args);
   }
   
   /**
@@ -401,7 +417,7 @@ public abstract class AbstractSolrTestCa
    */
   public Doc doc(String... fieldsAndValues) {
     Doc d = new Doc();
-    d.xml = h.makeSimpleDoc(fieldsAndValues).toString();
+    d.xml = TestHarness.makeSimpleDoc(fieldsAndValues).toString();
     return d;
   }
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/build.xml?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/build.xml Tue Mar  6 23:17:08
2012
@@ -23,20 +23,8 @@
 	<property name="exclude.from.war" value="" />
   <property name="solr.war.suffix" value="" />
 	
-  <!-- Checks that all JSP files in the webapp compile successfully using Jetty's Jasper
-->
   <target name="test" depends="compile-test-solr-core">
-    <property name="jsp.target" location="${dest}/jsp-temp" />
-    <taskdef classname="org.apache.jasper.JspC" name="jasper" >
-      <classpath>
-        <fileset dir="${common-solr.dir}/example/lib" includes="**/*.jar" />
-      </classpath>
-    </taskdef>
-    <delete dir="${jsp.target}" />
-    <mkdir dir="${jsp.target}" />
-    <jasper uriroot="${common-solr.dir}/webapp/web" outputDir="${jsp.target}" compile="false"
verbose="1" package="j"/>
-    <javac srcdir="${jsp.target}" destdir="${jsp.target}" target="${javac.target}"
-           source="${javac.source}" debug="off" includeAntRuntime="${javac.includeAntRuntime}"
-           encoding="utf8" classpathref="test.classpath"/>
+  	<!-- no more JSP -->
   </target>
 
   <target name="dist"

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/WEB-INF/web.xml?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/WEB-INF/web.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/WEB-INF/web.xml Tue
Mar  6 23:17:08 2012
@@ -51,14 +51,14 @@
          You will need to put this prefix in front of the SolrDispatchFilter
          url-pattern mapping too (/solr/*), and also on any paths for
          legacy Solr servlet mappings you may be using.
-         For the admin JSP's to work properly in a path-prefixed configuration,
-         the admin folder containing the JSPs needs to be under the app context root
+         For the Admin UI to work properly in a path-prefixed configuration,
+         the admin folder containing the resources needs to be under the app context root
          named to match the path-prefix.  For example:
 
             .war
                xxx
-                 admin
-                   stats.jsp
+                 js
+                   main.js
     -->
     <!--
     <init-param>
@@ -87,10 +87,31 @@
     <servlet-name>Logging</servlet-name>
     <servlet-class>org.apache.solr.servlet.LogLevelSelection</servlet-class>
   </servlet>
+  
+  <servlet>
+    <servlet-name>Zookeeper</servlet-name>
+    <servlet-class>org.apache.solr.servlet.ZookeeperInfoServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>LoadAdminUI</servlet-name>
+    <servlet-class>org.apache.solr.servlet.LoadAdminUiServlet</servlet-class>
+  </servlet>
 
+  <!-- Will be removed before 4.0 release! -->
   <servlet-mapping>
     <servlet-name>Logging</servlet-name>
-    <url-pattern>/admin/logging</url-pattern>
+    <url-pattern>/logging</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>Zookeeper</servlet-name>
+    <url-pattern>/zookeeper</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>LoadAdminUI</servlet-name>
+    <url-pattern>/admin.html</url-pattern>
   </servlet-mapping>
 
   <mime-mapping>
@@ -100,8 +121,7 @@
   </mime-mapping>
 
   <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>index.html</welcome-file>
+    <welcome-file>admin.html</welcome-file>
   </welcome-file-list>
 
 </web-app>

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/analysis.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/analysis.html?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/analysis.html (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/analysis.html Tue
Mar  6 23:17:08 2012
@@ -14,12 +14,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY 
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
 <div id="analysis">
 
-    <div class="block" id="analysis-error">
+    <div class="block analysis-error" id="analysis-handler-missing">
+
+        <div class="head">This Functionality requires the <code>/analysis/field</code>
Handler to be registered and active!</div>
+
+    </div>
+
+    <div class="block analysis-error" id="analysis-error">
 
-        This Functionality requires the <code>/analysis/field</code> Handler
to be registered and active!
+        <div class="head"><a><span></span></a></div>
+        <div class="body"></div>
 
     </div>
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/cloud.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/cloud.html?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/cloud.html (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/cloud.html Tue Mar
 6 23:17:08 2012
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <div id="cloud">
 
-	<div class="block" id="zookeeper">
+	<div class="block">
 
 	    <h2><span>Zookeeper-Data</span></h2>
 	    
@@ -24,9 +24,21 @@ limitations under the License.
 	        <div class="message"></div>
 	    </div>
 
-	    <div class="content">
+	    <div class="content clearfix">
 
-			<a><span>Fetch Zookeeper Data</span></a>
+			<div id="tree" class="tree">#tree</div>
+
+			<div id="file-content" class="clearfix">
+
+				<div id="prop">
+					<ul></ul>
+				</div>
+
+				<div id="data"></div>
+
+				<a class="close"><span>[x]</span></a>
+
+			</div>
 
 	    </div>
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/query.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/query.html?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/query.html (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/query.html Tue Mar
 6 23:17:08 2012
@@ -56,6 +56,23 @@ limitations under the License.
 				</label>
 				<input type="text" name="qt" id="qt" value="">
 
+				<label for="wt">
+					<a rel="help">wt</a>
+				</label>
+				<select name="wt" id="wt">
+					<option>xml</option>
+					<option>json</option>
+					<option>python</option>
+					<option>ruby</option>
+					<option>php</option>
+					<option>csv</option>
+				</select>
+
+				<label for="indent" class="checkbox">
+					<input type="checkbox" name="indent" id="indent" value="true">
+					<a rel="help">indent</a>
+				</label>
+
 				<label for="debugQuery" class="checkbox">
 					<input type="checkbox" name="debugQuery" id="debugQuery" value="true">
 					<a rel="help">debugQuery</a>
@@ -243,11 +260,7 @@ limitations under the License.
 
 	<div id="result">
 
-		<div id="url">
-
-			<input type="text" readonly="readonly">
-		
-		</div>
+		<a id="url" href="#"></a>
 
 		<div id="response">
 

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/schema-browser.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/schema-browser.html?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/schema-browser.html
(original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/schema-browser.html
Tue Mar  6 23:17:08 2012
@@ -66,7 +66,7 @@ limitations under the License.
                         </li>
                         <li class="clearfix query">
 
-                            <p>Query&nbsp;Analyzer:</p>
+                            <p>Query Analyzer:</p>
                             <dl>
                                 <dt></dt>
                             </dl>
@@ -74,11 +74,13 @@ limitations under the License.
                             <ul>
                                 <li class="clearfix tokenizer">
                                     <p>Tokenizer:</p>
-                                    <dl></dl>
+                                    <dl>
+                                    </dl>
                                 </li>
                                 <li class="clearfix filters">
                                     <p>Filters:</p>
-                                    <dl></dl>
+                                    <dl>
+                                    </dl>
                                 </li>
                             </ul>
                             
@@ -86,50 +88,52 @@ limitations under the License.
                     </ul>
 
                 </div>
-                
-                <div class="terminfo-holder">
-                    <div class="status-holder">Load Term Info</div>
-                                  
+
+                <div class="terminfo-holder clearfix">
+
+                    <div class="status loader">Loading Term Info ...</div>
+
                     <div class="topterms-holder">
-                  
+
                         <p class="head">Top <span class="shown"></span><span
class="max-holder">/<span class="max"></span></span> Terms:</p>
-                  
+
                         <table border="0" cellspacing="0" cellpadding="0">
-                  
+
                             <thead>
-                  
+
                                 <tr>
-                  
+
                                     <th class="position" title="Position">&nbsp;</th>
                                     <th class="term">Term</th>
                                     <th class="frequency" title="Frequency">Frq</th>
                                 
                                 </tr>
-                  
+
                             </thead>
-                  
+
                         </table>
-                  
+
                         <p class="navi clearfix">
                             <a class="less"><span>less</span></a>
                             <a class="more"><span>more</span></a>
                         </p>
-                  
+
                     </div>
-                  
+
                     <div class="histogram-holder">
-                  
+
                         <p class="head">Histogram:</p>
-                  
+
                         <div class="histogram"></div>
-                  
+
                         <dl class="clearfix">
-                  
+
                         </dl>
                     
                     </div>
+
                 </div>
-                
+
             </div>
 
         </div>

Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/threads.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/threads.html?rev=1297785&r1=1297784&r2=1297785&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/threads.html (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/webapp/web/tpl/threads.html Tue
Mar  6 23:17:08 2012
@@ -31,11 +31,8 @@ limitations under the License.
 
                 <tr>
 
-                    <td class="ico spacer">&nbsp;</td>
-                    <th>id</th>
-                    <th>name</th>
-                    <th>cpuTime</th>
-                    <th>userTime</th>
+                    <th class="name">name</th>
+                    <th class="time">cpuTime / userTime</th>
                 
                 </tr>
 



Mime
View raw message