You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/11 00:21:49 UTC
[24/42] incubator-usergrid git commit: Tweaks to CassandraResource
and ElasticSearchResource
Tweaks to CassandraResource and ElasticSearchResource
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bf2bd804
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bf2bd804
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bf2bd804
Branch: refs/heads/es-type-updates
Commit: bf2bd804c469984cecf5b351d51e15bd2b79b46e
Parents: 3275a70
Author: ryan bridges <rb...@apigee.com>
Authored: Thu Nov 6 17:13:03 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Thu Nov 6 17:13:03 2014 -0500
----------------------------------------------------------------------
.../usergrid/persistence/index/impl/ElasticSearchResource.java | 2 +-
.../java/org/apache/usergrid/cassandra/CassandraResource.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf2bd804/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java
index d4d2892..4145e32 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java
@@ -63,7 +63,7 @@ public class ElasticSearchResource extends EnvironResource {
props.load( ClassLoader.getSystemResourceAsStream( "project.properties" ) );
host=(String)props.getProperty( "elasticsearch.host", "127.0.0.1" );
port=Integer.valueOf(props.getProperty( "elasticsearch.port", "9300" )).intValue();
- String forkString = props.getProperty("elasticsearch.startup");
+ String forkString = props.getProperty("elasticsearch.startup", "external");
externalElasticSearch = "external".equals( forkString );
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf2bd804/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
index 0b4c083..5643710 100644
--- a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
@@ -317,7 +317,6 @@ public class CassandraResource extends ExternalResource {
LOG.info( "-------------------------------------------------------------------");
LOG.info( "Initializing Embedded Cassandra at {} ...", tempDir.toString() );
LOG.info( "-------------------------------------------------------------------");
-
// Create temp directory, setup to create new File configuration there
File newYamlFile = new File( tempDir, "cassandra.yaml" );
URL newYamlUrl = FileUtils.toURLs( new File[] { newYamlFile } )[0];
@@ -403,7 +402,6 @@ public class CassandraResource extends ExternalResource {
LOG.info( "-------------------------------------------------------------------");
LOG.info( "Initializing Forked Cassandra at {} ...", tempDir.toString() );
LOG.info( "-------------------------------------------------------------------");
-
// Create temp directory, setup to create new File configuration there
File newYamlFile = new File( tempDir, "cassandra.yaml" );
URL newYamlUrl = FileUtils.toURLs( new File[] { newYamlFile } )[0];
@@ -698,7 +696,7 @@ public class CassandraResource extends ExternalResource {
// int nativeTransportPort = CassandraResource.DEFAULT_NATIVE_TRANSPORT_PORT;
System.setProperty( "cassandra.url", host+":" + Integer.toString( rpcPort ) );
- System.setProperty( "cassandra.cluster", props.getProperty("cassandra.cluster","Test Cluster") );
+ System.setProperty( "cassandra.cluster", props.getProperty("cassandra.cluster","Usergrid") );
System.setProperty( "cassandra-foreground", "true" );
System.setProperty( "log4j.defaultInitOverride", "true" );
System.setProperty( "log4j.configuration", "log4j.properties" );