svn commit: r1578777 - in /jackrabbit/oak/trunk/oak-solr-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/ main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/ test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/

[tommaso]

Author: tommaso
Date: Tue Mar 18 07:56:44 2014
New Revision: 1578777

URL: http://svn.apache.org/r1578777
Log:
OAK-1552 - fixed missing core.properties handling in ESS

Modified:
    
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
    
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
    
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java?rev=1578777&r1=1578776&r2=1578777&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
 Tue Mar 18 07:56:44 2014
@@ -69,7 +69,7 @@ public class SolrQueryIndexProvider impl
                 }
                 try {
                     SolrServer solrServer = solrServerProvider.getSolrServer();
-                    // the query engine should be returned only if the serve 
is alive, otherwise other indexes should be used
+                    // the query engine should be returned only if the server 
is alive, otherwise other indexes should be used
                     if (solrServer != null && 0 == 
solrServer.ping().getStatus()) {
                         tempIndexes.add(new SolrQueryIndex(
                                 entry.getName(),

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1578777&r1=1578776&r2=1578777&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
 Tue Mar 18 07:56:44 2014
@@ -137,10 +137,12 @@ public class EmbeddedSolrServerProvider 
                 if (!new File(solrHomePath + "/" + coreName + 
"/conf").mkdirs()) {
                     throw new IOException("could not create nested core 
directory in solrHomePath");
                 }
-                String coreDir = solrHomePath + "/" + coreName + "/conf/";
-                copy("/solr/oak/conf/currency.xml", coreDir);
-                copy("/solr/oak/conf/schema.xml", coreDir);
-                copy("/solr/oak/conf/solrconfig.xml", coreDir);
+                String solrCoreDir = solrHomePath + "/" + coreName;
+                copy("/solr/oak/core.properties", solrCoreDir);
+                String coreConfDir = solrCoreDir + "/conf/";
+                copy("/solr/oak/conf/currency.xml", coreConfDir);
+                copy("/solr/oak/conf/schema.xml", coreConfDir);
+                copy("/solr/oak/conf/solrconfig.xml", coreConfDir);
             }
         } else if (!solrHomePathFile.isDirectory()) {
             throw new IOException("a non directory file with the specified 
name already exists for the given solrHomePath '" + solrHomePath);

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java?rev=1578777&r1=1578776&r2=1578777&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
 Tue Mar 18 07:56:44 2014
@@ -18,8 +18,10 @@ package org.apache.jackrabbit.oak.plugin
 
 import 
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
 import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.response.SolrPingResponse;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 /**
@@ -28,12 +30,15 @@ import static org.junit.Assert.assertNot
 public class EmbeddedSolrServerProviderTest {
 
     @Test
-    public void testSolrServerInitialization() throws Exception {
+    public void testEmbeddedSolrServerInitialization() throws Exception {
         EmbeddedSolrServerConfiguration solrServerConfiguration = new 
EmbeddedSolrServerConfiguration(getClass().getResource("/solr").getFile(),
                 getClass().getResource("/solr/solr.xml").getFile(), "oak");
         EmbeddedSolrServerProvider embeddedSolrServerProvider = new 
EmbeddedSolrServerProvider(solrServerConfiguration);
         SolrServer solrServer = embeddedSolrServerProvider.getSolrServer();
         assertNotNull(solrServer);
+        SolrPingResponse ping = solrServer.ping();
+        assertNotNull(ping);
+        assertEquals(0, ping.getStatus());
     }
 
 }