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/08/29 19:31:23 UTC
[18/19] git commit: Merge remote-tracking branch 'apache/two-dot-o'
into USERGRID-188
Merge remote-tracking branch 'apache/two-dot-o' into USERGRID-188
Conflicts:
stack/corepersistence/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/70b67393
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/70b67393
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/70b67393
Branch: refs/heads/USERGRID-188
Commit: 70b6739372c3dfb9663a3a3dbf966e01461aca91
Parents: b0c2598 b09b154
Author: Todd Nine <to...@apache.org>
Authored: Fri Aug 29 10:09:20 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Aug 29 10:09:20 2014 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 51 +-
.../corepersistence/CpEntityManager.java | 54 +-
.../corepersistence/CpEntityMapUtils.java | 2 +-
.../corepersistence/CpRelationManager.java | 36 +-
.../java/org/apache/usergrid/mq/Message.java | 10 +-
.../apache/usergrid/persistence/EntityRef.java | 3 +
.../apache/usergrid/persistence/PathQuery.java | 8 +-
.../usergrid/persistence/SimpleEntityRef.java | 36 +-
.../org/apache/usergrid/utils/JsonUtils.java | 8 +-
.../org/apache/usergrid/utils/UUIDUtils.java | 11 +
.../usergrid/batch/job/SchedulerRuntime2IT.java | 54 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 6 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 9 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 5 +-
.../corepersistence/CpEntityMapUtilsTest.java | 119 +
.../usergrid/persistence/CollectionIT.java | 19 +-
.../usergrid/persistence/CountingMutatorIT.java | 8 +-
.../org/apache/usergrid/persistence/GeoIT.java | 95 +-
.../persistence/GeoQueryBooleanTest.java | 166 +
.../usergrid/persistence/PathQueryIT.java | 4 +-
.../exception/CollectionRuntimeException.java | 1 -
.../MvccEntitySerializationStrategyImpl.java | 25 +-
...MvccEntitySerializationStrategyImplTest.java | 13 +-
.../persistence/core/util/ValidationUtils.java | 2 +-
.../persistence/model/entity/Entity.java | 2 +-
.../persistence/model/field/ArrayField.java | 4 +
.../persistence/model/field/SetField.java | 1 +
.../model/field/value/EntityObject.java | 12 +-
stack/corepersistence/pom.xml | 4 +-
.../usergrid/persistence/index/query/Query.java | 4 +-
.../index/query/tree/CpQueryFilterLexer.java | 3123 ------------------
.../index/query/tree/CpQueryFilterParser.java | 2501 --------------
.../persistence/index/impl/EntityIndexTest.java | 19 +
.../src/test/resources/log4j.properties | 6 +-
stack/pom.xml | 6 +-
.../test/resources/usergrid-test-context.xml | 3 +-
.../users/PermissionsResourceIT.java | 1 +
37 files changed, 589 insertions(+), 5842 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/70b67393/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/70b67393/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --cc stack/corepersistence/pom.xml
index da3f5d7,7dad18c..e2b87b9
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@@ -94,7 -94,7 +94,7 @@@
<systemPropertyVariables>
<archaius.deployment.environment>UNIT</archaius.deployment.environment>
</systemPropertyVariables>
- <argLine>-Xms4G -Xmx4G</argLine>
- <argLine>-Xms2G -Xmx4G -Dlog4j.debug=true -Dlog4j.configuration=file://${project.basedir}/src/test/resources/log4j.properties</argLine>
++ <argLine>-Xms2G -Xmx4G</argLine>
</configuration>
</plugin>