diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index 3a95284f..498b8021 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -11,7 +11,7 @@ Costin Leau; David Turanski; John Blum; Oliver Gierke; Jay Bryant :data-store-name-symbolic: gemfire :data-store-name-simple: GemFire :data-store-name: Pivotal {data-store-name-simple} -:data-store-version: 9.8.0 +:data-store-version: 9.8.2 :pivotal-gemfire-version: 98 :pivotal-gemfire-docs: https://gemfire.docs.pivotal.io/{pivotal-gemfire-version} :pivotal-gemfire-javadoc: https://gemfire-{pivotal-gemfire-version}-javadocs.docs.pivotal.io/ @@ -22,13 +22,13 @@ Costin Leau; David Turanski; John Blum; Oliver Gierke; Jay Bryant :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-namespace: https://www.springframework.org/schema/data/gemfire :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-namespace: https://www.springframework.org/schema/gemfire :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/AbstractCacheConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java index e9c15689..f068eb30 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java @@ -14,7 +14,6 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import static org.springframework.data.gemfire.CacheFactoryBean.DynamicRegionSupport; @@ -33,6 +32,7 @@ import org.apache.geode.cache.TransactionWriter; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.util.GatewayConflictResolver; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.annotation.Bean; 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 7bf7cdd4..feeba87b 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 Pivotal GemFire Expiration - * @see Geode Expiration + * @see Apache 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 Pivotal GemFire Expiration - * @see Geode Expiration + * @see Apache Geode Expiration */ enum ExpirationType { diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java index 4e657667..ede81563 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import; * @author John Blum * @see org.springframework.data.gemfire.config.annotation.GemFirePropertiesConfiguration * @see Pivotal GemFire System Properties - * @see Geode System Properties + * @see Apache Geode System Properties * @since 1.9.0 */ @Target(ElementType.TYPE) diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java b/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java index 8594f19c..5b3c2995 100644 --- a/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java +++ b/src/main/java/org/springframework/data/gemfire/config/xml/package-info.java @@ -2,6 +2,6 @@ * This package provides classes and components for configuring Pivotal GemFire using Spring Data's * XML namespace support. See more details here... * - * SDG Core Schema (gfe) + * Spring Data GemFire Core Schema (gfe) */ package org.springframework.data.gemfire.config.xml; 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 0d75509b..cfa37e27 100644 --- a/src/main/java/org/springframework/data/gemfire/package-info.java +++ b/src/main/java/org/springframework/data/gemfire/package-info.java @@ -1,7 +1,10 @@ - /** * Package providing integration of +<<<<<<< HEAD * GemFire +======= + * GemFire +>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle. * with Spring concepts. * * Contains helper classes, a template plus callback for GemFire @@ -9,4 +12,3 @@ * Pivotal GemFire transactions. */ package org.springframework.data.gemfire; - diff --git a/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java b/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java index f60160f6..c157f98f 100644 --- a/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java +++ b/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import; * @see java.lang.annotation.Target * @see org.springframework.context.annotation.Import * @see Spring Transaction Management - * @see SDG Transaction Management + * @see Spring Data GemFire Transaction Management * @see Pivotal GemFire Cache Transactions * @see Apache Geode Cache Transactions * @since 2.0.0 diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 29d00946..02cbf00c 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,7 +1,7 @@ SPRING DATA GEMFIRE CHANGELOG ----------------------------- https://www.springsource.org/spring-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..177b477c 100644 --- a/src/main/resources/readme.txt +++ b/src/main/resources/readme.txt @@ -15,10 +15,18 @@ details, consult the provided javadoc for specific packages and classes. 3. GETTING STARTED +<<<<<<< HEAD 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 +>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle. 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 +<<<<<<< HEAD +VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire +======= +VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire +>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle. 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 7748ba25..ab98f1ea 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;