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 2010/10/20 22:55:27 UTC
svn commit: r1025747 [3/3] - in /lucene/dev/branches/docvalues: ./ lucene/
lucene/contrib/ lucene/contrib/highlighter/src/test/
lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/
lucene/contrib/misc/src/java/org/apache/lucene/in...
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp?rev=1025747&r1=1025746&r2=1025747&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp Wed Oct 20 20:55:26 2010
@@ -115,4 +115,6 @@
String cwd=System.getProperty("user.dir");
String solrHome= solrConfig.getInstanceDir();
+
+ boolean cachingEnabled = !solrConfig.getHttpCachingConfig().isNever304();
%>
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/header.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/header.jsp?rev=1025747&r1=1025746&r2=1025747&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/header.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/header.jsp Wed Oct 20 20:55:26 2010
@@ -39,3 +39,6 @@ var host_name="<%= hostname %>"
<%= hostname %>:<%= port %><br/>
cwd=<%= cwd %> SolrHome=<%= solrHome %>
+<br/>
+<%String cachingStatus = " HTTP caching is "; %>
+<%= cachingEnabled ? cachingStatus + " ON": cachingStatus + " OFF" %>
Propchange: lucene/dev/branches/docvalues/solr/testlogging.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 20 20:55:26 2010
@@ -0,0 +1,9 @@
+/lucene/dev/branches/branch_3x/solr/testlogging.properties:949730,961612,979161,980654,982195,987811,988512
+/lucene/dev/branches/preflexfixes/solr/testlogging.properties:967125-979432
+/lucene/dev/trunk/solr/testlogging.properties:1021634-1025711
+/lucene/java/branches/lucene_2_4/solr/testlogging.properties:748824
+/lucene/java/branches/lucene_2_9/solr/testlogging.properties:817269-818600,825998,829134,829881,831036,896850,909334
+/lucene/java/branches/lucene_2_9_back_compat_tests/solr/testlogging.properties:818601-821336
+/lucene/java/branches/lucene_3_0/solr/testlogging.properties:880793,896906
+/lucene/solr/branches/newtrunk/solr/testlogging.properties:924462
+/lucene/solr/trunk/testlogging.properties:922950-923910,923912-925091