You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2016/04/01 22:07:57 UTC
[17/18] incubator-geode git commit: GEODE-389 Required Role APIs
should be deprecated
GEODE-389 Required Role APIs should be deprecated
Added more complete deprecation notices for Required Roles APIs
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c4b3e6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c4b3e6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c4b3e6d
Branch: refs/heads/feature/GEODE-17-2
Commit: 3c4b3e6d4aa8325976912310ce9d8c61a676e58c
Parents: 65d7a6f
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Apr 1 09:43:05 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Apr 1 10:57:46 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/admin/SystemMemberRegion.java | 2 +-
.../com/gemstone/gemfire/cache/AttributesFactory.java | 8 ++++++--
.../java/com/gemstone/gemfire/cache/LossAction.java | 2 +-
.../gemstone/gemfire/cache/MembershipAttributes.java | 2 +-
.../gemstone/gemfire/cache/RegionAccessException.java | 2 +-
.../com/gemstone/gemfire/cache/RegionAttributes.java | 2 +-
.../gemfire/cache/RegionDistributionException.java | 2 +-
.../com/gemstone/gemfire/cache/RegionFactory.java | 1 +
.../gemstone/gemfire/cache/RegionRoleException.java | 2 +-
.../gemstone/gemfire/cache/RegionRoleListener.java | 2 +-
.../com/gemstone/gemfire/cache/RequiredRoles.java | 2 +-
.../com/gemstone/gemfire/cache/ResumptionAction.java | 2 +-
.../java/com/gemstone/gemfire/cache/RoleEvent.java | 2 +-
.../com/gemstone/gemfire/cache/RoleException.java | 2 +-
.../gemfire/cache/util/RegionRoleListenerAdapter.java | 2 +-
.../gemfire/distributed/DistributedSystem.java | 14 +++-----------
.../java/com/gemstone/gemfire/distributed/Role.java | 2 +-
.../distributed/internal/membership/InternalRole.java | 2 +-
.../membership/gms/messenger/JGroupsMessenger.java | 8 +++++++-
.../cache/xmlcache/RegionAttributesCreation.java | 8 ++++++--
.../gemfire/management/DistributedRegionMXBean.java | 2 ++
.../gemfire/management/GemFireProperties.java | 3 +++
.../gemfire/management/MembershipAttributesData.java | 3 +--
.../com/gemstone/gemfire/management/RegionMXBean.java | 2 ++
.../com/gemstone/gemfire/cache/doc-files/cache8_0.dtd | 4 +++-
25 files changed, 49 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
index f76d3b9..fff825a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
@@ -301,7 +301,7 @@ public interface SystemMemberRegion {
/**
* Returns the <code>MembershipAttributes</code> that configure required
* roles for reliable access to the region.
- * @since 5.0
+ * @deprecated this API is scheduled to be removed
*/
public MembershipAttributes getMembershipAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
index df6a6a8..201c1aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
@@ -302,7 +302,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
* are missing from the region membership.
* <br>
* {@link #setMembershipAttributes} {@link RegionAttributes#getMembershipAttributes}</dd>
- *
+ * <dd><em>Deprecated</em>, this API is scheduled to be removed</dd>
* </dt>
* </dl>
*
@@ -1180,7 +1180,7 @@ public class AttributesFactory<K,V> {
* Sets the <code>MembershipAttributes</code> that describe the membership
* roles required for reliable access to the region.
*
- * @since 5.0
+ * @deprecated this API is scheduled to be removed
*/
public void setMembershipAttributes(MembershipAttributes membership) {
this.regionAttributes.membershipAttributes = membership;
@@ -1979,9 +1979,13 @@ public class AttributesFactory<K,V> {
return this.customEvictionAttributes;
}
+ /**
+ * @deprecated this API is scheduled to be removed
+ */
public MembershipAttributes getMembershipAttributes() {
return this.membershipAttributes;
}
+
public SubscriptionAttributes getSubscriptionAttributes() {
return this.subscriptionAttributes;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/LossAction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/LossAction.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/LossAction.java
index 08372df..7c428a1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/LossAction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/LossAction.java
@@ -28,7 +28,7 @@ import java.util.*;
* The <code>LossAction</code> is specified when configuring a region's
* {@link com.gemstone.gemfire.cache.MembershipAttributes}.
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public class LossAction implements Serializable {
private static final long serialVersionUID = -832035480397447797L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/MembershipAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/MembershipAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/MembershipAttributes.java
index dd0e91a..5a1c451 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/MembershipAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/MembershipAttributes.java
@@ -45,7 +45,7 @@ import java.util.*;
* required roles are specified. These attributes are immutable after the
* <code>Region</code> has been created.</p>
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public class MembershipAttributes implements DataSerializable, Externalizable {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAccessException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAccessException.java
index 899bf4e..9d9ebd8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAccessException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAccessException.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalRole;
* {@link MembershipAttributes} have been configured with {@link
* LossAction#NO_ACCESS} or {@link LossAction#LIMITED_ACCESS}.
*
- * @since 5.0
+ * @deprecated the MembershipAttributes API is scheduled to be removed
*/
public class RegionAccessException extends RegionRoleException {
private static final long serialVersionUID = 3142958723089038406L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
index 4ab576a..dd5c0e0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
@@ -273,7 +273,7 @@ public interface RegionAttributes<K,V> {
* Returns the <code>MembershipAttributes</code> that configure required
* roles for reliable access to the region.
*
- * @since 5.0
+ * @deprecated this API is scheduled to be removed
*/
public MembershipAttributes getMembershipAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDistributionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDistributionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDistributionException.java
index b30cd2c..81ee2b7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDistributionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDistributionException.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalRole;
* may be caused by one or more required roles not acknowledging receipt of
* the message.
*
- * @since 5.0
+ * @deprecated the MembershipAttributes API is scheduled to be removed
*/
public class RegionDistributionException extends RegionRoleException {
private static final long serialVersionUID = -5950359426786805646L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
index a83aa20..729374e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
@@ -745,6 +745,7 @@ public class RegionFactory<K,V>
* @param ra the MembershipAttributes to use
* @return a reference to this RegionFactory object
* @see AttributesFactory#setMembershipAttributes
+ * @deprecated this API is scheduled to be removed
*/
public RegionFactory<K,V> setMembershipAttributes(MembershipAttributes ra) {
this.attrsFactory.setMembershipAttributes(ra);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleException.java
index 1864415..6e1c8db 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
* Reliability for a <code>Region</code> is defined by its
* {@link MembershipAttributes}.
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public abstract class RegionRoleException extends RoleException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleListener.java
index e633396..96df589 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionRoleListener.java
@@ -29,7 +29,7 @@ package com.gemstone.gemfire.cache;
* @see AttributesFactory#setCacheListener
* @see RegionAttributes#getCacheListener
* @see AttributesMutator#setCacheListener
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public interface RegionRoleListener<K,V> extends CacheListener<K,V> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RequiredRoles.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RequiredRoles.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RequiredRoles.java
index 035f62c..a56a749 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RequiredRoles.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RequiredRoles.java
@@ -36,8 +36,8 @@ import java.util.*;
* specific <code>Region</code> created. In this case the <code>Role</code> is
* considered to be absent for that <code>Region</code>.
*
+ * @deprecated this feature is scheduled to be removed
* @see com.gemstone.gemfire.distributed.Role
- * @since 5.0
*/
public class RequiredRoles {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/ResumptionAction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/ResumptionAction.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/ResumptionAction.java
index a3fbf57..4201dce 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/ResumptionAction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/ResumptionAction.java
@@ -27,7 +27,7 @@ import java.util.*;
* The <code>ResumptionAction</code> is specified when configuring a region's
* {@link com.gemstone.gemfire.cache.MembershipAttributes}.
*
- * @since 5.0
+ * @deprecated this API is scheduled to be removed
*/
public class ResumptionAction implements java.io.Serializable {
private static final long serialVersionUID = 6632254151314915610L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleEvent.java
index b38835e..734843d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleEvent.java
@@ -24,8 +24,8 @@ import java.util.Set;
* including its identity and the circumstances of the event. This is
* passed in to {@link RegionRoleListener}.
*
+ * @deprecated this feature is scheduled to be removed
* @see RegionRoleListener
- * @since 5.0
*/
public interface RoleEvent<K,V> extends RegionEvent<K,V> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleException.java
index 088f504..467469a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RoleException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache;
* Region regions} that have been configured with required roles using
* {@link MembershipAttributes}.
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public abstract class RoleException extends CacheRuntimeException {
private static final long serialVersionUID = -7521056108445887394L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionRoleListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionRoleListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionRoleListenerAdapter.java
index f4dd795..db3cc2d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionRoleListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionRoleListenerAdapter.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.RoleEvent;
* Applications can subclass this class and only override the methods for
* the events of interest.
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public abstract class RegionRoleListenerAdapter<K,V>
extends RegionMembershipListenerAdapter<K,V>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 0eb0115..1de675d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -110,7 +110,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
* <a name="groups"><dt>groups</dt></a>
* <dd><U>Description</U>: Defines the list of groups this member belongs to.
* Use commas to separate group names.
- * Note that anything defined by the roles gemfire property will also be considered a group.
+ * Note that anything defined by the deprecated roles gemfire property will also be considered a group.
* <dd><U>Default</U>: ""</dd>
* <dd><U>Since</U>: 7.0</dd>
* </dl>
@@ -780,7 +780,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
* </dd>
* <dd><U>Default</U>: ""</dd>
* <dd><U>Since</U>: 5.0</dd>
- * <dd><U>Deprecated</U>: as of 7.0 use <a href="#groups"><code>groups</code></a> instead.</dd>
+ * <dd><U>Deprecated</U>: This feature is scheduled to be removed.</dd>
* </dl>
*
* <dl>
@@ -800,6 +800,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
* to reconnect to the distributed system when required roles are missing.
* This does not apply to reconnect attempts due to a forced disconnect.
* </dd>
+ * <dd><U>Deprecated</U>: this setting is scheduled to be removed.</dd>
* <dd><U>Default</U>: "3"</dd>
* <dd><U>Since</U>: 5.0</dd>
* </dl>
@@ -1498,15 +1499,6 @@ public abstract class DistributedSystem implements StatisticsFactory {
*/
protected static final Object existingSystemsLock = new Object();
- //public static Properties props = new Properties();
-
- /**
- * Used to indicate a reconnect is tried in case of required role
- * loss.
- * */
-
- // public static boolean reconnect = false;
-
//////////////////////// Static Methods ////////////////////////
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/distributed/Role.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Role.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Role.java
index cc3b941..f095119 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Role.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Role.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.distributed;
* <a href="DistributedSystem.html#roles">Roles are specified</a> when
* connecting to the {@link DistributedSystem}.
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public interface Role extends Comparable<Role> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalRole.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalRole.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalRole.java
index 45cd7a4..69d0ad4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalRole.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalRole.java
@@ -41,7 +41,7 @@ import java.util.*;
* and {@link com.gemstone.gemfire.cache.RegionDistributionException
* RegionDistributionException} for examples on how to do this.</p>
*
- * @since 5.0
+ * @deprecated this feature is scheduled to be removed
*/
public class InternalRole implements Role {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index f94791f..2dfeeaa 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -556,7 +556,13 @@ public class JGroupsMessenger implements Messenger {
}
String received = "none";
long[] senderSeqnos = digest.get(jgSender);
- if (senderSeqnos == null || senderSeqnos[0] >= seqno.longValue()) {
+ if (senderSeqnos == null) {
+ break;
+ }
+ if (logger.isDebugEnabled()) {
+ logger.debug("waiting for multicast messages from {}. Current seqno={} and expected seqno={}", sender, senderSeqnos[0], seqno);
+ }
+ if (senderSeqnos[0] >= seqno.longValue()) {
break;
}
long now = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
index 1556262..d0f5676 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -1514,12 +1514,16 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
}
}
- /** @since 5.0 */
+ /**
+ * @deprecated this API is scheduled to be removed
+ */
public MembershipAttributes getMembershipAttributes() {
return this.membershipAttributes;
}
- /** @since 5.0 */
+ /**
+ * @deprecated this API is scheduled to be removed
+ */
public void setMembershipAttributes(MembershipAttributes pa) {
this.membershipAttributes = pa;
setHasMembershipAttributes(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
index 3edda27..3003827 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
@@ -91,6 +91,8 @@ public interface DistributedRegionMXBean {
/**
* Returns the membership attributes of the Region.
+ *
+ * @deprecated this API is scheduled to be removed
*/
public MembershipAttributesData listMembershipAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
index 0bb2c8b..07dad13 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
@@ -314,6 +314,7 @@ public class GemFireProperties {
* distributed system. This is a comma delimited list of user-defined strings.
* Any number of members can be configured to perform the same role, and a
* member can be configured to perform any number of roles.
+ * @deprecated this feature is scheduled to be removed
**/
private String roles;
/**
@@ -321,6 +322,7 @@ public class GemFireProperties {
* system to reconnect in case of required role loss. The system will attempt
* to reconnect more than once, and this timeout period applies to each
* reconnection attempt. Default: "10000"
+ * @deprecated this feature is scheduled to be removed
**/
private int maxWaitTimeForReconnect;
/**
@@ -337,6 +339,7 @@ public class GemFireProperties {
* asynchronous messaging until this process catches up, departs, or some
* specified limit is reached, such as async-queue-timeout or
* async-max-queue-size. Default: "0"
+ * @deprecated this feature is scheduled to be removed
**/
private int asyncDistributionTimeout;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/management/MembershipAttributesData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/MembershipAttributesData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/MembershipAttributesData.java
index be0bfb5..f60e4b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/MembershipAttributesData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/MembershipAttributesData.java
@@ -26,8 +26,7 @@ import com.gemstone.gemfire.distributed.Role;
* Composite data type used to distribute the membership attributes for
* a {@link Region}.
*
- * @since 7.0
- *
+ * @deprecated this API is scheduled to be removed
*/
public class MembershipAttributesData {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
index 33f827a..8c11d00 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
@@ -87,6 +87,8 @@ public interface RegionMXBean {
/**
* Returns the membership attributes of the Region.
+ *
+ * @deprecated this API is scheduled to be removed
*/
public MembershipAttributesData listMembershipAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c4b3e6d/geode-core/src/main/resources/com/gemstone/gemfire/cache/doc-files/cache8_0.dtd
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/com/gemstone/gemfire/cache/doc-files/cache8_0.dtd b/geode-core/src/main/resources/com/gemstone/gemfire/cache/doc-files/cache8_0.dtd
index 96610d3..f02c6b0 100644
--- a/geode-core/src/main/resources/com/gemstone/gemfire/cache/doc-files/cache8_0.dtd
+++ b/geode-core/src/main/resources/com/gemstone/gemfire/cache/doc-files/cache8_0.dtd
@@ -839,6 +839,7 @@ in the Region. The class must implement the ObjectSizer interface.
<!--
A "membership-attributes" element configures a region for membership
constraints based on required roles.
+Deprecated this feature is scheduled to be removed
-->
<!ELEMENT membership-attributes (required-role*)>
<!ATTLIST membership-attributes
@@ -1015,7 +1016,8 @@ A "region-time-to-live" element specifies a Region's time to live.
<!-- ======================================================= -->
<!--
A "required-role" element specifies a role that is required for reliable
-access to the region
+access to the region.
+Deprecated this feature is scheduled to be removed
-->
<!-- ======================================================= -->