diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index 8d99ced3..ee8a102a 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -21,14 +21,14 @@ Costin Leau; David Turanski; John Blum; Oliver Gierke; Jay Bryant :sdg-javadoc: https://docs.spring.io/spring-data/{data-store-name-symbolic}/docs/current/api :sdg-name: Spring Data for {data-store-name} :sdg-website: https://projects.spring.io/spring-data-gemfire -:spring-data-access-schema-location: https://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd -:spring-data-access-schema-namespace: http://www.springframework.org/schema/data/gemfire +:spring-data-access-schema-location: https://www.springframework.org/schema/data/geode/spring-data-geode.xsd +:spring-data-access-schema-namespace: https://www.springframework.org/schema/data/geode :spring-data-commons-docs: https://docs.spring.io/spring-data/commons/docs/current/reference :spring-data-commons-include: ../../../../spring-data-commons/src/main/asciidoc :spring-data-commons-docs-html: {spring-data-commons-docs}/html :spring-data-commons-javadoc: https://docs.spring.io/spring-data/commons/docs/current/api -:spring-data-schema-location: https://www.springframework.org/schema/gemfire/spring-gemfire.xsd -:spring-data-schema-namespace: http://www.springframework.org/schema/gemfire +:spring-data-schema-location: https://www.springframework.org/schema/geode/spring-geode.xsd +:spring-data-schema-namespace: https://www.springframework.org/schema/geode :spring-data-website: https://spring.io/projects/spring-data :spring-framework-docs: https://docs.spring.io/spring/docs/current/spring-framework-reference :spring-framework-javadoc: https://docs.spring.io/spring/docs/current/javadoc-api diff --git a/src/main/asciidoc/reference/region.adoc b/src/main/asciidoc/reference/region.adoc index 7373b63b..be4a552b 100644 --- a/src/main/asciidoc/reference/region.adoc +++ b/src/main/asciidoc/reference/region.adoc @@ -69,7 +69,7 @@ For instance, consider the following `cache.xml` file: [source,xml] ---- - @@ -569,7 +569,7 @@ Consider the following native {data-store-name} `cache.xml` configuration file: [source,xml] ---- - diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java index e0273bc3..27f17df0 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java @@ -14,7 +14,6 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import static org.springframework.data.gemfire.config.annotation.EnableExpiration.ExpirationType.IDLE_TIMEOUT; @@ -27,6 +26,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.apache.geode.cache.Region; + import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.expiration.Expiration; import org.springframework.data.gemfire.expiration.ExpirationActionType; @@ -48,7 +48,7 @@ import org.springframework.data.gemfire.expiration.TimeToLiveExpiration; * @see org.springframework.data.gemfire.expiration.TimeToLiveExpiration * @see Annotation-based Data Expiration * @see GemFire Expiration - * @see Geode Expiration + * @see Geode Expiration * @since 1.9.0 */ @Target(ElementType.TYPE) @@ -131,7 +131,7 @@ public @interface EnableExpiration { * (Entry) Idle Timeout (TTI) and (Entry) Time to Live (TTL). * * @see GemFire Expiration - * @see Geode Expiration + * @see Geode Expiration */ enum ExpirationType { diff --git a/src/main/java/org/springframework/data/gemfire/package-info.java b/src/main/java/org/springframework/data/gemfire/package-info.java index 570934a6..8c0b6393 100644 --- a/src/main/java/org/springframework/data/gemfire/package-info.java +++ b/src/main/java/org/springframework/data/gemfire/package-info.java @@ -1,12 +1,10 @@ - /** * Package providing integration of - * GemFire + * GemFire * with Spring concepts. - * + * * Contains helper classes, a template plus callback for GemFire * access and an implementation of Spring's transaction SPI for local * GemFire transactions. */ package org.springframework.data.gemfire; - diff --git a/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java b/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java index 45e100f5..3d0fe8ab 100644 --- a/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java +++ b/src/main/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupport.java @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.support; import java.util.Optional; import java.util.function.Supplier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -28,6 +25,9 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * The {@link AbstractFactoryBeanSupport} class is an abstract Spring {@link FactoryBean} base class implementation * encapsulating operations common to SDG's {@link FactoryBean} implementations. diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 31c5a032..577d98c4 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,7 +1,7 @@ SPRING DATA GEODE CHANGELOG --------------------------- https://projects.spring.io/spring-data-gemfire/ -============================================== +=============================================== Changes in version 2.2.0.RC1 (2019-06-14) ----------------------------------------- diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt index 4df72c49..19e90faf 100644 --- a/src/main/resources/readme.txt +++ b/src/main/resources/readme.txt @@ -15,10 +15,10 @@ details, consult the provided javadoc for specific packages and classes. 3. GETTING STARTED -Please see the reference documentation at https://www.springsource.org/spring-gemfire/ +Please see the reference documentation at https://spring.io/projects/spring-data-geode and the Spring GemFire Examples at https://github.com/SpringSource/spring-gemfire-examples ADDITIONAL RESOURCES Spring Data GemFire Homepage : https://www.springsource.org/spring-gemfire VMware vFabric GemFire Documentation: https://www.vmware.com/products/application-platform/vfabric-gemfire/overview.html -VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire \ No newline at end of file +VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java index 8118a8d0..cac31b77 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.repository.query; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/src/test/resources/autoregionlookup-cache.xml b/src/test/resources/autoregionlookup-cache.xml index a6abc0d7..384c9f2d 100644 --- a/src/test/resources/autoregionlookup-cache.xml +++ b/src/test/resources/autoregionlookup-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/cache-with-regions.xml b/src/test/resources/cache-with-regions.xml index d96f7c86..2ca2acd8 100644 --- a/src/test/resources/cache-with-regions.xml +++ b/src/test/resources/cache-with-regions.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml b/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml index bfaefcc6..4bc04122 100644 --- a/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml +++ b/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml b/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml index 7338d6e9..a45f7099 100644 --- a/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml +++ b/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/empty-cache.xml b/src/test/resources/empty-cache.xml index 183dd436..f5965f40 100644 --- a/src/test/resources/empty-cache.xml +++ b/src/test/resources/empty-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/empty-client-cache.xml b/src/test/resources/empty-client-cache.xml index e9236267..f4f8967d 100644 --- a/src/test/resources/empty-client-cache.xml +++ b/src/test/resources/empty-client-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/gemfire-datasource-integration-test-cache.xml b/src/test/resources/gemfire-datasource-integration-test-cache.xml index 3ea2a4d4..fbc7e34d 100644 --- a/src/test/resources/gemfire-datasource-integration-test-cache.xml +++ b/src/test/resources/gemfire-datasource-integration-test-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/lazy-wiring-declarable-support-function-cache.xml b/src/test/resources/lazy-wiring-declarable-support-function-cache.xml index 88b171e0..fb406945 100644 --- a/src/test/resources/lazy-wiring-declarable-support-function-cache.xml +++ b/src/test/resources/lazy-wiring-declarable-support-function-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/lookup-region-mutation-cache.xml b/src/test/resources/lookup-region-mutation-cache.xml index 61c3cdee..137aeeca 100644 --- a/src/test/resources/lookup-region-mutation-cache.xml +++ b/src/test/resources/lookup-region-mutation-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/non-cluster-config-cache.xml b/src/test/resources/non-cluster-config-cache.xml index f77ebd32..cdfbcf5c 100644 --- a/src/test/resources/non-cluster-config-cache.xml +++ b/src/test/resources/non-cluster-config-cache.xml @@ -1,7 +1,7 @@ diff --git a/src/test/resources/subregion-cache.xml b/src/test/resources/subregion-cache.xml index 984581d6..19193c8d 100644 --- a/src/test/resources/subregion-cache.xml +++ b/src/test/resources/subregion-cache.xml @@ -1,7 +1,7 @@