You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/09/17 16:46:02 UTC
svn commit: r1386639 - in /lucene/dev/trunk/solr:
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
core/src/test/org/apache/solr/cloud/ core/src/test/org/apache/solr/update/
test-framework/src/java/org/apache/solr/
Author: markrmiller
Date: Mon Sep 17 14:46:02 2012
New Revision: 1386639
URL: http://svn.apache.org/viewvc?rev=1386639&view=rev
Log:
switch some of the localhost usage to 127.0.0.1
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Mon Sep 17 14:46:02 2012
@@ -68,7 +68,7 @@ public class TestContentStreamDataSource
params.set("command", "full-import");
params.set("clean", "false");
req.setParams(params);
- String url = "http://localhost:" + jetty.getLocalPort() + "/solr";
+ String url = "http://127.0.0.1:" + jetty.getLocalPort() + "/solr";
HttpSolrServer solrServer = new HttpSolrServer(url);
solrServer.request(req);
ModifiableSolrParams qparams = new ModifiableSolrParams();
@@ -88,7 +88,7 @@ public class TestContentStreamDataSource
"clean", "false", UpdateParams.COMMIT, "false",
UpdateParams.COMMIT_WITHIN, "1000");
req.setParams(params);
- String url = "http://localhost:" + jetty.getLocalPort() + "/solr";
+ String url = "http://127.0.0.1:" + jetty.getLocalPort() + "/solr";
HttpSolrServer solrServer = new HttpSolrServer(url);
solrServer.request(req);
Thread.sleep(100);
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java Mon Sep 17 14:46:02 2012
@@ -160,7 +160,7 @@ public class TestJdbcDataSource extends
JdbcDataSource dataSource = new JdbcDataSource();
Properties p = new Properties();
p.put("driver", "com.mysql.jdbc.Driver");
- p.put("url", "jdbc:mysql://localhost/autos");
+ p.put("url", "jdbc:mysql://127.0.0.1/autos");
p.put("user", "root");
p.put("password", "");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Mon Sep 17 14:46:02 2012
@@ -196,7 +196,7 @@ public class OverseerTest extends SolrTe
ZkStateReader reader = new ZkStateReader(zkClient);
reader.createClusterStateWatchersAndUpdate();
- zkController = new MockZKController(server.getZkAddress(), "localhost", "collection1");
+ zkController = new MockZKController(server.getZkAddress(), "127.0.0.1", "collection1");
final int numShards=6;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Mon Sep 17 14:46:02 2012
@@ -82,7 +82,7 @@ public class ZkControllerTest extends So
cc = getCoreContainer();
ZkController zkController = new ZkController(cc, server.getZkAddress(), TIMEOUT, 10000,
- "localhost", "8983", "solr", new CurrentCoreDescriptorProvider() {
+ "127.0.0.1", "8983", "solr", new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
@@ -122,7 +122,7 @@ public class ZkControllerTest extends So
cc = getCoreContainer();
zkController = new ZkController(cc, server.getZkAddress(),
- TIMEOUT, 10000, "localhost", "8983", "solr", new CurrentCoreDescriptorProvider() {
+ TIMEOUT, 10000, "127.0.0.1", "8983", "solr", new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Mon Sep 17 14:46:02 2012
@@ -77,7 +77,7 @@ public class SolrCmdDistributorTest exte
getSchemaFile());
jettys.add(j);
clients.add(createNewSolrServer(j.getLocalPort()));
- String shardStr = "localhost:" + j.getLocalPort() + context;
+ String shardStr = "127.0.0.1:" + j.getLocalPort() + context;
shardsArr[i] = shardStr;
sb.append(shardStr);
}
@@ -194,7 +194,7 @@ public class SolrCmdDistributorTest exte
HttpSolrServer httpClient = (HttpSolrServer) c;
nodeProps = new ZkNodeProps(ZkStateReader.BASE_URL_PROP,
httpClient.getBaseURL(), ZkStateReader.CORE_NAME_PROP, "");
-
+ System.out.println("node props:" + nodeProps);
nodes.add(new StdNode(new ZkCoreNodeProps(nodeProps)));
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1386639&r1=1386638&r2=1386639&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Mon Sep 17 14:46:02 2012
@@ -201,7 +201,7 @@ public abstract class BaseDistributedSea
getSchemaFile());
jettys.add(j);
clients.add(createNewSolrServer(j.getLocalPort()));
- String shardStr = "localhost:" + j.getLocalPort() + context;
+ String shardStr = "127.0.0.1:" + j.getLocalPort() + context;
shardsArr[i] = shardStr;
sb.append(shardStr);
}