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 2015/11/18 17:27:28 UTC
[07/50] usergrid git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/67ab2443
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/67ab2443
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/67ab2443
Branch: refs/heads/USERGRID-872
Commit: 67ab24430c90586122e8458a168d48bad30bf494
Parents: de42b9c 204bf04
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Nov 12 08:35:38 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Nov 12 08:35:38 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 8 +-
.../read/traverse/AbstractReadGraphFilter.java | 8 +-
.../usergrid/corepersistence/index/RxTest.java | 1 +
.../persistence/graph/guice/GraphModule.java | 7 -
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../impl/shard/ShardEntryGroup.java | 3 +-
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 ------
.../impl/shard/count/ShardKey.java | 75 ---
.../shard/impl/NodeShardAllocationImpl.java | 19 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 158 ++---
.../impl/ShardedEdgeSerializationImpl.java | 28 -
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +
.../graph/GraphManagerShardingIT.java | 208 ------
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 28 +
.../shard/count/NodeShardApproximationTest.java | 627 -------------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 5 +
.../index/impl/EntityMappingParser.java | 4 +
.../index/impl/IndexOperationMessage.java | 4 +-
.../index/impl/EntityToMapConverterTest.java | 48 ++
.../java-wns/1.2-USERGRID/_remote.repositories | 7 +
...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 0 -> 1836665 bytes
.../java-wns-1.2-USERGRID-javadoc.jar | Bin 0 -> 234289 bytes
.../java-wns-1.2-USERGRID-sources.jar | Bin 0 -> 21654 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.jar | Bin 0 -> 33164 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.pom | 128 ++++
stack/pom.xml | 4 -
stack/rest/pom.xml | 10 +
.../exceptions/AbstractExceptionMapper.java | 8 +-
stack/scripts/multitenant_migrate.py | 48 +-
stack/services/pom.xml | 23 +-
.../services/AbstractCollectionService.java | 10 +-
.../services/notifications/wns/WNSAdapter.java | 5 +-
.../notifications/wns/WNSAdapterTest.java | 49 ++
43 files changed, 438 insertions(+), 1998 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/67ab2443/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/67ab2443/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/RxTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/67ab2443/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index c1ded77,ae55ea1..3f7b68b
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -1574,26 -1646,7 +1574,23 @@@
</plugins>
</reporting>
--
+ <profiles>
+ <profile>
+ <id>jacoco</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
-
- <!--
<repositories>
<repository>
<id>local-dependencies</id>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/67ab2443/stack/rest/pom.xml
----------------------------------------------------------------------
diff --cc stack/rest/pom.xml
index d70cdd8,7b1bad6..601ed61
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@@ -395,6 -400,24 +395,16 @@@
<artifactId>usergrid-java-client</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.usergrid</groupId>
- <artifactId>usergrid-services</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-apache-client</artifactId>
+ <version>1.19</version>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/67ab2443/stack/services/pom.xml
----------------------------------------------------------------------
diff --cc stack/services/pom.xml
index 0c66ccf,a37e6ee..9837e76
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@@ -455,47 -439,7 +456,29 @@@
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <!-- Would be nice if we could exclude this dependency on Jersey 1.
- Apparently Java-WNS 1.3.1 will move to Jersey 2.
- <exclusion>
- <artifactId>jersey-apache-client</artifactId>
- <groupId>com.sun.jersey.contribs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-client</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- -->
- </exclusions>
+ <version>1.2-USERGRID</version>
</dependency>
-
</dependencies>
+
+ <!--
+ Need jacoco profile here because we override the parent's surefire plugin settings above.
+ -->
+ <profiles>
+ <profile>
+ <id>jacoco</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>