lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r641106 - in /lucene/solr/trunk: client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java src/webapp/web/admin/threaddump.jsp src/webapp/web/index.jsp
Date Wed, 26 Mar 2008 01:39:02 GMT
Author: ryan
Date: Tue Mar 25 18:39:01 2008
New Revision: 641106

URL: http://svn.apache.org/viewvc?rev=641106&view=rev
Log:
SOLR-350 -- fixing more jsp references...  added tests to check "/solr/" and "/solr/admin/threaddump.jsp"

Modified:
    lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
    lucene/solr/trunk/src/webapp/web/admin/threaddump.jsp
    lucene/solr/trunk/src/webapp/web/index.jsp

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=641106&r1=641105&r2=641106&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
(original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
Tue Mar 25 18:39:01 2008
@@ -70,16 +70,23 @@
     // Currently not an extensive test, but it does fire up the JSP pages and make 
     // sure they compile ok
     
-    String adminPath = "http://localhost:"+port+context+"/admin/";
+    String adminPath = "http://localhost:"+port+context+"/";
     String html = IOUtils.toString( new URL(adminPath).openStream() );
     assertNotNull( html ); // real error will be an exception
 
+    adminPath += "admin/";
+    assertNotNull( html ); // real error will be an exception
+
     // analysis
     html = IOUtils.toString( new URL(adminPath+"analysis.jsp").openStream() );
     assertNotNull( html ); // real error will be an exception
 
     // schema browser
     html = IOUtils.toString( new URL(adminPath+"schema.jsp").openStream() );
+    assertNotNull( html ); // real error will be an exception
+
+    // schema browser
+    html = IOUtils.toString( new URL(adminPath+"threaddump.jsp").openStream() );
     assertNotNull( html ); // real error will be an exception
   }
 }

Modified: lucene/solr/trunk/src/webapp/web/admin/threaddump.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/threaddump.jsp?rev=641106&r1=641105&r2=641106&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/threaddump.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/threaddump.jsp Tue Mar 25 18:39:01 2008
@@ -21,22 +21,15 @@
                  java.lang.management.ThreadInfo,
                  java.io.IOException,
                  org.apache.solr.util.XML"%>
+<%@include file="_info.jsp" %>
+
 
 <?xml-stylesheet type="text/xsl" href="threaddump.xsl"?>
-<%
-  SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
-  if (core == null) {
-    String coreParam = request.getParameter("core");
-    core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam)
: null;
-  }
-  if (core == null)
-    core = SolrCore.getSolrCore();
-%>
 <%!
   static ThreadMXBean tmbean = ManagementFactory.getThreadMXBean();
 %>
 <solr>
-  <core><%=core.getName()%></core>
+  <core><%= collectionName %></core>
   <system>
   <jvm>
     <version><%=System.getProperty("java.vm.version")%></version>

Modified: lucene/solr/trunk/src/webapp/web/index.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/index.jsp?rev=641106&r1=641105&r2=641106&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/index.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/index.jsp Tue Mar 25 18:39:01 2008
@@ -28,7 +28,7 @@
 <a href="."><img border="0" align="right" height="61" width="142" src="admin/solr-head.gif"
alt="Solr"/></a>
 
 <% 
-  org.apache.solr.core.MultiCore multicore = (org.apache.solr.core.MultiCore)request.getAttribute("org.apache.solr.core.MultiCore");
+  org.apache.solr.core.MultiCore multicore = (org.apache.solr.core.MultiCore)request.getAttribute("org.apache.solr.MultiCore");
   if( multicore.isEnabled() ) { 
     for( org.apache.solr.core.SolrCore core : multicore.getCores() ) {%>
 <a href="<%= core.getName() %>/admin/">Admin <%= core.getName() %> </a><br/>



Mime
View raw message