geode git commit: GEODE-419: spotless
Repository: geode
Updated Branches:
refs/heads/develop ef199f203 -> 2c5f203f4
GEODE-419: spotless
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/2c5f203f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/2c5f203f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/2c5f203f
Branch: refs/heads/develop
Commit: 2c5f203f4fec3091b5d2d6a58da4536b9fa52ad7
Parents: ef199f2
Author: Udo Kohlmeyer
Authored: Tue Dec 27 16:41:04 2016 -0800
Committer: Udo Kohlmeyer
Committed: Tue Dec 27 16:41:04 2016 -0800
--
.../geode/internal/net/SSLConfigurationFactoryJUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/2c5f203f/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 344c03f..4f8d5b8 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -212,7 +212,7 @@ public class SSLConfigurationFactoryJUnitTest {
public void getSSLConfigUsingJavaProperties() {
Properties properties = new Properties();
properties.setProperty(CLUSTER_SSL_ENABLED, "true");
-properties.setProperty(MCAST_PORT,"0");
+properties.setProperty(MCAST_PORT, "0");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE, "keystore");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_TYPE, "JKS");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_PASSWORD,
"keystorePassword");
geode git commit: GEODE-419: fixed mcast-port property for test
Repository: geode
Updated Branches:
refs/heads/develop 001f66242 -> ef199f203
GEODE-419: fixed mcast-port property for test
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ef199f20
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ef199f20
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ef199f20
Branch: refs/heads/develop
Commit: ef199f203a42f9f70b5fd4f165b5b7722c9ce898
Parents: 001f662
Author: Udo Kohlmeyer
Authored: Tue Dec 27 16:14:58 2016 -0800
Committer: Udo Kohlmeyer
Committed: Tue Dec 27 16:14:58 2016 -0800
--
.../geode/internal/net/SSLConfigurationFactoryJUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/ef199f20/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 0304b16..344c03f 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.net;
import static
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
import static
org.apache.geode.distributed.ConfigurationProperties.SSL_CLUSTER_ALIAS;
import static
org.apache.geode.distributed.ConfigurationProperties.SSL_DEFAULT_ALIAS;
@@ -211,6 +212,7 @@ public class SSLConfigurationFactoryJUnitTest {
public void getSSLConfigUsingJavaProperties() {
Properties properties = new Properties();
properties.setProperty(CLUSTER_SSL_ENABLED, "true");
+properties.setProperty(MCAST_PORT,"0");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE, "keystore");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_TYPE, "JKS");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_PASSWORD,
"keystorePassword");
geode git commit: GEODE-2251: Improve Statistics Interface/Implementation graphics [Forced Update!]
Repository: geode Updated Branches: refs/heads/develop d0cfba9b5 -> 001f66242 (forced update) GEODE-2251: Improve Statistics Interface/Implementation graphics Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/001f6624 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/001f6624 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/001f6624 Branch: refs/heads/develop Commit: 001f662423ac48d7e9ec1039d0a4fea90b78109e Parents: 6992fcf Author: Dave Barnes Authored: Tue Dec 27 15:35:15 2016 -0800 Committer: Dave Barnes Committed: Tue Dec 27 16:10:31 2016 -0800 -- geode-docs/images/Statistics-implementation.png | Bin 0 -> 28057 bytes geode-docs/images/Statistics-interfaces.png | Bin 0 -> 28312 bytes geode-docs/images/statistics-1.gif | Bin 8644 -> 0 bytes .../application_defined_statistics.html.md.erb | 28 +-- 4 files changed, 26 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/001f6624/geode-docs/images/Statistics-implementation.png -- diff --git a/geode-docs/images/Statistics-implementation.png b/geode-docs/images/Statistics-implementation.png new file mode 100644 index 000..4e3bf91 Binary files /dev/null and b/geode-docs/images/Statistics-implementation.png differ http://git-wip-us.apache.org/repos/asf/geode/blob/001f6624/geode-docs/images/Statistics-interfaces.png -- diff --git a/geode-docs/images/Statistics-interfaces.png b/geode-docs/images/Statistics-interfaces.png new file mode 100644 index 000..412b51c Binary files /dev/null and b/geode-docs/images/Statistics-interfaces.png differ http://git-wip-us.apache.org/repos/asf/geode/blob/001f6624/geode-docs/images/statistics-1.gif -- diff --git a/geode-docs/images/statistics-1.gif b/geode-docs/images/statistics-1.gif deleted file mode 100644 index 75652f5..000 Binary files a/geode-docs/images/statistics-1.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode/blob/001f6624/geode-docs/managing/statistics/application_defined_statistics.html.md.erb -- diff --git a/geode-docs/managing/statistics/application_defined_statistics.html.md.erb b/geode-docs/managing/statistics/application_defined_statistics.html.md.erb index 2ae5068..34461da 100644 --- a/geode-docs/managing/statistics/application_defined_statistics.html.md.erb +++ b/geode-docs/managing/statistics/application_defined_statistics.html.md.erb @@ -32,8 +32,32 @@ The Geode package, `org.apache.geode`, includes the following interfaces for def The statistics interfaces are instantiated using statistics factory methods that are included in the package. For coding examples, see the online Java API documentation for `StatisticsFactory` and `StatisticsTypeFactory`. -As an example, an application server might collect statistics on each client session in order to gauge whether client requests are being processed in a satisfactory manner. Long request queues or long server response times could prompt some capacity-management action such as starting additional application servers. To set this up, each session-state data point is identified and defined in a `StatisticDescriptor` instance. One instance might be a `RequestsInQueue` gauge, a non-negative integer that increments and decrements. Another could be a `RequestCount` counter, an integer that always increments. A list of these descriptors is used to instantiate a `SessionStateStats` `StatisticsType`. When a client connects, the application server uses the `StatisticsType` object to create a session-specific `Statistics` object. The server then uses the `Statistics` methods to modify and retrieve the clientâs statistics. This figure illustrates the relationships between the statistics interfa ces and shows the implementation of this use case. +As an example, an application server might collect statistics on each client session in order to +gauge whether client requests are being processed in a satisfactory manner. Long request queues or +long server response times could prompt some capacity-management action such as starting additional +application servers. To set this up, each session-state data point is identified and defined in a +`StatisticDescriptor` instance. One instance might be a `RequestsInQueue` gauge, a non-negative +integer that increments and decrements. Another could be a `RequestCount` counter, an integer that +always increments. A list of these descriptors is used to instantiate a `SessionStateStats` +`StatisticsType`. When a
geode git commit: GEODE-2251: Improve Statistics Interface/Implementation graphics
Repository: geode Updated Branches: refs/heads/develop 6992fcf34 -> d0cfba9b5 GEODE-2251: Improve Statistics Interface/Implementation graphics Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d0cfba9b Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d0cfba9b Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d0cfba9b Branch: refs/heads/develop Commit: d0cfba9b5727133e8b04e0c54c166e6bf5634144 Parents: 6992fcf Author: Dave Barnes Authored: Tue Dec 27 15:35:15 2016 -0800 Committer: Dave Barnes Committed: Tue Dec 27 15:41:49 2016 -0800 -- geode-docs/images/Statistics-implementation.png | Bin 0 -> 28057 bytes geode-docs/images/Statistics-interfaces.png | Bin 0 -> 28057 bytes geode-docs/images/statistics-1.gif | Bin 8644 -> 0 bytes .../application_defined_statistics.html.md.erb | 28 +-- 4 files changed, 26 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/d0cfba9b/geode-docs/images/Statistics-implementation.png -- diff --git a/geode-docs/images/Statistics-implementation.png b/geode-docs/images/Statistics-implementation.png new file mode 100644 index 000..4e3bf91 Binary files /dev/null and b/geode-docs/images/Statistics-implementation.png differ http://git-wip-us.apache.org/repos/asf/geode/blob/d0cfba9b/geode-docs/images/Statistics-interfaces.png -- diff --git a/geode-docs/images/Statistics-interfaces.png b/geode-docs/images/Statistics-interfaces.png new file mode 100644 index 000..4e3bf91 Binary files /dev/null and b/geode-docs/images/Statistics-interfaces.png differ http://git-wip-us.apache.org/repos/asf/geode/blob/d0cfba9b/geode-docs/images/statistics-1.gif -- diff --git a/geode-docs/images/statistics-1.gif b/geode-docs/images/statistics-1.gif deleted file mode 100644 index 75652f5..000 Binary files a/geode-docs/images/statistics-1.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode/blob/d0cfba9b/geode-docs/managing/statistics/application_defined_statistics.html.md.erb -- diff --git a/geode-docs/managing/statistics/application_defined_statistics.html.md.erb b/geode-docs/managing/statistics/application_defined_statistics.html.md.erb index 2ae5068..34461da 100644 --- a/geode-docs/managing/statistics/application_defined_statistics.html.md.erb +++ b/geode-docs/managing/statistics/application_defined_statistics.html.md.erb @@ -32,8 +32,32 @@ The Geode package, `org.apache.geode`, includes the following interfaces for def The statistics interfaces are instantiated using statistics factory methods that are included in the package. For coding examples, see the online Java API documentation for `StatisticsFactory` and `StatisticsTypeFactory`. -As an example, an application server might collect statistics on each client session in order to gauge whether client requests are being processed in a satisfactory manner. Long request queues or long server response times could prompt some capacity-management action such as starting additional application servers. To set this up, each session-state data point is identified and defined in a `StatisticDescriptor` instance. One instance might be a `RequestsInQueue` gauge, a non-negative integer that increments and decrements. Another could be a `RequestCount` counter, an integer that always increments. A list of these descriptors is used to instantiate a `SessionStateStats` `StatisticsType`. When a client connects, the application server uses the `StatisticsType` object to create a session-specific `Statistics` object. The server then uses the `Statistics` methods to modify and retrieve the clientâs statistics. This figure illustrates the relationships between the statistics interfa ces and shows the implementation of this use case. +As an example, an application server might collect statistics on each client session in order to +gauge whether client requests are being processed in a satisfactory manner. Long request queues or +long server response times could prompt some capacity-management action such as starting additional +application servers. To set this up, each session-state data point is identified and defined in a +`StatisticDescriptor` instance. One instance might be a `RequestsInQueue` gauge, a non-negative +integer that increments and decrements. Another could be a `RequestCount` counter, an integer that +always increments. A list of these descriptors is used to instantiate a `SessionStateStats` +`StatisticsType`. When a client connects,
geode git commit: Code cleanup
Repository: geode
Updated Branches:
refs/heads/develop a76aaf0c0 -> 6992fcf34
Code cleanup
See https://reviews.apache.org/r/55017/
While investigating a couple of failures I ran across a few things
that needed to be fixed.
1. EndpointManagerImpl was skipping notification of listeners if there
was no member ID in an endpoint but the member ID is no longer used.
I removed the check.
2. During a Forced Disconnect CacheClientProxy was skipping a lot of
clean-up because it was expecting a CacheClosedException instead of
a CancelException. We should never catch CacheClosedException -
always catch CancelException.
3. When SSL is being used the P2P Reader Threads were not setting connection
attributes in the thread's name like we do with non-SSL reader threads.
This made debugging an SSL failure a bit more difficult.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/6992fcf3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/6992fcf3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/6992fcf3
Branch: refs/heads/develop
Commit: 6992fcf3438f0d5de246579400bdf8f44928429e
Parents: a76aaf0
Author: Bruce Schuchardt
Authored: Tue Dec 27 14:59:31 2016 -0800
Committer: Bruce Schuchardt
Committed: Tue Dec 27 14:59:31 2016 -0800
--
.../client/internal/EndpointManagerImpl.java| 4 ++--
.../cache/tier/sockets/CacheClientProxy.java| 4 ++--
.../apache/geode/internal/tcp/Connection.java | 22
3 files changed, 17 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/6992fcf3/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
index 6d5d9d6..f05815f 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
@@ -314,7 +314,7 @@ public class EndpointManagerImpl implements EndpointManager
{
public class EndpointListenerForBridgeMembership implements
EndpointManager.EndpointListener {
public void endpointCrashed(Endpoint endpoint) {
- if (endpoint.getMemberId() == null ||
cancelCriterion.isCancelInProgress()) {
+ if (cancelCriterion.isCancelInProgress()) {
return;
}
// logger.warn("EMANFIRE:CRASH:"+endpoint.getLocation());
@@ -322,7 +322,7 @@ public class EndpointManagerImpl implements EndpointManager
{
}
public void endpointNoLongerInUse(Endpoint endpoint) {
- if (endpoint.getMemberId() == null ||
cancelCriterion.isCancelInProgress()) {
+ if (cancelCriterion.isCancelInProgress()) {
return;
}
// logger.warn("EMANFIRE:LEFT:"+endpoint.getLocation());
http://git-wip-us.apache.org/repos/asf/geode/blob/6992fcf3/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 6e31fe5..562c0ef 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1014,7 +1014,7 @@ public class CacheClientProxy implements ClientSession {
}
try {
this.cils[RegisterInterestTracker.interestListIndex].clearClientInterestList();
-} catch (CacheClosedException e) {
+} catch (CancelException e) {
// ignore if cache is shutting down
}
// Commented to fix bug 40259
@@ -2056,7 +2056,7 @@ public class CacheClientProxy implements ClientSession {
protected FilterProfile getProfile(String regionName) {
try {
return this.ccp._cache.getFilterProfile(regionName);
- } catch (CacheClosedException e) {
+ } catch (CancelException e) {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/6992fcf3/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index d44476f..ca5cce1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/g
geode git commit: Removing unused Collaboration lock class and its unit tests
Repository: geode
Updated Branches:
refs/heads/develop 462ebb032 -> a76aaf0c0
Removing unused Collaboration lock class and its unit tests
This class isn't used in Geode and isn't a public API.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a76aaf0c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a76aaf0c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a76aaf0c
Branch: refs/heads/develop
Commit: a76aaf0c02e2c4a32d7c001073f1ecc316470b60
Parents: 462ebb0
Author: Bruce Schuchardt
Authored: Tue Dec 27 14:57:21 2016 -0800
Committer: Bruce Schuchardt
Committed: Tue Dec 27 14:57:21 2016 -0800
--
.../internal/locks/Collaboration.java | 454 --
.../internal/locks/CollaborationJUnitTest.java | 615 ---
2 files changed, 1069 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/a76aaf0c/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
deleted file mode 100644
index ca9ef70..000
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
- */
-
-package org.apache.geode.distributed.internal.locks;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.Logger;
-
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-
-/**
- * Synchronization structure which allows multiple threads to lock the
structure. Implementation is
- * fair: the next waiting thread will be serviced.
- *
- * Collaborating threads may jointly synchronize on this structure if they all
agree on the same
- * topic of collaboration.
- *
- * Threads that want to change the topic will wait until the current topic has
been released.
- *
- */
-public class Collaboration {
-
- private static final Logger logger = LogService.getLogger();
-
- private final static Object NULL_TOPIC = null;
-
- /**
- * The current topic of collaboration
- *
- * guarded.By {@link #topicsQueue}
- */
- private volatile Topic currentTopic;
-
- /** Ordered queue of pending topics for collaboration */
- private final List topicsQueue = new ArrayList();
-
- /** Map of external topic to internal wrapper object (Topic) */
- private final Map topicsMap = new HashMap();
-
- private final CancelCriterion stopper;
-
- /**
- * Constructs new stoppable instance of Collaboration which will heed an
interrupt request if it
- * is acceptable to the creator of the lock.
- */
- public Collaboration(CancelCriterion stopper) {
-this.stopper = stopper;
- }
-
- /**
- * Acquire permission to participate in the collaboration. Returns
immediately if topic matches
- * the current topic. Otherwise, this will block until the Collaboration has
been freed by the
- * threads working on the current topic. This call is interruptible.
- *
- * @param topicObject Object to collaborate on
- *
- * @throws InterruptedException if thread is interrupted
- */
- public void acquire(Object topicObject) throws InterruptedException {
-throw new UnsupportedOperationException(
-LocalizedStrings.Collaboration_NOT_IMPLEMENTED.toLocalizedString());
- }
-
- /**
- * Must be synchronized on this.topicsQueue... Asserts that thread is not
reentering.
- */
- private void assertNotRecursingTopic(Object topicObject) {
-Assert.assertTrue(false, Thread.currentThread() + " attempting to lock
topic " + topicObject
-+ " while locking topic " + this.current
geode git commit: Exclude Flaky tests from test categories
Repository: geode
Updated Branches:
refs/heads/develop d385d -> 462ebb032
Exclude Flaky tests from test categories
excluding Flaky tests from membershipTests, dlockTests, etc.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/462ebb03
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/462ebb03
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/462ebb03
Branch: refs/heads/develop
Commit: 462ebb0322742727bb6933257204fe453a9bfd20
Parents: d38
Author: Bruce Schuchardt
Authored: Tue Dec 27 14:55:06 2016 -0800
Committer: Bruce Schuchardt
Committed: Tue Dec 27 14:56:41 2016 -0800
--
gradle/test.gradle | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/462ebb03/gradle/test.gradle
--
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 724b569..40fa962 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -139,6 +139,7 @@ subprojects {
task clientServerTest(type:Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.ClientServerTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -148,6 +149,7 @@ subprojects {
task dlockTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.DLockTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -157,6 +159,7 @@ subprojects {
task membershipTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.MembershipTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -166,6 +169,7 @@ subprojects {
task restAPITest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.RestAPITest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -176,6 +180,7 @@ subprojects {
task serializationTest(type:Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.serializationTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
geode git commit: GEODE-419: Added test to test that for ssl it fails over to javax properties.
Repository: geode
Updated Branches:
refs/heads/develop adaacaa98 -> d385d
GEODE-419: Added test to test that for ssl it fails over to javax properties.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d385
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d385
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d385
Branch: refs/heads/develop
Commit: d385d63b604ffb549ebb206f5c68d192ab4f
Parents: adaacaa
Author: Udo Kohlmeyer
Authored: Tue Dec 27 14:47:18 2016 -0800
Committer: Udo Kohlmeyer
Committed: Tue Dec 27 14:47:18 2016 -0800
--
.../geode/internal/net/SSLConfigurationFactoryJUnitTest.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/d385/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index e95cc7a..0304b16 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -212,7 +212,13 @@ public class SSLConfigurationFactoryJUnitTest {
Properties properties = new Properties();
properties.setProperty(CLUSTER_SSL_ENABLED, "true");
System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE, "keystore");
-
+System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_TYPE, "JKS");
+System.setProperty(SSLConfigurationFactory.JAVAX_KEYSTORE_PASSWORD,
"keystorePassword");
+System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE, "truststore");
+System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE_PASSWORD,
"truststorePassword");
+System.setProperty(SSLConfigurationFactory.JAVAX_TRUSTSTORE_TYPE, "JKS");
+DistributionConfigImpl distributionConfig = new
DistributionConfigImpl(properties);
+SSLConfigurationFactory.setDistributionConfig(distributionConfig);
SSLConfig sslConfig =
SSLConfigurationFactory.getSSLConfigForComponent(SecurableCommunicationChannel.CLUSTER);
