You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by as...@apache.org on 2015/11/05 23:30:29 UTC
[01/11] incubator-geode git commit: Closes #3 *Already completed*
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-409 066c11ebd -> eced0c5b1
Closes #3 *Already completed*
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/69024659
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/69024659
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/69024659
Branch: refs/heads/feature/GEODE-409
Commit: 6902465937cd9619cf71cc647bdbfe80f5ae71a4
Parents: 748c451
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Jul 7 11:57:17 2015 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Jul 7 11:57:17 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/11] incubator-geode git commit: GEODE-328: Create gemfire-common
project with Experimental annotation
Posted by as...@apache.org.
GEODE-328: Create gemfire-common project with Experimental annotation
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/60d3f001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/60d3f001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/60d3f001
Branch: refs/heads/feature/GEODE-409
Commit: 60d3f0019228a98e2e182c7cabd309c52719d4f7
Parents: 919d636
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Sep 15 13:54:50 2015 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Nov 3 11:32:54 2015 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 6 +
gemfire-common/build.gradle | 3 +
.../gemfire/annotations/Experimental.java | 40 ++++
.../annotations/ExperimentalJUnitTest.java | 183 +++++++++++++++++++
.../ClassInExperimentalPackage.java | 11 ++
.../experimentalpackage/package-info.java | 11 ++
.../ClassInNonExperimentalPackage.java | 11 ++
.../nonexperimentalpackage/package-info.java | 8 +
gemfire-core/build.gradle | 1 +
gemfire-rebalancer/build.gradle | 1 +
gemfire-web/build.gradle | 1 +
settings.gradle | 1 +
12 files changed, 277 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index b351729..f94c92b 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -21,6 +21,7 @@ configurations {
dependencies {
provided project(':gemfire-core')
+ archives project(':gemfire-common')
archives project(':gemfire-json')
archives project(':gemfire-joptsimple')
archives project(':gemfire-jgroups')
@@ -161,6 +162,10 @@ distributions {
into ('lib') {
exclude 'annotation*.jar'
+
+ from project(":gemfire-common").configurations.runtime
+ from project(":gemfire-common").configurations.archives.allArtifacts.files
+
from project(":gemfire-jgroups").configurations.runtime
from project(":gemfire-jgroups").configurations.archives.allArtifacts.files
@@ -210,6 +215,7 @@ def springExtReleaseLocalRepo = [ id:'ext-release-local', name:'Spring Maven ext
def MavenRepos = [ springReleaseRepo, springSnapshotRepo, springLibsReleaseRepo, springExtReleaseLocalRepo ]
// Jars to be published via Maven
+def commonJar = [publicationName:'commonJar', project:project(":gemfire-common").name]
def coreJar = [publicationName:'coreJar', project:project(":gemfire-core").name]
def jgroupsJar = [publicationName:'jgroupsJar', project:project(":gemfire-jgroups").name]
def jsonJar = [publicationName:'jsonJar', project:project(":gemfire-json").name]
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-common/build.gradle b/gemfire-common/build.gradle
new file mode 100755
index 0000000..aa8adcb
--- /dev/null
+++ b/gemfire-common/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+ provided project(path: ':gemfire-junit', configuration: 'testOutput')
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/main/java/com/gemstone/gemfire/annotations/Experimental.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/main/java/com/gemstone/gemfire/annotations/Experimental.java b/gemfire-common/src/main/java/com/gemstone/gemfire/annotations/Experimental.java
new file mode 100755
index 0000000..0cded83
--- /dev/null
+++ b/gemfire-common/src/main/java/com/gemstone/gemfire/annotations/Experimental.java
@@ -0,0 +1,40 @@
+package com.gemstone.gemfire.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Signifies that a public API (public class, method or field) is subject to
+ * incompatible changes, or even removal, in a future release. An API bearing
+ * this annotation is exempt from any compatibility guarantees made by its
+ * containing library.
+ *
+ * <p>Note that the presence of this annotation implies nothing
+ * about the quality or performance of the API in question, only the fact that
+ * it is not "API-frozen."
+ *
+ * <p>It is generally safe for <i>applications</i> to depend on beta APIs, at
+ * the cost of some extra work during upgrades. However, it is generally
+ * inadvisable for <i>libraries</i> (which get included on users' class paths,
+ * outside the library developers' control) to do so.
+ *
+ * <p>Inspired by similar annotations in JGroups, Spark, DataflowJavaSDK.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({
+ ElementType.ANNOTATION_TYPE,
+ ElementType.CONSTRUCTOR,
+ ElementType.FIELD,
+ ElementType.METHOD,
+ ElementType.PACKAGE,
+ ElementType.TYPE})
+public @interface Experimental {
+
+ /** Optional description */
+ String value() default "";
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/ExperimentalJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/ExperimentalJUnitTest.java b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/ExperimentalJUnitTest.java
new file mode 100755
index 0000000..38fa57f
--- /dev/null
+++ b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/ExperimentalJUnitTest.java
@@ -0,0 +1,183 @@
+package com.gemstone.gemfire.annotations;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.lang.reflect.AnnotatedElement;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.annotations.experimentalpackage.ClassInExperimentalPackage;
+import com.gemstone.gemfire.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+/**
+ * Unit tests for the <tt>Experimental</tt> annotation. Verifies that the
+ * annotation can be applied to Interfaces, Classes, Public and Protected
+ * Fields, Enums, Enum Constants, Public and Protected Methods, Packages,
+ * and Constructors.
+ *
+ * @author Kirk Lund
+ */
+@Category(UnitTest.class)
+public class ExperimentalJUnitTest {
+
+ private static final String FIELD_NAME = "field";
+ private static final String METHOD_NAME = "method";
+
+ @Test
+ public void shouldIdentifyExperimentalInterface() throws Exception {
+ assertThat(isExperimental(RegularInterface.class)).isFalse();
+ assertThat(isExperimental(ExperimentalInterface.class)).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalClass() throws Exception {
+ assertThat(isExperimental(RegularClass.class)).isFalse();
+ assertThat(isExperimental(ExperimentalClass.class)).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalPublicField() throws Exception {
+ assertThat(isExperimental(RegularPublicField.class.getField(FIELD_NAME))).isFalse();
+ assertThat(isExperimental(ExperimentalPublicField.class.getField(FIELD_NAME))).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalProtectedField() throws Exception {
+ assertThat(isExperimental(RegularProtectedField.class.getDeclaredField(FIELD_NAME))).isFalse();
+ assertThat(isExperimental(ExperimentalProtectedField.class.getDeclaredField(FIELD_NAME))).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalEnum() throws Exception {
+ assertThat(isExperimental(RegularEnum.class)).isFalse();
+ assertThat(isExperimental(ExperimentalEnum.class)).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalEnumConstant() throws Exception {
+ assertThat(isExperimental(RegularEnumInstance.class.getField(RegularEnumInstance.THREE.name()))).isFalse();
+ assertThat(isExperimental(ExperimentalEnumInstance.class.getField(ExperimentalEnumInstance.THREE.name()))).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalPublicMethod() throws Exception {
+ assertThat(isExperimental(RegularPublicMethod.class.getMethod(METHOD_NAME))).isFalse();
+ assertThat(isExperimental(ExperimentalPublicMethod.class.getMethod(METHOD_NAME))).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalProtectedMethod() throws Exception {
+ assertThat(isExperimental(RegularProtectedMethod.class.getDeclaredMethod(METHOD_NAME))).isFalse();
+ assertThat(isExperimental(ExperimentalProtectedMethod.class.getDeclaredMethod(METHOD_NAME))).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalPackage() throws Exception {
+ assertThat(isExperimental(ClassInNonExperimentalPackage.class.getPackage())).isFalse();
+ assertThat(isExperimental(ClassInExperimentalPackage.class.getPackage())).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalPublicConstructor() throws Exception {
+ assertThat(isExperimental(RegularPublicConstructor.class.getConstructor())).isFalse();
+ assertThat(isExperimental(ExperimentalPublicConstructor.class.getConstructor())).isTrue();
+ }
+
+ @Test
+ public void shouldIdentifyExperimentalProtectedConstructor() throws Exception {
+ assertThat(isExperimental(RegularProtectedConstructor.class.getConstructor())).isFalse();
+ assertThat(isExperimental(ExperimentalProtectedConstructor.class.getConstructor())).isTrue();
+ }
+
+ private static boolean isExperimental(final AnnotatedElement element) {
+ return element.getAnnotation(Experimental.class) != null;
+ }
+
+ public static interface RegularInterface {
+ }
+ @Experimental("This is an experimental interface")
+ public static interface ExperimentalInterface {
+ }
+
+ public static class RegularClass {
+ }
+ @Experimental("This is an experimental class")
+ public static class ExperimentalClass {
+ }
+
+ public static class RegularPublicField {
+ public final boolean field = false;
+ }
+ public static class ExperimentalPublicField {
+ @Experimental("This is an experimental public field")
+ public final boolean field = false;
+ }
+
+ public static class RegularProtectedField {
+ protected final boolean field = false;
+ }
+ public static class ExperimentalProtectedField {
+ @Experimental("This is an experimental protected field")
+ protected final boolean field = false;
+ }
+
+ public static enum RegularEnum {
+ ONE, TWO, THREE
+ }
+ @Experimental("This is an experimental enum")
+ public static enum ExperimentalEnum {
+ ONE, TWO, THREE
+ }
+
+ public static enum RegularEnumInstance {
+ ONE, TWO, THREE
+ }
+ public static enum ExperimentalEnumInstance {
+ ONE,
+ TWO,
+ @Experimental("This is an experimental enum constant")
+ THREE
+ }
+
+ public static class RegularPublicMethod {
+ public void method() {
+ }
+ }
+ public static class ExperimentalPublicMethod {
+ @Experimental("This is an experimental public method")
+ public void method() {
+ }
+ }
+
+ public static class RegularProtectedMethod {
+ public void method() {
+ }
+ }
+ public static class ExperimentalProtectedMethod {
+ @Experimental("This is an experimental protected method")
+ protected void method() {
+ }
+ }
+
+ public static class RegularPublicConstructor {
+ public RegularPublicConstructor() {
+ }
+ }
+ public static class ExperimentalPublicConstructor {
+ @Experimental("This is an experimental public constructor")
+ public ExperimentalPublicConstructor() {
+ }
+ }
+
+ public static class RegularProtectedConstructor {
+ public RegularProtectedConstructor() {
+ }
+ }
+ public static class ExperimentalProtectedConstructor {
+ @Experimental("This is an experimental protected constructor")
+ public ExperimentalProtectedConstructor() {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/ClassInExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/ClassInExperimentalPackage.java b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/ClassInExperimentalPackage.java
new file mode 100755
index 0000000..eaa1a97
--- /dev/null
+++ b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/ClassInExperimentalPackage.java
@@ -0,0 +1,11 @@
+package com.gemstone.gemfire.annotations.experimentalpackage;
+
+/**
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
+ * <tt>Experimental</tt> package.
+ *
+ * @author Kirk Lund
+ * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ */
+public class ClassInExperimentalPackage {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/package-info.java b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/package-info.java
new file mode 100755
index 0000000..7edce2c
--- /dev/null
+++ b/gemfire-common/src/test/java/com/gemstone/gemfire/annotations/experimentalpackage/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is an <tt>Experimental</tt>
+ * package.
+ *
+ * @author Kirk Lund
+ * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ */
+@Experimental("This is an experimental package")
+package com.gemstone.gemfire.annotations.experimentalpackage;
+
+import com.gemstone.gemfire.annotations.Experimental;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java b/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
new file mode 100755
index 0000000..711b533
--- /dev/null
+++ b/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
@@ -0,0 +1,11 @@
+package com.gemstone.gemfire.experimental.nonexperimentalpackage;
+
+/**
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
+ * <tt>Experimental</tt> package.
+ *
+ * @author Kirk Lund
+ * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ */
+public class ClassInNonExperimentalPackage {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/package-info.java b/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/package-info.java
new file mode 100755
index 0000000..958a9c5
--- /dev/null
+++ b/gemfire-common/src/test/java/com/gemstone/gemfire/experimental/nonexperimentalpackage/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a non-<tt>Experimental</tt>
+ * package.
+ *
+ * @author Kirk Lund
+ * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ */
+package com.gemstone.gemfire.experimental.nonexperimentalpackage;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle
index 1c17474..47a84f3 100755
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@ -70,6 +70,7 @@ dependencies {
testRuntime 'commons-io:commons-io:2.1'
testRuntime 'log4j:log4j:1.2.17'
+ compile project(':gemfire-common')
compile project(':gemfire-jgroups')
compile project(':gemfire-joptsimple')
compile project(':gemfire-json')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-rebalancer/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-rebalancer/build.gradle b/gemfire-rebalancer/build.gradle
index d87dd58..1226a7e 100644
--- a/gemfire-rebalancer/build.gradle
+++ b/gemfire-rebalancer/build.gradle
@@ -1,4 +1,5 @@
dependencies {
+ provided project(':gemfire-common')
provided project(':gemfire-core')
provided project(path: ':gemfire-junit', configuration: 'testOutput')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/gemfire-web/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-web/build.gradle b/gemfire-web/build.gradle
index f0de25a..0c02b86 100755
--- a/gemfire-web/build.gradle
+++ b/gemfire-web/build.gradle
@@ -12,6 +12,7 @@ dependencies {
// have to use output since we exclude the dependent classes from jar :(
provided project(path: ':gemfire-core', configuration: 'classesOutput')
+ testRuntime project(':gemfire-common')
testRuntime project(':gemfire-core')
provided project(path: ':gemfire-junit', configuration: 'testOutput')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60d3f001/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 4b2da7b..5cc0e30 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
rootProject.name = 'gemfire'
+include 'gemfire-common'
include 'gemfire-jgroups'
include 'gemfire-joptsimple'
include 'gemfire-json'
[08/11] incubator-geode git commit: GEODE-525:
addGatewayEventFilter() doc correction
Posted by as...@apache.org.
GEODE-525: addGatewayEventFilter() doc correction
The Javadoc comment for addGatewayEventFilter() says 'Removes...', should say 'Adds'.
This closes #28
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a572c370
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a572c370
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a572c370
Branch: refs/heads/feature/GEODE-409
Commit: a572c3704ea0c6db4b2525eb256ae9c4cb9040f4
Parents: 4b07e05
Author: Dave Barnes <db...@pivotal.io>
Authored: Fri Oct 30 14:05:31 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 4 10:28:17 2015 -0800
----------------------------------------------------------------------
.../gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a572c370/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
index b58e01b..0aeaf6f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
@@ -137,7 +137,7 @@ public interface AsyncEventQueueFactory {
public AsyncEventQueueFactory setDispatcherThreads(int numThreads);
/**
- * Removes a <code>GatewayEventFilter</code> to the attributes of
+ * Adds a <code>GatewayEventFilter</code> to the attributes of
* AsyncEventQueue being created by factory.
*
* @param filter
[09/11] incubator-geode git commit: Quoting build command in spark
connector instructions
Posted by as...@apache.org.
Quoting build command in spark connector instructions
It was displaying as one line instead of two.
This closes #24
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8c4e7498
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8c4e7498
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8c4e7498
Branch: refs/heads/feature/GEODE-409
Commit: 8c4e749877bbd187f8196434458ee6804f6b4745
Parents: a572c37
Author: jaoki <ja...@apache.org>
Authored: Tue Oct 27 00:29:41 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 4 10:34:47 2015 -0800
----------------------------------------------------------------------
gemfire-spark-connector/doc/1_building.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8c4e7498/gemfire-spark-connector/doc/1_building.md
----------------------------------------------------------------------
diff --git a/gemfire-spark-connector/doc/1_building.md b/gemfire-spark-connector/doc/1_building.md
index fd03277..eabceaa 100644
--- a/gemfire-spark-connector/doc/1_building.md
+++ b/gemfire-spark-connector/doc/1_building.md
@@ -7,8 +7,10 @@ You will need Scala 2.10 and sbt 0.13.5 to 0.13.7.
To build against Apache Geode, you need to build Geode first and publish the jars
to local repository. In the root of Geode directory, run:
+```
./gradlew clean build -Dskip.tests=true
./gradlew publishToMavenLocal
+```
In the root directory of connector project, run:
```
[10/11] incubator-geode git commit: GEODE-529 - Adding gemfire-common
to MavenJars to be published on maven
Posted by as...@apache.org.
GEODE-529 - Adding gemfire-common to MavenJars to be published on maven
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/af3199e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/af3199e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/af3199e4
Branch: refs/heads/feature/GEODE-409
Commit: af3199e45a4395521906e5059b435c7bf4176121
Parents: 8c4e749
Author: William Markito <wm...@pivotal.io>
Authored: Wed Nov 4 21:38:18 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Wed Nov 4 21:39:47 2015 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af3199e4/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index f94c92b..ed0bb86 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -220,7 +220,7 @@ def coreJar = [publicationName:'coreJar', project:project(":gemfire-core").name]
def jgroupsJar = [publicationName:'jgroupsJar', project:project(":gemfire-jgroups").name]
def jsonJar = [publicationName:'jsonJar', project:project(":gemfire-json").name]
def joptsimpleJar = [publicationName:'joptsimpleJar', project:project(":gemfire-joptsimple").name]
-def MavenJars = [ coreJar, jgroupsJar, jsonJar, joptsimpleJar ]
+def MavenJars = [ coreJar, jgroupsJar, jsonJar, joptsimpleJar, commonJar ]
afterEvaluate {
publishing {
[11/11] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-409
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-409
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/eced0c5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/eced0c5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/eced0c5b
Branch: refs/heads/feature/GEODE-409
Commit: eced0c5b1ad2fc4c64242bba459b1ec7b2ada714
Parents: 066c11e af3199e
Author: Ashvin Agrawal <as...@apache.org>
Authored: Thu Nov 5 14:29:10 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Thu Nov 5 14:29:10 2015 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 8 +-
gemfire-common/build.gradle | 3 +
.../gemfire/annotations/Experimental.java | 40 ++++
.../annotations/ExperimentalJUnitTest.java | 183 +++++++++++++++++++
.../ClassInExperimentalPackage.java | 11 ++
.../experimentalpackage/package-info.java | 11 ++
.../ClassInNonExperimentalPackage.java | 11 ++
.../nonexperimentalpackage/package-info.java | 8 +
gemfire-core/build.gradle | 1 +
.../asyncqueue/AsyncEventQueueFactory.java | 2 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 12 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 24 ++-
gemfire-rebalancer/build.gradle | 1 +
gemfire-spark-connector/doc/1_building.md | 2 +
gemfire-web/build.gradle | 18 +-
settings.gradle | 1 +
16 files changed, 322 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[06/11] incubator-geode git commit: GEODE-438: wait longer in test
validation code
Posted by as...@apache.org.
GEODE-438: wait longer in test validation code
Four places still existed that only waited for 3 seconds.
One of those was the last failure of this test.
Now the test waits 30 seconds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fc7811f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fc7811f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fc7811f3
Branch: refs/heads/feature/GEODE-409
Commit: fc7811f369d6ffac004cf110a9d87037014b0ac6
Parents: bb1b538
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Nov 3 16:45:45 2015 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Nov 3 16:50:38 2015 -0800
----------------------------------------------------------------------
.../management/MemoryThresholdsOffHeapDUnitTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc7811f3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 8faa03c..a6f24d0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -660,13 +660,13 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
r.put("oh3", new byte[157287]);
WaitCriterion wc = new WaitCriterion() {
public String description() {
- return "verify critical state";
+ return "expected region " + r + " to set memoryThreshold";
}
public boolean done() {
return r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 3000, 100, true);
+ waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(5);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -675,13 +675,13 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
r.destroy("oh3");
wc = new WaitCriterion() {
public String description() {
- return "verify critical state";
+ return "expected region " + r + " to unset memoryThreshold";
}
public boolean done() {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 3000, 100, true);
+ waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(6);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -1009,7 +1009,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return false;
}
};
- waitForCriterion(wc, 3000, 100, true);
+ waitForCriterion(wc, 30*1000, 10, true);
final Integer k = new Integer(2); // reload with same key again and again
final Integer expectedInvocations3 = new Integer(expectedInvocations.getAndIncrement());
@@ -1054,7 +1054,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 3000, 100, true);
+ waitForCriterion(wc, 30*1000, 10, true);
Integer k = new Integer(3); // same key as previously used, this time is should stick
Integer expectedInvocations8 = new Integer(expectedInvocations.incrementAndGet());
[04/11] incubator-geode git commit: GEODE-296: change test to handle
EntryDestroyedException
Posted by as...@apache.org.
GEODE-296: change test to handle EntryDestroyedException
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/97c53517
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/97c53517
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/97c53517
Branch: refs/heads/feature/GEODE-409
Commit: 97c53517e11e23936d488e2cca25f733a33f898e
Parents: 6b1c780
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Nov 3 14:53:07 2015 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Nov 3 14:53:07 2015 -0800
----------------------------------------------------------------------
.../tier/sockets/HAInterestPart2DUnitTest.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/97c53517/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index b861786..eaa1ca1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -272,12 +272,28 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
public boolean done() {
Region.Entry e1 = r1.getEntry(k1);
Region.Entry e2 = r1.getEntry(k2);
- if (e1 == null || !server_k1_updated.equals(e1.getValue())) {
- excuse = "k1=" + (e1 == null ? "null" : e1.getValue());
+ Object v1 = null;
+ if (e1 != null) {
+ try {
+ v1 = e1.getValue();
+ } catch (EntryDestroyedException ignore) {
+ // handled to fix GEODE-296
+ }
+ }
+ if (e1 == null || !server_k1_updated.equals(v1)) {
+ excuse = "v1=" + v1;
return false;
}
- if (e2 == null || !server_k2.equals(e2.getValue())) {
- excuse = "k2=" + (e2 == null ? "null" : e2.getValue());
+ Object v2 = null;
+ if (e2 != null) {
+ try {
+ v2 = e2.getValue();
+ } catch (EntryDestroyedException ignore) {
+ // handled to fix GEODE-296
+ }
+ }
+ if (e2 == null || !server_k2.equals(v2)) {
+ excuse = "v2=" + v2;
return false;
}
return true;
[05/11] incubator-geode git commit: GEODE-522: Exclude only gradle
output dirs from eclipse/idea project
Posted by as...@apache.org.
GEODE-522: Exclude only gradle output dirs from eclipse/idea project
Using minusConfigurations was causing gradle to exclude the entire
gemfire-core project from the gemfire-web classpath. All we wanted to
filter out was the generated output directories from gradle, which are
getting added because we have an ugly provided dependency on those
output directory.
Now we explicitly filter out only the directories we don't want.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bb1b538e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bb1b538e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bb1b538e
Branch: refs/heads/feature/GEODE-409
Commit: bb1b538ea984a37f8040af1ab09de3422a7c8a76
Parents: 97c5351
Author: Dan Smith <up...@apache.org>
Authored: Tue Nov 3 14:39:18 2015 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Nov 3 16:36:41 2015 -0800
----------------------------------------------------------------------
gemfire-web/build.gradle | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb1b538e/gemfire-web/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-web/build.gradle b/gemfire-web/build.gradle
index 0c02b86..564b07d 100755
--- a/gemfire-web/build.gradle
+++ b/gemfire-web/build.gradle
@@ -17,8 +17,21 @@ dependencies {
provided project(path: ':gemfire-junit', configuration: 'testOutput')
}
-eclipse.classpath.minusConfigurations += [ project(':gemfire-core').configurations.classesOutput ]
-idea.module.scopes.PROVIDED.minus += [ project(':gemfire-core').configurations.classesOutput ]
+
+//Remove the gradle output directories from the eclipse classpath. These
+//are added by the classesOutput configuration, above. Unfortunately, using
+//minusConfigurations does not work here, because it removes the entire
+//gemfire-core project
+eclipse.classpath.file {
+ whenMerged { classpath ->
+ classpath.entries.removeAll { entry -> entry.path.contains('gemfire-core/build')}
+ }
+}
+idea.module.iml {
+ whenMerged {module ->
+ module.dependencies.removeAll { entry -> entry.toString().contains('gemfire-core/build')}
+ }
+}
artifacts {
archives jar
[07/11] incubator-geode git commit: Merge remote-tracking branch
'origin/master' into develop
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/master' into develop
There was an empty commit made by mistake to master that should have been made
on develop. Merging to develop so that it's clear in our history that all
changes on master are also on develop.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4b07e05c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4b07e05c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4b07e05c
Branch: refs/heads/feature/GEODE-409
Commit: 4b07e05cf1cc81667a09ee9117039f81855787bc
Parents: fc7811f 6902465
Author: Dan Smith <up...@apache.org>
Authored: Wed Nov 4 10:20:15 2015 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 4 10:20:15 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/11] incubator-geode git commit: Merge remote-tracking branch
'origin/feature/GEODE-409' into develop
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/feature/GEODE-409' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6b1c780b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6b1c780b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6b1c780b
Branch: refs/heads/feature/GEODE-409
Commit: 6b1c780b3f79ce1822cf59a34f10360bc4f649b7
Parents: 60d3f00 ee4cc01
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Nov 3 11:37:00 2015 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Nov 3 11:37:00 2015 -0800
----------------------------------------------------------------------
.../gemfire/distributed/LocatorLauncher.java | 2 +-
.../gemfire/distributed/ServerLauncher.java | 2 +-
.../gemfire/distributed/internal/DSClock.java | 2 +-
.../internal/DistributionManager.java | 42 ++++++----
.../gemfire/internal/cache/LocalRegion.java | 5 +-
.../cache/control/OffHeapMemoryMonitor.java | 25 ++++--
.../offheap/SimpleMemoryAllocatorImpl.java | 2 +-
.../java/batterytest/greplogs/LogConsumer.java | 45 +++++------
.../MemoryThresholdsOffHeapDUnitTest.java | 16 ++--
.../gemstone/gemfire/cache30/CacheTestCase.java | 10 +++
.../DistributedNoAckRegionCCEDUnitTest.java | 2 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 37 ++++++++-
.../cache30/RegionReliabilityTestCase.java | 84 ++++++++++++--------
.../disttx/DistTXPersistentDebugDUnitTest.java | 21 -----
.../internal/cache/GIIDeltaDUnitTest.java | 2 +
.../cache/OffHeapEvictionDUnitTest.java | 2 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 4 +-
.../PartitionedRegionSingleHopDUnitTest.java | 16 +++-
.../cache/RemoteTransactionDUnitTest.java | 1 -
.../control/MemoryMonitorOffHeapJUnitTest.java | 2 +-
.../control/RebalanceOperationDUnitTest.java | 8 +-
...gionFunctionExecutionSingleHopDUnitTest.java | 2 +
.../PersistentPartitionedRegionDUnitTest.java | 1 +
.../cache/tier/sockets/Bug36995DUnitTest.java | 2 +
.../cache/tier/sockets/Bug37210DUnitTest.java | 22 +++--
.../tier/sockets/ClientServerMiscDUnitTest.java | 2 +
.../tier/sockets/HAInterestPart1DUnitTest.java | 1 +
.../CompressionRegionConfigDUnitTest.java | 1 +
.../internal/lang/ThreadUtilsJUnitTest.java | 37 ++++-----
.../management/ClientHealthStatsDUnitTest.java | 2 +-
.../management/OffHeapManagementDUnitTest.java | 16 ++--
.../src/test/java/dunit/standalone/ChildVM.java | 4 +-
.../java/dunit/standalone/DUnitLauncher.java | 4 +-
.../gemfire/cache/util/AutoBalancer.java | 14 ++++
.../util/AutoBalancerIntegrationJUnitTest.java | 5 ++
.../cache/util/AutoBalancerJUnitTest.java | 39 +++++++++
36 files changed, 320 insertions(+), 162 deletions(-)
----------------------------------------------------------------------