From c23ba0564ceda85f1926c9f2c752cf412fbc6966 Mon Sep 17 00:00:00 2001
From: Stefan Matheis <steffkes@apache.org>
Date: Thu, 12 Apr 2012 14:06:53 +0000
Subject: [PATCH] SOLR-3312 Remove static reference to schema/solrconfig

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1325268 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/solr/handler/admin/CoreAdminHandler.java   | 2 ++
 solr/webapp/web/admin.html                                | 2 --
 solr/webapp/web/js/scripts/app.js                         | 8 +++++---
 solr/webapp/web/js/scripts/file.js                        | 4 +++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 9664f96bb04..3f6cb9952eb 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -809,6 +809,8 @@ public class CoreAdminHandler extends RequestHandlerBase {
         info.add("name", core.getName());
         info.add("instanceDir", normalizePath(core.getResourceLoader().getInstanceDir()));
         info.add("dataDir", normalizePath(core.getDataDir()));
+        info.add("config", core.getConfigResource());
+        info.add("schema", core.getSchemaResource());
         info.add("startTime", new Date(core.getStartTime()));
         info.add("uptime", System.currentTimeMillis() - core.getStartTime());
         RefCounted<SolrIndexSearcher> searcher = core.getSearcher();
diff --git a/solr/webapp/web/admin.html b/solr/webapp/web/admin.html
index e8db31486ae..7862f8d7f94 100644
--- a/solr/webapp/web/admin.html
+++ b/solr/webapp/web/admin.html
@@ -46,8 +46,6 @@ limitations under the License.
     
   app_config.solr_path = '${contextPath}';
   app_config.core_admin_path = '${adminPath}';
-  app_config.schema_path = '/admin/file?file=schema.xml&contentType=text/xml;charset=utf-8';
-  app_config.config_path = '/admin/file?file=solrconfig.xml&contentType=text/xml;charset=utf-8';
     
   </script>
     
diff --git a/solr/webapp/web/js/scripts/app.js b/solr/webapp/web/js/scripts/app.js
index 180e18c0e69..0920f85ecf6 100644
--- a/solr/webapp/web/js/scripts/app.js
+++ b/solr/webapp/web/js/scripts/app.js
@@ -169,14 +169,16 @@ var solr_admin = function( app_config )
           }
           else
           {
-            self.menu_element
+            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';
@@ -188,7 +190,7 @@ var solr_admin = function( app_config )
               environment_basepath = core_path;
             }
 
-            var core_tpl = '<li id="' + core_name + '" data-basepath="' + core_path + '">' + "\n"
+            var core_tpl = '<li id="' + core_name + '" data-basepath="' + core_path + '" schema="' + schema + '" config="' + solrconfig + '">' + "\n"
                          + '  <p><a href="#/' + core_name + '">' + core_name + '</a></p>' + "\n"
                          + '  <ul>' + "\n"
 
diff --git a/solr/webapp/web/js/scripts/file.js b/solr/webapp/web/js/scripts/file.js
index 63faff56751..213c222e780 100644
--- a/solr/webapp/web/js/scripts/file.js
+++ b/solr/webapp/web/js/scripts/file.js
@@ -22,11 +22,13 @@ sammy.get
   function( context )
   {
     var core_basepath = this.active_core.attr( 'data-basepath' );
+	var filetype = context.params.splat[1]; // either schema or config	
+	var filename = this.active_core.attr( filetype );
 
     $.ajax
     (
       {
-        url : core_basepath + app.config[ context.params.splat[1] + '_path' ],
+        url : core_basepath + "/admin/file?file=" + filename + "&contentType=text/xml;charset=utf-8",
         dataType : 'xml',
         context : $( '#content' ),
         beforeSend : function( xhr, settings )