lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject svn commit: r1142731 - in /lucene/dev/branches/branch_3x/solr: ./ contrib/clustering/src/test/resources/solr-clustering/conf/ contrib/uima/src/test/resources/solr-uima/conf/ example/example-DIH/solr/db/conf/ example/example-DIH/solr/mail/conf/ example/...
Date Mon, 04 Jul 2011 16:32:51 GMT
Author: hossman
Date: Mon Jul  4 16:32:51 2011
New Revision: 1142731

URL: http://svn.apache.org/viewvc?rev=1142731&view=rev
Log:
SOLR-2631: merge 1142722 and 1142730 from trunk

Modified:
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java

Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
Mon Jul  4 16:32:51 2011
@@ -469,15 +469,6 @@
   -->
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
   
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-    
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">

Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
Mon Jul  4 16:32:51 2011
@@ -934,15 +934,6 @@
   <requestHandler name="/admin/"
     class="org.apache.solr.handler.admin.AdminHandlers" />
 
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler">
     <lst name="defaults">

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Mon
Jul  4 16:32:51 2011
@@ -614,15 +614,6 @@
   -->
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
   
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-    
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Mon
Jul  4 16:32:51 2011
@@ -690,15 +690,6 @@
   -->
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
 
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Mon
Jul  4 16:32:51 2011
@@ -613,15 +613,6 @@
   -->
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
   
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-    
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">

Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Mon Jul  4 16:32:51
2011
@@ -991,9 +991,11 @@
 
   <!-- ping/healthcheck -->
   <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
-    <lst name="defaults">
+    <lst name="invariants">
       <str name="qt">search</str>
       <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
       <str name="echoParams">all</str>
     </lst>
   </requestHandler>

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1142731&r1=1142730&r2=1142731&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Mon Jul  4 16:32:51 2011
@@ -568,15 +568,6 @@ abstract public class SolrExampleTests e
     // should be ok
     server.ping();
     
-    try {
-      SolrPing ping = new SolrPing();
-      ping.getParams().set( "qt", "unknown handler! ignore_exception" );
-      ping.process( server );
-      fail( "sent unknown query type!" );
-    }
-    catch( Exception ex ) {
-      // expected
-    }
   }
   
  @Test



Mime
View raw message