You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/08 21:05:14 UTC
[08/15] git commit: Fix to breakage in Tools,
and add missing security group ingress to awscluster.
Fix to breakage in Tools, and add missing security group ingress to awscluster.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/223a9c23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/223a9c23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/223a9c23
Branch: refs/heads/two-dot-o
Commit: 223a9c23d461fb312f7655fc927b5631563d8487
Parents: e45dd32
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Aug 4 08:23:19 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Aug 4 08:23:19 2014 -0400
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 14 ++++++++++
stack/core/src/test/resources/log4j.properties | 24 ++++++++---------
stack/pom.xml | 10 ++++---
stack/rest/pom.xml | 1 -
.../rest/JacksonCustomMapperProvider.java | 4 +++
.../apache/usergrid/rest/TomcatResource.java | 3 +++
stack/rest/src/test/resources/log4j.properties | 28 +++++++++++---------
.../resources/usergrid-custom-test.properties | 2 ++
.../src/test/resources/log4j.properties | 21 +++++++--------
.../java/org/apache/usergrid/tools/Cli.java | 2 +-
10 files changed, 69 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index dcd3221..5206092 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -1005,6 +1005,20 @@
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
"GroupName": {
+ "Ref": "CassSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "RestSecurityGroup"
+ }
+ }
+ },
+ "AllowCassToRestOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
"Ref": "RestSecurityGroup"
},
"IpProtocol": "tcp",
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/core/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/log4j.properties b/stack/core/src/test/resources/log4j.properties
index cf63e34..0d98883 100644
--- a/stack/core/src/test/resources/log4j.properties
+++ b/stack/core/src/test/resources/log4j.properties
@@ -28,24 +28,24 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
log4j.logger.org.apache.usergrid=INFO
-#log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
-#log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
-#log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
-#log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
-#log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
+log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
+log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
+log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
+log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
#log4j.logger.org.apache.usergrid.persistence=INFO
-log4j.logger.org.apache.usergrid.corepersistence=DEBUG
+#log4j.logger.org.apache.usergrid.corepersistence=DEBUG
#log4j.logger.com.netflix.hystrix=DEBUG
#log4j.logger.org.antlr=DEBUG
#log4j.logger.org.apache.usergrid.persistence.CollectionIT=DEBUG
-log4j.logger.org.apache.usergrid.persistence.index=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.index=DEBUG
#log4j.logger.org.apache.usergrid.persistence.collection=DEBUG
#log4j.logger.org.elasticsearch=DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 4c03904..be0f359 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -101,9 +101,9 @@
<hector-version>1.1-4</hector-version>
<hector-test-version>1.1-4</hector-test-version>
<jackson-version>1.9.9</jackson-version>
- <jackson-2-version>2.3.1</jackson-2-version>
+ <jackson-2-version>2.3.3</jackson-2-version>
<jclouds.version>1.6.2-incubating</jclouds.version>
- <jersey-version>1.18</jersey-version>
+ <jersey-version>1.18.1</jersey-version>
<junit-version>4.11</junit-version>
<log4j-version>1.2.16</log4j-version>
<metrics-version>2.1.2</metrics-version>
@@ -111,7 +111,7 @@
<shiro-version>1.2.0</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<snakeyaml-version>1.8</snakeyaml-version>
- <tomcat-version>7.0.42</tomcat-version>
+ <tomcat-version>7.0.52</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
@@ -160,6 +160,10 @@
<id>tonuquq</id>
<name>Alex Karasulu</name>
</developer>
+ <developer>
+ <id>snoopdave</id>
+ <name>Dave Johnson</name>
+ </developer>
</developers>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 5f2af18..ac95c9e 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -399,7 +399,6 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.3.1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/rest/src/main/java/org/apache/usergrid/rest/JacksonCustomMapperProvider.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/JacksonCustomMapperProvider.java b/stack/rest/src/main/java/org/apache/usergrid/rest/JacksonCustomMapperProvider.java
index b1ed0f8..ba0e44a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/JacksonCustomMapperProvider.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/JacksonCustomMapperProvider.java
@@ -17,6 +17,7 @@
package org.apache.usergrid.rest;
+import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -41,6 +42,9 @@ public class JacksonCustomMapperProvider implements ContextResolver<ObjectMapper
public JacksonCustomMapperProvider() {
logger.info( "JacksonCustomMapperProvider installed" );
+
+ // Should not be necessary
+ //mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatResource.java
index f3f7635..9f58163 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatResource.java
@@ -223,6 +223,7 @@ public class TomcatResource extends ExternalResource {
pw.println("elasticsearch.port=" + esPort);
pw.println("elasticsearch.cluster_name=test_cluster");
pw.println("elasticsearch.index_prefix=usergrid");
+ pw.println("elasticsearch.force_refresh=false");
pw.println("collections.keyspace=Usergrid_Applications");
pw.println("collections.keyspace.strategy.options=replication_factor:1");
@@ -251,6 +252,7 @@ public class TomcatResource extends ExternalResource {
pw.println("usergrid.recaptcha.public=");
pw.println("usergrid.recaptcha.private=");
pw.println("usergrid.sysadmin.email=");
+
pw.println("usergrid.management.admin_users_require_confirmation=false");
pw.println("usergrid.management.admin_users_require_activation=false");
pw.println("usergrid.management.notify_admin_of_activation=false");
@@ -258,6 +260,7 @@ public class TomcatResource extends ExternalResource {
pw.println("usergrid.management.organizations_require_activation=false");
pw.println("usergrid.management.notify_sysadmin_of_new_organizations=false");
pw.println("usergrid.management.notify_sysadmin_of_new_admin_users=false");
+
pw.println("usergrid.setup-test-account=true");
pw.println("usergrid.test-account.app=test-app");
pw.println("usergrid.test-account.organization=test-organization");
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/log4j.properties b/stack/rest/src/test/resources/log4j.properties
index a6ab96a..4ae35f8 100644
--- a/stack/rest/src/test/resources/log4j.properties
+++ b/stack/rest/src/test/resources/log4j.properties
@@ -26,6 +26,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
+log4j.logger.org.apache.usergrid=INFO
#log4j.logger.org.apache.usergrid.cassandra=DEBUG
#log4j.logger.org.apache.usergrid.persistence.cassandra=DEBUG
@@ -40,22 +41,25 @@ log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
+log4j.logger.org.apache.usergrid.rest.filters.MeteringFilter=ERROR
-log4j.logger.org.apache.usergrid=WARN
-log4j.logger.org.apache.usergrid.corepersistence=INFO
+#log4j.logger.org.apache.usergrid.corepersistence=DEBUG
#log4j.logger.org.apache.usergrid.corepersistence.CpEntityManagerFactory=DEBUG
-#log4j.logger.org.apache.usergrid.corepersistence.CpSetup=DEBUG
-#log4j.logger.com.netflix.hystrix=DEBUG
-#log4j.logger.org.antlr=DEBUG
+#log4j.logger.org.apache.usergrid.corepersistence.CpSetup=INFO
-#log4j.logger.org.apache.usergrid.persistence.CollectionIT=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.index=DEBUG
#log4j.logger.org.apache.usergrid.persistence.index.impl=INFO
-log4j.logger.org.apache.usergrid.persistence.index=INFO
-log4j.logger.org.apache.usergrid.persistence.collection=INFO
-#log4j.logger.org.elasticsearch=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.collection=INFO
+#log4j.logger.org.apache.usergrid.services=DEBUG
#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG, stdout
-log4j.logger.org.apache.usergrid.rest=WARN
-log4j.logger.org.apache.usergrid.rest.TomcatResource=INFO
-#log4j.logger.org.usergrid.rest.management=DEBUG
+#log4j.logger.org.apache.usergrid.rest.TomcatResource=INFO
+#log4j.logger.org.apache.usergrid.rest=DEBUG
+#log4j.logger.org.apache.usergrid.rest=INFO
+#log4j.logger.org.apache.usergrid.rest.management.users=DEBUG
+#log4j.logger.org.apache.usergrid.rest.organizations.users=DEBUG
+
+#log4j.logger.org.elasticsearch=DEBUG
+#log4j.logger.com.netflix.hystrix=DEBUG
+#log4j.logger.org.antlr=DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index 3872c20..5314b99 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -2,3 +2,5 @@ usergrid.mongo.disable=true
swagger.basepath=http://sometestvalue
usergrid.counter.batch.size=1
usergrid.test=true
+
+elasticsearch.force_refresh=false
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/services/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/services/src/test/resources/log4j.properties b/stack/services/src/test/resources/log4j.properties
index 9e6e040..835d205 100644
--- a/stack/services/src/test/resources/log4j.properties
+++ b/stack/services/src/test/resources/log4j.properties
@@ -28,16 +28,16 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
log4j.logger.org.apache.usergrid=INFO
-#log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
-#log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
-#log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
-#log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
-#log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
-#log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
+log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
+log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
+log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
+log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
#log4j.logger.org.apache.usergrid.persistence=INFO
#log4j.logger.org.apache.usergrid.corepersistence=DEBUG
@@ -48,7 +48,6 @@ log4j.logger.org.apache.usergrid=INFO
#log4j.logger.org.apache.usergrid.management.cassandra=DEBUG
-#log4j.logger.org.apache.usergrid.persistence.CollectionIT=DEBUG
#log4j.logger.org.apache.usergrid.persistence.index=DEBUG
#log4j.logger.org.apache.usergrid.persistence.collection=DEBUG
#log4j.logger.org.elasticsearch=DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223a9c23/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java b/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
index 5aebe18..2ff000d 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
@@ -29,7 +29,6 @@ import org.codehaus.jackson.JsonFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.index.query.Query;
-import org.apache.usergrid.persistence.exceptions.QueryParseException;
import org.apache.usergrid.services.ServiceAction;
import org.apache.usergrid.services.ServiceManager;
import org.apache.usergrid.services.ServiceParameter;
@@ -44,6 +43,7 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.apache.usergrid.persistence.index.exceptions.QueryParseException;
public class Cli extends ToolBase {