jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomm...@apache.org
Subject svn commit: r1464958 - in /jackrabbit/oak/trunk/oak-solr-embedded/src: main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/ main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/ test/java/org/apache/jackrabbit/oak/plugins/in...
Date Fri, 05 Apr 2013 12:44:02 GMT
Author: tommaso
Date: Fri Apr  5 12:44:02 2013
New Revision: 1464958

URL: http://svn.apache.org/r1464958
Log:
OAK-735 - renamed DefaultOakSolrProvider to EmbeddedSolrServerProvider (so that the merge
is finished)

Added:
    jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java
  (contents, props changed)
      - copied, changed from r1464953, jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProvider.java
    jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java
  (contents, props changed)
      - copied, changed from r1464953, jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProviderTest.java
Removed:
    jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProvider.java
    jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProviderTest.java
Modified:
    jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java

Copied: jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java
(from r1464953, jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProvider.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java?p2=jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java&p1=jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProvider.java&r1=1464953&r2=1464958&rev=1464958&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProvider.java
(original)
+++ jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java
Fri Apr  5 12:44:02 2013
@@ -35,11 +35,11 @@ import org.apache.solr.core.CoreContaine
  * Default implementation of {@link SolrServerProvider} which uses an
  * {@link EmbeddedSolrServer} configured as per passed {@link SolrServerConfiguration}.
  */
-public class DefaultOakSolrProvider implements SolrServerProvider {
+public class EmbeddedSolrServerProvider implements SolrServerProvider {
 
     private final SolrServerConfiguration solrServerConfiguration;
 
-    public DefaultOakSolrProvider(SolrServerConfiguration solrServerConfiguration) {
+    public EmbeddedSolrServerProvider(SolrServerConfiguration solrServerConfiguration) {
         this.solrServerConfiguration = solrServerConfiguration;
     }
 

Propchange: jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java?rev=1464958&r1=1464957&r2=1464958&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java
(original)
+++ jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java
Fri Apr  5 12:44:02 2013
@@ -25,7 +25,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.jackrabbit.oak.plugins.index.solr.OakSolrConfiguration;
 import org.apache.jackrabbit.oak.plugins.index.solr.OakSolrConfigurationProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.SolrServerProvider;
-import org.apache.jackrabbit.oak.plugins.index.solr.embedded.DefaultOakSolrProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.embedded.EmbeddedSolrServerProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.embedded.EmbeddedSolrConfigurationProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.embedded.SolrServerConfigurationProvider;
 import org.apache.jackrabbit.oak.plugins.index.solr.embedded.UpToDateNodeStateConfiguration;
@@ -64,11 +64,11 @@ public class EmbeddedSolrProviderService
             // try reading configuration from the configured repository path
             UpToDateNodeStateConfiguration nodeStateConfiguration = new UpToDateNodeStateConfiguration(nodeStore,
String.valueOf(
                     context.getProperties().get(CONFIGURATION_PATH)));
-            solrServerProvider = new DefaultOakSolrProvider(nodeStateConfiguration.getSolrServerConfiguration());
+            solrServerProvider = new EmbeddedSolrServerProvider(nodeStateConfiguration.getSolrServerConfiguration());
             oakSolrConfigurationProvider = new EmbeddedSolrConfigurationProvider(nodeStateConfiguration);
         } catch (Exception e) {
             // use the default config and the OSGi based server configuration
-            solrServerProvider = new DefaultOakSolrProvider(solrServerConfigurationProvider.getSolrServerConfiguration());
+            solrServerProvider = new EmbeddedSolrServerProvider(solrServerConfigurationProvider.getSolrServerConfiguration());
             oakSolrConfigurationProvider = new EmbeddedSolrConfigurationProvider();
         }
     }

Copied: jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java
(from r1464953, jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProviderTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java?p2=jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java&p1=jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProviderTest.java&r1=1464953&r2=1464958&rev=1464958&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/DefaultOakSolrProviderTest.java
(original)
+++ jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java
Fri Apr  5 12:44:02 2013
@@ -22,16 +22,16 @@ import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 
 /**
- * Testcase for {@link DefaultOakSolrProvider}
+ * Testcase for {@link EmbeddedSolrServerProvider}
  */
-public class DefaultOakSolrProviderTest {
+public class EmbeddedSolrServerProviderTest {
 
     @Test
     public void testSolrServerInitialization() throws Exception {
         SolrServerConfiguration solrServerConfiguration = new SolrServerConfiguration("target/solr",
                 "target/solr/solr.xml", "oak");
-        DefaultOakSolrProvider defaultOakSolrProvider = new DefaultOakSolrProvider(solrServerConfiguration);
-        SolrServer solrServer = defaultOakSolrProvider.getSolrServer();
+        EmbeddedSolrServerProvider embeddedSolrServerProvider = new EmbeddedSolrServerProvider(solrServerConfiguration);
+        SolrServer solrServer = embeddedSolrServerProvider.getSolrServer();
         assertNotNull(solrServer);
     }
 

Propchange: jackrabbit/oak/trunk/oak-solr-embedded/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProviderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message