diff --git a/README.md b/README.md
index 742005628..560ff80c9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[](http://projects.spring.io/spring-data-cassandra/#quick-start)
-[](http://projects.spring.io/spring-data-cassandra/#quick-start)
+[](http://projects.spring.io/spring-data-cassandra/#quick-start)
+[](http://projects.spring.io/spring-data-cassandra/#quick-start)
-# Spring Data Cassandra Project Info
+# Spring Data for Apache Cassandra Project Info
## Quick Start
@@ -207,7 +207,7 @@ Here is a very basic example to get your project connected to Cassandra running
## Source Repository & Issue Tracking
Source for this module is hosted on GitHub in [Spring Projects](https://github.com/spring-projects/spring-data-cassandra).
-The Spring Data Cassandra JIRA can be found [here](https://jira.springsource.org/browse/DATACASS).
+The Spring Data for Apache Cassandra JIRA can be found [here](https://jira.springsource.org/browse/DATACASS).
## Reporting Problems
@@ -249,7 +249,7 @@ Also, developer discussions are being hosted on [StackOverflow](https://www.stac
## Sponsoring Companies
-Spring Data Cassandra is being led and supported by the following
+Spring Data for Apache Cassandra is being led and supported by the following
companies and individuals:
* [Prowave Consulting](http://www.prowaveconsulting.com) - David Webb
diff --git a/pom.xml b/pom.xml
index 3aa53abeb..50c1a7ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,8 @@
1.5.0.BUILD-SNAPSHOT
pom
- Spring Data Cassandra
- Spring Data Cassandra
+ Spring Data for Apache Cassandra
+ Spring Data for Apache Cassandra
http://projects.spring.io/spring-data-cassandra/
diff --git a/spring-data-cassandra-distribution/pom.xml b/spring-data-cassandra-distribution/pom.xml
index af636918d..cb8750f75 100644
--- a/spring-data-cassandra-distribution/pom.xml
+++ b/spring-data-cassandra-distribution/pom.xml
@@ -7,8 +7,8 @@
pom
- Spring Data Cassandra - Distribution
- Distribution build for Spring Data Cassandra
+ Spring Data for Apache Cassandra - Distribution
+ Distribution build for Spring Data for Apache Cassandra
org.springframework.data
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 40fa902fa..207a2fa11 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -14,7 +14,7 @@
spring-data-cassandra
- Spring Data Cassandra Core
+ Spring Data for Apache Cassandra Core
Cassandra support for Spring Data
https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-data-cassandra
diff --git a/spring-data-cassandra/template.mf b/spring-data-cassandra/template.mf
index 9ddff3987..20364b5ed 100644
--- a/spring-data-cassandra/template.mf
+++ b/spring-data-cassandra/template.mf
@@ -1,6 +1,6 @@
Bundle-SymbolicName: org.springframework.data.cassandra
-Bundle-Name: Spring Data Cassandra
-Bundle-Vendor: Spring Data Cassandra Community
+Bundle-Name: Spring Data for Apache Cassandra
+Bundle-Vendor: Spring Data for Apache Cassandra
Bundle-ManifestVersion: 2
Excluded-Imports:
lombok.*
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index a91804e99..66c288a6b 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,4 +1,4 @@
-= Spring Data Cassandra - Reference Documentation
+= Spring Data for Apache Cassandra - Reference Documentation
David Webb, Matthew Adams
:revnumber: {version}
:revdate: {localdate}
diff --git a/src/main/asciidoc/introduction/getting-started.adoc b/src/main/asciidoc/introduction/getting-started.adoc
index ee39d6d70..5c8616435 100644
--- a/src/main/asciidoc/introduction/getting-started.adoc
+++ b/src/main/asciidoc/introduction/getting-started.adoc
@@ -1,7 +1,7 @@
[[get-started]]
= Additional Help Resources
-Learning a new framework is not always straight forward. In this section, we try to provide what we think is an easy to follow guide for starting with Spring Data Cassandra module. However, if you encounter issues or you are just looking for an advice, feel free to use one of the links below:
+Learning a new framework is not always straight forward. In this section, we try to provide what we think is an easy to follow guide for starting with Spring Data for Apache Cassandra module. However, if you encounter issues or you are just looking for an advice, feel free to use one of the links below:
[[get-started.help]]
== Support
@@ -24,9 +24,9 @@ Professional, from-the-source support, with guaranteed response time, is availab
[[get-started.up-to-date]]
== Following Development
-For information on the Spring Data Cassandra source code repository, nightly builds and snapshot artifacts please see the http://projects.spring.io/spring-data-cassandra/[Spring Data Cassandra homepage].
+For information on the Spring Data for Apache Cassandra source code repository, nightly builds and snapshot artifacts please see the http://projects.spring.io/spring-data-cassandra/[Spring Data for Apache Cassandra homepage].
-To follow developer activity look for the mailing list information on the Spring Data Cassandra homepage.
+To follow developer activity look for the mailing list information on the Spring Data for Apache Cassandra homepage.
If you encounter a bug or want to suggest an improvement, please create a ticket on the Spring Data issue https://jira.spring.io/browse/DATACASS[tracker].
diff --git a/src/main/asciidoc/introduction/introduction.adoc b/src/main/asciidoc/introduction/introduction.adoc
index 085b64851..ad3ba49ef 100644
--- a/src/main/asciidoc/introduction/introduction.adoc
+++ b/src/main/asciidoc/introduction/introduction.adoc
@@ -1,6 +1,6 @@
This document is the reference guide for Spring Data - Cassandra Support. It explains Cassandra module concepts and semantics and the syntax for various stores namespaces.
-This section provides some basic introduction to Spring and the Cassandra database. The rest of the document refers only to Spring Data Cassandra features and assumes the user is familiar with Cassandra as well as Spring concepts.
+This section provides some basic introduction to Spring and the Cassandra database. The rest of the document refers only to Spring Data for Apache Cassandra features and assumes the user is familiar with Cassandra as well as Spring concepts.
[float]
[[get-started:first-steps:spring]]
@@ -8,7 +8,7 @@ This section provides some basic introduction to Spring and the Cassandra databa
Spring Data uses Spring framework's http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/spring-core.html[core] functionality, such as the http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/beans.html[IoC] container, http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/validation.html#core-convert[type conversion system], http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/expressions.html[expression language], http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/jmx.html[JMX integration], and portable http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/dao.html#dao-exceptions[DAO exception hierarchy]. While it is not important to know the Spring APIs, understanding the concepts behind them is. At a minimum, the idea behind IoC should be familiar for whatever IoC container you choose to use.
-The core functionality of the Cassandra support can be used directly, with no need to invoke the IoC services of the Spring Container. This is much like `JdbcTemplate` which can be used 'standalone' without any other services of the Spring container. To leverage all the features of Spring Data Cassandra, such as the repository support, you will need to configure some parts of the library using Spring.
+The core functionality of the Cassandra support can be used directly, with no need to invoke the IoC services of the Spring Container. This is much like `JdbcTemplate` which can be used 'standalone' without any other services of the Spring container. To leverage all the features of Spring Data for Apache Cassandra, such as the repository support, you will need to configure some parts of the library using Spring.
To learn more about Spring, you can refer to the comprehensive (and sometimes disarming) documentation that explains in detail the Spring Framework. There are a lot of articles, blog entries and books on the matter - take a look at the Spring framework http://spring.io/docs[home page] for more information.
diff --git a/src/main/asciidoc/introduction/requirements.adoc b/src/main/asciidoc/introduction/requirements.adoc
index 9f69cee52..e7ad3a017 100644
--- a/src/main/asciidoc/introduction/requirements.adoc
+++ b/src/main/asciidoc/introduction/requirements.adoc
@@ -1,7 +1,7 @@
[[requirements]]
= Requirements
-Spring Data Cassandra 1.x binaries requires JDK level 6.0 and above, and http://spring.io/docs[Spring Framework] 3.2.x and above.
+Spring Data for Apache Cassandra 1.x binaries requires JDK level 6.0 and above, and http://spring.io/docs[Spring Framework] 3.2.x and above.
Currently we support Cassandra 2.X using the DataStax Java Driver (2.0.X)
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
index 15700c2e5..801e1b771 100644
--- a/src/main/asciidoc/preface.adoc
+++ b/src/main/asciidoc/preface.adoc
@@ -1,7 +1,7 @@
[[preface]]
= Preface
-The Spring Data Cassandra project applies core Spring concepts to the development of solutions using the Cassandra Columnar data store. We provide a "template" as a high-level abstraction for storing and querying documents. You will notice similarities to the JDBC support in the Spring Framework.
+The Spring Data for Apache Cassandra project applies core Spring concepts to the development of solutions using the Cassandra Columnar data store. We provide a "template" as a high-level abstraction for storing and querying documents. You will notice similarities to the JDBC support in the Spring Framework.
[[project]]
[preface]
diff --git a/src/main/asciidoc/reference/cassandra-repositories.adoc b/src/main/asciidoc/reference/cassandra-repositories.adoc
index 3e857bfd8..cdee0b61c 100644
--- a/src/main/asciidoc/reference/cassandra-repositories.adoc
+++ b/src/main/asciidoc/reference/cassandra-repositories.adoc
@@ -25,7 +25,7 @@ TODO
[[cassandradb.repositories.misc.cdi-integration]]
=== CDI Integration
-The Spring Data Cassandra CDI extension will pick up the `CassandraTemplate` available as CDI bean and create a proxy for a Spring Data repository whenever an bean of a repository type is requested by the container. Thus obtaining an instance of a Spring Data repository is a matter of declaring an `@Inject`-ed property:
+The Spring Data for Apache Cassandra CDI extension will pick up the `CassandraTemplate` available as CDI bean and create a proxy for a Spring Data repository whenever an bean of a repository type is requested by the container. Thus obtaining an instance of a Spring Data repository is a matter of declaring an `@Inject`-ed property:
[source,java]
----
diff --git a/src/main/asciidoc/reference/cassandra.adoc b/src/main/asciidoc/reference/cassandra.adoc
index 488a1c669..601348f2d 100644
--- a/src/main/asciidoc/reference/cassandra.adoc
+++ b/src/main/asciidoc/reference/cassandra.adoc
@@ -17,7 +17,7 @@ For most tasks you will find yourself using `CassandraTemplate` or the Repositor
[[cassandra-getting-started]]
== Getting Started
-Spring Data Cassandra uses the DataStax Java Driver version 2.X, which supports DataStax Enterprise 4/Cassandra 2.0, and Java SE 6 or higher. The latest commercial release (2.X as of this writing) is recommended. An easy way to bootstrap setting up a working environment is to create a Spring based project in http://spring.io/tools/sts[STS].
+Spring Data for Apache Cassandra uses the DataStax Java Driver version 2.X, which supports DataStax Enterprise 4/Cassandra 2.0, and Java SE 6 or higher. The latest commercial release (2.X as of this writing) is recommended. An easy way to bootstrap setting up a working environment is to create a Spring based project in http://spring.io/tools/sts[STS].
First you need to set up a running Cassandra server.
@@ -167,7 +167,7 @@ Even in this simple example, there are a few things to observe.
== Examples Repository
-After the initial release of Spring Data Cassandra 1.0.0, we will start working on a showcase repository with full examples.
+After the initial release of Spring Data for Apache Cassandra 1.0.0, we will start working on a showcase repository with full examples.
[[cassandra-connectors]]
== Connecting to Cassandra with Spring
@@ -193,7 +193,7 @@ We will use spring to load these properties into the Spring Context in the next
The XML Configuration elements for a basic Cassandra configuration are shown below. These elements all use default bean names to keep the configuration code clean and readable.
-While this example show how easy it is to configure Spring to connect to Cassandra, there are many other options. Basically, any option available with the DataStax Java Driver is also available in the Spring Data Cassandra configuration. This is including, but not limited to Authentication, Load Balancing Policies, Retry Policies and Pooling Options. All of the Spring Data Cassandra method names and XML elements are named exactly (or as close as possible) like the configuration options on the driver so mapping any existing driver configuration should be straight forward.
+While this example show how easy it is to configure Spring to connect to Cassandra, there are many other options. Basically, any option available with the DataStax Java Driver is also available in the Spring Data for Apache Cassandra configuration. This is including, but not limited to Authentication, Load Balancing Policies, Retry Policies and Pooling Options. All of the Spring Data for Apache Cassandra method names and XML elements are named exactly (or as close as possible) like the configuration options on the driver so mapping any existing driver configuration should be straight forward.
[source,xml]
----
@@ -228,7 +228,7 @@ While this example show how easy it is to configure Spring to connect to Cassand
Data Cassandra -->
-
@@ -509,7 +509,7 @@ public class LoginEvent {
==== Complex Composite Primary Key
-The annotations provided with Spring Data Cassandra can handle any key combination available in Cassandra. Here is one more example of a Composite Primary Key with 5 columns, 2 of which are a composite partition key, and the remaining 3 are ordered clustering keys. The getters/setters, hashCode and equals are omitted for brevity.
+The annotations provided with Spring Data for Apache Cassandra can handle any key combination available in Cassandra. Here is one more example of a Composite Primary Key with 5 columns, 2 of which are a composite partition key, and the remaining 3 are ordered clustering keys. The getters/setters, hashCode and equals are omitted for brevity.
[source,java]
----
@@ -549,7 +549,7 @@ public class DetailedLoginEventKey implements Serializable {
[[cassandra-template.type-mapping]]
=== Type mapping
-Spring Data Cassandra relies on the DataStax Java Driver type mapping component. This approach ensures that as types are added or changed, the Spring Data Cassandra module will continue to function without requiring changes. For more information on the DataStax CQL3 to Java Type mappings, please see their http://www.datastax.com/documentation/developer/java-driver/2.0/java-driver/reference/javaClass2Cql3Datatypes_r.html[Documentation here].
+Spring Data for Apache Cassandra relies on the DataStax Java Driver type mapping component. This approach ensures that as types are added or changed, the Spring Data for Apache Cassandra module will continue to function without requiring changes. For more information on the DataStax CQL3 to Java Type mappings, please see their http://www.datastax.com/documentation/developer/java-driver/2.0/java-driver/reference/javaClass2Cql3Datatypes_r.html[Documentation here].
[[cassandra-template.save-insert]]
=== Methods for saving and inserting rows
@@ -802,7 +802,7 @@ Coming Soon!
The CassandraTemplate has many overloads for execute() and executeAsync(). Pass in the CQL command you wish to be executed, and handle the appropriate response.
-This example uses the basic AsynchronousQueryListener that comes with Spring Data Cassandra. Please see the API documentation for all the options. There should be nothing you cannot perform in Cassandra with the execute() and executeAsync() methods.
+This example uses the basic AsynchronousQueryListener that comes with Spring Data for Apache Cassandra. Please see the API documentation for all the options. There should be nothing you cannot perform in Cassandra with the execute() and executeAsync() methods.
[source,java]
----
diff --git a/src/main/asciidoc/reference/introduction.adoc b/src/main/asciidoc/reference/introduction.adoc
index 6bc7c3096..13046cfee 100644
--- a/src/main/asciidoc/reference/introduction.adoc
+++ b/src/main/asciidoc/reference/introduction.adoc
@@ -1,7 +1,7 @@
[float]
= Document Structure
-This part of the reference documentation explains the core functionality offered by Spring Data Cassandra.
+This part of the reference documentation explains the core functionality offered by Spring Data for Apache Cassandra.
<> introduces the Cassandra module feature set.
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index a6bb82073..3c7a03bda 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data Cassandra 1.5 M1
+Spring Data for Apache Cassandra 1.5 M1
Copyright (c) [2010-2015] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").