You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2018/03/19 21:20:49 UTC
[geode] branch develop updated: GEODE-4869: Move all the
Configuration objects to a public package (#1638)
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new d8e29f0 GEODE-4869: Move all the Configuration objects to a public package (#1638)
d8e29f0 is described below
commit d8e29f021ceee6312692fb8aeeb139f9260fde6c
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Mon Mar 19 14:20:46 2018 -0700
GEODE-4869: Move all the Configuration objects to a public package (#1638)
* Moved all jaxb config objects to public package
* Added experimental annotation to all config objects
---
.../geode/{internal => }/cache/configuration/CacheConfig.java | 5 ++++-
.../geode/{internal => }/cache/configuration/CacheElement.java | 4 +++-
.../geode/{internal => }/cache/configuration/CacheLoaderType.java | 5 ++++-
.../cache/configuration/CacheTransactionManagerType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/CacheWriterType.java | 5 ++++-
.../cache/configuration/ClassWithParametersType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/DeclarableType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/DiskDirType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/DiskDirsType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/DiskStoreType.java | 5 ++++-
.../cache/configuration/DynamicRegionFactoryType.java | 5 ++++-
.../cache/configuration/EnumActionDestroyOverflow.java | 5 ++++-
.../{internal => }/cache/configuration/EnumReadableWritable.java | 5 ++++-
.../cache/configuration/ExpirationAttributesType.java | 5 ++++-
.../{internal => }/cache/configuration/FunctionServiceType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/InitializerType.java | 5 ++++-
.../{internal => }/cache/configuration/JndiBindingsType.java | 6 +++++-
.../geode/{internal => }/cache/configuration/ParameterType.java | 5 ++++-
.../apache/geode/{internal => }/cache/configuration/PdxType.java | 5 ++++-
.../apache/geode/{internal => }/cache/configuration/PoolType.java | 5 ++++-
.../cache/configuration/RegionAttributesDataPolicy.java | 5 ++++-
.../cache/configuration/RegionAttributesIndexUpdateType.java | 5 ++++-
.../cache/configuration/RegionAttributesMirrorType.java | 5 ++++-
.../{internal => }/cache/configuration/RegionAttributesScope.java | 5 ++++-
.../{internal => }/cache/configuration/RegionAttributesType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/RegionConfig.java | 5 ++++-
.../{internal => }/cache/configuration/ResourceManagerType.java | 5 ++++-
.../cache/configuration/SerializationRegistrationType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/ServerType.java | 5 ++++-
.../geode/{internal => }/cache/configuration/StringType.java | 5 ++++-
.../org/apache/geode/distributed/ClusterConfigurationService.java | 6 +++---
.../distributed/internal/InternalClusterConfigurationService.java | 4 ++--
.../internal/cli/commands/CreateJndiBindingCommand.java | 4 ++--
.../internal/cli/commands/DestroyJndiBindingCommand.java | 2 +-
.../management/internal/cli/commands/ListJndiBindingCommand.java | 4 ++--
.../internal/cli/converters/ConfigPropertyConverter.java | 2 +-
.../internal/cli/functions/CreateJndiBindingFunction.java | 2 +-
.../geode/distributed/internal/CacheConfigIntegrationTest.java | 2 +-
.../internal/InternalClusterConfigurationServiceTest.java | 8 ++++----
.../internal/cli/commands/CreateJndiBindingCommandTest.java | 4 ++--
.../internal/cli/commands/DestroyJndiBindingCommandTest.java | 4 ++--
.../internal/cli/converters/ConfigPropertyConverterTest.java | 2 +-
.../internal/cli/functions/CreateJndiBindingFunctionTest.java | 2 +-
.../internal/cli/functions/DestroyJndiBindingFunctionTest.java | 2 +-
.../internal/cli/functions/ListJndiBindingFunctionTest.java | 2 +-
45 files changed, 145 insertions(+), 55 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheConfig.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheConfig.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
index 4edfff7..957753d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -34,6 +34,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.w3c.dom.Element;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -263,6 +265,7 @@ import org.w3c.dom.Element;
"diskStore", "pdx", "regionAttributes", "jndiBindings", "region", "functionService",
"resourceManager", "serializationRegistration", "backup", "initializer", "cacheElements"})
@XmlRootElement(name = "cache", namespace = "http://geode.apache.org/schema/cache")
+@Experimental
public class CacheConfig {
@XmlElement(name = "cache-transaction-manager",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheElement.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java
similarity index 89%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheElement.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java
index 1b26d23..922d064 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.io.Serializable;
+import org.apache.geode.annotations.Experimental;
import org.apache.geode.lang.Identifiable;
+@Experimental
public interface CacheElement extends Identifiable<String>, Serializable {
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheLoaderType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheLoaderType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java
index b19d6c3..a0bd7b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheLoaderType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -56,6 +58,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "cache-loader-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"className", "parameter"})
+@Experimental
public class CacheLoaderType {
@XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheTransactionManagerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheTransactionManagerType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
index c7106c7..4c8dd4c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheTransactionManagerType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -79,6 +81,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "cache-transaction-manager-type",
namespace = "http://geode.apache.org/schema/cache",
propOrder = {"transactionListener", "transactionWriter"})
+@Experimental
public class CacheTransactionManagerType {
@XmlElement(name = "transaction-listener", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheWriterType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheWriterType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java
index 4ef9180..bfeec61 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/CacheWriterType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -56,6 +58,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "cache-writer-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"className", "parameter"})
+@Experimental
public class CacheWriterType {
@XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ClassWithParametersType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ClassWithParametersType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java
index c0fef18..33610bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ClassWithParametersType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -52,6 +54,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "class-with-parameters-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"className", "parameter"})
+@Experimental
public class ClassWithParametersType {
@XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DeclarableType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DeclarableType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
index fc9d14e..dfc4df3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DeclarableType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -56,6 +58,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "declarable-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"className", "parameter"})
+@Experimental
public class DeclarableType {
@XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java
index 0f50a7f..4b762f6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -51,6 +53,7 @@ import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "disk-dir-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"content"})
+@Experimental
public class DiskDirType {
@XmlValue
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirsType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirsType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
index c5ac6a5..38d7d35 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskDirsType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -55,6 +57,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "disk-dirs-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"diskDir"})
+@Experimental
public class DiskDirsType {
@XmlElement(name = "disk-dir", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskStoreType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskStoreType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java
index 230127b..9467044 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DiskStoreType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -63,6 +65,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "disk-store-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"diskDirs"})
+@Experimental
public class DiskStoreType {
@XmlElement(name = "disk-dirs", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DynamicRegionFactoryType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DynamicRegionFactoryType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java
index 9afb781..37f55c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/DynamicRegionFactoryType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -69,6 +71,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "dynamic-region-factory-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"diskDir"})
+@Experimental
public class DynamicRegionFactoryType {
@XmlElement(name = "disk-dir", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumActionDestroyOverflow.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumActionDestroyOverflow.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java
index 59bf022..4d2cc1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumActionDestroyOverflow.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -43,6 +45,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "enum-action-destroy-overflow", namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum EnumActionDestroyOverflow {
@XmlEnumValue("local-destroy")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumReadableWritable.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumReadableWritable.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java
index 7c39b21..52d8ade 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/EnumReadableWritable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -43,6 +45,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "enum-readable-writable", namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum EnumReadableWritable {
@XmlEnumValue("readable")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ExpirationAttributesType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ExpirationAttributesType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java
index 588c744..fb6dd34 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ExpirationAttributesType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -78,6 +80,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "expiration-attributes-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"customExpiry"})
+@Experimental
public class ExpirationAttributesType {
@XmlElement(name = "custom-expiry", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/FunctionServiceType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/FunctionServiceType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
index f5b6364..78e69d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/FunctionServiceType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -67,6 +69,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "function-service-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"function"})
+@Experimental
public class FunctionServiceType {
@XmlElement(namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/InitializerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/InitializerType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java
index 6e5dc7a..e3bf557 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/InitializerType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -58,6 +60,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "initializer-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"className", "parameter"})
+@Experimental
public class InitializerType {
@XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/JndiBindingsType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/JndiBindingsType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
index afa54ea..8c65c28 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/JndiBindingsType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -103,6 +105,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "jndi-bindings-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"jndiBinding"})
+@Experimental
public class JndiBindingsType {
@XmlElement(name = "jndi-binding", namespace = "http://geode.apache.org/schema/cache")
@@ -198,6 +201,7 @@ public class JndiBindingsType {
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"configProperty"})
+ @Experimental
public static class JndiBinding implements CacheElement {
@XmlElement(name = "config-property", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ParameterType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ParameterType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java
index fa9341f..2518c5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ParameterType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -55,6 +57,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "parameter-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"string", "declarable"})
+@Experimental
public class ParameterType {
@XmlElement(namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PdxType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PdxType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java
index 283208f..459276b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -72,6 +74,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "pdx-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"pdxSerializer"})
+@Experimental
public class PdxType {
@XmlElement(name = "pdx-serializer", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PoolType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PoolType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
index 5259d52..092d318 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/PoolType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -96,6 +98,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "pool-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"locator", "server"})
+@Experimental
public class PoolType {
@XmlElement(namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesDataPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesDataPolicy.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java
index 9510024..8e78016 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesDataPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -48,6 +50,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "region-attributesData-policy", namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum RegionAttributesDataPolicy {
@XmlEnumValue("empty")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesIndexUpdateType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesIndexUpdateType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java
index 9a6afcb..b997248 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesIndexUpdateType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -44,6 +46,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "region-attributesIndex-update-type",
namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum RegionAttributesIndexUpdateType {
@XmlEnumValue("asynchronous")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesMirrorType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesMirrorType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java
index 679b345..0dec711 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesMirrorType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -44,6 +46,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "region-attributesMirror-type", namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum RegionAttributesMirrorType {
@XmlEnumValue("keys")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesScope.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesScope.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java
index f056dfc..b140101 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesScope.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -45,6 +47,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "region-attributesScope", namespace = "http://geode.apache.org/schema/cache")
@XmlEnum
+@Experimental
public enum RegionAttributesScope {
@XmlEnumValue("distributed-ack")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
index 087ca0d..b1d9cad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionAttributesType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -330,6 +332,7 @@ import javax.xml.bind.annotation.XmlType;
"entryTimeToLive", "entryIdleTime", "diskWriteAttributes", "diskDirs",
"partitionAttributes", "membershipAttributes", "subscriptionAttributes", "cacheLoader",
"cacheWriter", "cacheListener", "compressor", "evictionAttributes"})
+@Experimental
public class RegionAttributesType {
@XmlElement(name = "key-constraint", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionConfig.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionConfig.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
index c81e3f0..583117e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -30,6 +30,8 @@ import javax.xml.bind.annotation.XmlType;
import org.w3c.dom.Element;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -147,6 +149,7 @@ import org.w3c.dom.Element;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "region-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"regionAttributes", "index", "entry", "regionElements", "region"})
+@Experimental
public class RegionConfig implements CacheElement {
@XmlElement(name = "region-attributes", namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ResourceManagerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ResourceManagerType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java
index d3bb6f7..1cb7f6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ResourceManagerType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java
@@ -16,13 +16,15 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -53,6 +55,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "resource-manager-type", namespace = "http://geode.apache.org/schema/cache")
+@Experimental
public class ResourceManagerType {
@XmlAttribute(name = "critical-heap-percentage")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/SerializationRegistrationType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
similarity index 98%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/SerializationRegistrationType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
index f3ee347..a282b4a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/SerializationRegistrationType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -79,6 +81,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "serialization-registration-type",
namespace = "http://geode.apache.org/schema/cache", propOrder = {"serializer", "instantiator"})
+@Experimental
public class SerializationRegistrationType {
@XmlElement(namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ServerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
similarity index 99%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ServerType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
index da68e87..ef0f83c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/ServerType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
+import org.apache.geode.annotations.Experimental;
+
/**
* <p>
@@ -96,6 +98,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "server-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"group", "clientSubscription", "customLoadProbe"})
@XmlSeeAlso({CacheConfig.CacheServer.class})
+@Experimental
public class ServerType {
@XmlElement(namespace = "http://geode.apache.org/schema/cache")
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/StringType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/configuration/StringType.java
rename to geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java
index 3d27157..64d9deb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/configuration/StringType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java
@@ -16,13 +16,15 @@
* limitations under the License.
*/
-package org.apache.geode.internal.cache.configuration;
+package org.apache.geode.cache.configuration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import org.apache.geode.annotations.Experimental;
+
/**
*
@@ -49,6 +51,7 @@ import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "string-type", namespace = "http://geode.apache.org/schema/cache",
propOrder = {"value"})
+@Experimental
public class StringType {
@XmlValue
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ClusterConfigurationService.java b/geode-core/src/main/java/org/apache/geode/distributed/ClusterConfigurationService.java
index a5d333e..120dab0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ClusterConfigurationService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ClusterConfigurationService.java
@@ -22,9 +22,9 @@ import java.util.List;
import java.util.function.UnaryOperator;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.CacheElement;
-import org.apache.geode.internal.cache.configuration.RegionConfig;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.CacheElement;
+import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.lang.Identifiable;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java
index 127487c..dcd37cb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java
@@ -78,6 +78,8 @@ import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.CacheElement;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.ClusterConfigurationService;
import org.apache.geode.distributed.DistributedLockService;
@@ -86,8 +88,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.CacheElement;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
index 8f529d6..00220a1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
@@ -25,10 +25,10 @@ import org.apache.logging.log4j.Logger;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java
index a9b6415..bff73ae 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java
@@ -22,9 +22,9 @@ import java.util.Set;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
index b895ead..f7b775b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java
@@ -22,11 +22,11 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
import org.springframework.shell.core.annotation.CliCommand;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverter.java
index 3a86580..c8e910c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverter.java
@@ -23,7 +23,7 @@ import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
+import org.apache.geode.cache.configuration.JndiBindingsType;
/***
* Added converter to enable auto-completion for index-type
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
index 1e7302e..2765713 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
@@ -19,9 +19,9 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.cache.execute.InternalFunction;
import org.apache.geode.internal.datasource.ConfigProperty;
import org.apache.geode.internal.jndi.JNDIInvoker;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
index e8cf33b..9c80499 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java
index e4d772c..6b338e0 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java
@@ -35,10 +35,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.CacheElement;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
-import org.apache.geode.internal.cache.configuration.RegionConfig;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.CacheElement;
+import org.apache.geode.cache.configuration.JndiBindingsType;
+import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
index e7dec79..8e0de90 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
@@ -39,11 +39,11 @@ import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.xml.sax.SAXException;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
index c67d1f3..dc4fe8e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
@@ -37,11 +37,11 @@ import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalClusterConfigurationService;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.configuration.CacheConfig;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
import org.apache.geode.management.internal.cli.functions.DestroyJndiBindingFunction;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
index d4797dc..4c24dc0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
@@ -21,7 +21,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.test.junit.categories.UnitTest;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
index d179e5e..29732b6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
@@ -33,10 +33,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.datasource.ConfigProperty;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.internal.logging.LocalLogWriter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
index d55ce21..d5f1163 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
@@ -28,10 +28,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
index 158cc8c..30d01c7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
@@ -28,10 +28,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
+import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.configuration.JndiBindingsType;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand;
--
To stop receiving notification emails like this one, please contact
sai_boorlagadda@apache.org.