svn commit: r1581318 - /jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java

[tommaso]

Author: tommaso
Date: Tue Mar 25 13:41:56 2014
New Revision: 1581318

URL: http://svn.apache.org/r1581318
Log:
OAK-1607 - avoid exposure of HTTP properties for EmbeddedSolrServerConfiguration

Modified:
    
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java?rev=1581318&r1=1581317&r2=1581318&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
 Tue Mar 25 13:41:56 2014
@@ -47,19 +47,10 @@ public class EmbeddedSolrServerConfigura
     @Property(value = SolrServerConfigurationDefaults.SOLR_CONFIG_PATH, label 
= "Path to specific Solr Core configuration")
     private static final String SOLR_CONFIG_FILE = "solr.config.path";
 
-    @Property(intValue = 0, label = "Solr HTTP Endpoint port (optional)")
-    private static final String SOLR_HTTP_PORT = "solr.http.port";
-
-    @Property(value = "", label = "Solr HTTP Endpoint context (optional)")
-    private static final String SOLR_CONTEXT = "solr.context";
-
     private String solrHome;
     private String solrConfigFile;
     private String solrCoreName;
 
-    private Integer solrHttpPort;
-    private String solrContext;
-
     private SolrServerConfiguration<EmbeddedSolrServerProvider> 
solrServerConfiguration;
 
 
@@ -73,23 +64,14 @@ public class EmbeddedSolrServerConfigura
         solrConfigFile = 
String.valueOf(componentContext.getProperties().get(SOLR_CONFIG_FILE));
         solrCoreName = 
String.valueOf(componentContext.getProperties().get(SOLR_CORE_NAME));
 
-        String httpPort = 
String.valueOf(componentContext.getProperties().get(SOLR_HTTP_PORT));
-        if (httpPort != null && httpPort.length() > 0) {
-            solrHttpPort = Integer.valueOf(httpPort);
-        }
-        solrContext = 
String.valueOf(componentContext.getProperties().get(SOLR_CONTEXT));
-
-        solrServerConfiguration = new 
EmbeddedSolrServerConfiguration(solrHome, solrConfigFile, solrCoreName).
-                withHttpConfiguration(solrContext, solrHttpPort);
+        solrServerConfiguration = new 
EmbeddedSolrServerConfiguration(solrHome, solrConfigFile, solrCoreName);
     }
 
     @Deactivate
     protected void deactivate() throws Exception {
         solrHome = null;
-        solrHttpPort = null;
         solrConfigFile = null;
         solrCoreName = null;
-        solrContext = null;
     }
 
     @Override