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/09/02 17:20:16 UTC
[1/2] git commit: Get permissions right,
who knows who that WAR came from.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o e6c3f08fa -> 2b1f7351d
Get permissions right, who knows who that WAR came from.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f7e8f26d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f7e8f26d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f7e8f26d
Branch: refs/heads/two-dot-o
Commit: f7e8f26d585190d55ddb104e92b9250da7cf023a
Parents: e6c3f08
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Sep 2 11:19:03 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Sep 2 11:19:03 2014 -0400
----------------------------------------------------------------------
.../awscluster/src/main/dist/init_instance/init_rest_server.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f7e8f26d/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
index 3adfce4..3464ea7 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
@@ -111,11 +111,12 @@ cd /usr/share/usergrid/scripts
groovy wait_for_instances.groovy cassandra ${CASSANDRA_NUM_SERVERS}
groovy wait_for_instances.groovy graphite ${GRAPHITE_NUM_SERVERS}
-chmod 660 /usr/share/usergrid/webapps/ROOT.war
-
+# link WAR and Portal into Tomcat's webapps dir
rm -rf /var/lib/tomcat7/webapps/*
ln -s /usr/share/usergrid/webapps/ROOT.war /var/lib/tomcat7/webapps/ROOT.war
ln -s /usr/share/usergrid/webapps/portal /var/lib/tomcat7/webapps/portal
+chown -R tomcat7 /usr/share/usergrid/webapps
+chown -R tomcat7 /var/lib/tomcat7/webapps
# configure usergrid
mkdir -p /usr/share/tomcat7/lib
[2/2] git commit: Test to prove that arrays,
not queries and geo queries play well together.
Posted by sn...@apache.org.
Test to prove that arrays, not queries and geo queries play well together.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2b1f7351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2b1f7351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2b1f7351
Branch: refs/heads/two-dot-o
Commit: 2b1f7351d33d1c1be6ab74b1a3f2221a9afe3295
Parents: f7e8f26
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Sep 2 11:19:40 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Sep 2 11:19:40 2014 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/GeoQueryBooleanTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2b1f7351/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
index 0d9810f..0e1faa5 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
@@ -112,7 +112,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT {
@Test
- @Ignore // work in progress
+ //@Ignore // work in progress
public void testGeoQueryWithNot() throws Exception {
log.info( "GeoQueryBooleanTest.testGeoQueryWithOr" );
@@ -176,14 +176,14 @@ public class GeoQueryBooleanTest extends AbstractCoreIT {
"select * where NOT blockedBy.name='bart' and location within 400 of "
+ center.getLat() + "," + center.getLon());
Results listResults = em.searchCollection( em.getApplicationRef(), "users", query );
- assertEquals( 2, listResults.size() );
+ assertEquals( 1, listResults.size() );
// one user within 400 meters IS blocked by bart
query = Query.fromQL(
"select * where blockedBy.name='bart' and location within 400 of "
+ center.getLat() + "," + center.getLon());
listResults = em.searchCollection( em.getApplicationRef(), "users", query );
- assertEquals( 2, listResults.size() );
+ assertEquals( 1, listResults.size() );
}