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/02/13 21:22:04 UTC
[46/50] [abbrv] git commit: Fixing merge issues in query validator,
still one test failure present
Fixing merge issues in query validator, still one test failure present
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/528afe5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/528afe5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/528afe5a
Branch: refs/heads/optimistic-tx-semantics
Commit: 528afe5ad9cee94a6821276dbf0a6f59479d0afa
Parents: 3dc1e9f
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Feb 13 10:00:00 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Feb 13 10:00:00 2014 -0500
----------------------------------------------------------------------
stack/query-validator/pom.xml | 8 ++++++++
.../org/apache/usergrid/query/validator/QueryITSuite.java | 3 ++-
.../src/test/resources/usergrid-test-context.xml | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/528afe5a/stack/query-validator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/query-validator/pom.xml b/stack/query-validator/pom.xml
index fda8466..0ebdcda 100644
--- a/stack/query-validator/pom.xml
+++ b/stack/query-validator/pom.xml
@@ -209,6 +209,14 @@
<version>0.0.3</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>usergrid-rest</artifactId>
+ <version>0.0.29-SNAPSHOT</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/528afe5a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryITSuite.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryITSuite.java b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryITSuite.java
index 8f92fc3..fd88cf2 100644
--- a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryITSuite.java
+++ b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/QueryITSuite.java
@@ -35,5 +35,6 @@ public class QueryITSuite {
//TODO Detecting current path
@ClassRule
- public static ITSetup serverResource = new ITSetup( cassandraResource, "../rest/src/main/webapp" );
+ public static ITSetup serverResource = new ITSetup( cassandraResource );
+ //public static ITSetup serverResource = new ITSetup( cassandraResource, "../rest/src/main/webapp" );
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/528afe5a/stack/query-validator/src/test/resources/usergrid-test-context.xml
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/resources/usergrid-test-context.xml b/stack/query-validator/src/test/resources/usergrid-test-context.xml
index b07cc2d..d1f50e5 100644
--- a/stack/query-validator/src/test/resources/usergrid-test-context.xml
+++ b/stack/query-validator/src/test/resources/usergrid-test-context.xml
@@ -22,13 +22,13 @@
<import resource="usergrid-rest-context.xml"/>
- <bean id="traceTagManager" class="org.usergrid.persistence.cassandra.util.TraceTagManager">
+ <bean id="traceTagManager" class="org.apache.usergrid.persistence.cassandra.util.TraceTagManager">
<property name="reportUnattached" value="false"/>
<property name="traceEnabled" value="false"/>
</bean>
- <bean id="binaryStore" class="org.usergrid.services.assets.data.LocalFileBinaryStore"/>
+ <bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore"/>
<bean id="setup" class="org.apache.usergrid.persistence.cassandra.Setup">
<constructor-arg ref="entityManagerFactory"/>