diff --git a/pom.xml b/pom.xml
index 21014748f..d55165f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
Spring Data JPA
Spring Data module for JPA repositories.
- http://www.springframework.org/spring-data/jpa
+ http://projects.spring.io/spring-data-jpa
org.springframework.data.build
diff --git a/readme.md b/readme.md
index 42610847d..13b75a851 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
# Spring Data JPA #
-The primary goal of the [Spring Data](http://www.springsource.org/spring-data) project is to make it easier to build Spring-powered applications that use data access technologies. This module deals with enhanced support for JPA based data access layers.
+The primary goal of the [Spring Data](http://projects.spring.io/spring-data) project is to make it easier to build Spring-powered applications that use data access technologies. This module deals with enhanced support for JPA based data access layers.
## Features ##
@@ -14,11 +14,11 @@ The primary goal of the [Spring Data](http://www.springsource.org/spring-data) p
## Getting Help ##
-This README as well as the [reference documentation](http://static.springsource.org/spring-data/data-jpa/snapshot-site/reference/html) are the best places to start learning about Spring Data JPA. There are also [two sample applications](https://github.com/SpringSource/spring-data-jpa-examples) available to look at.
+This README as well as the [reference documentation](http://docs.spring.io/spring-data/data-jpa/docs/current/reference/html) are the best places to start learning about Spring Data JPA. There are also [two sample applications](https://github.com/spring-projects/spring-data-examples) available to look at.
-The main project [website](http://www.springsource.org/spring-data) contains links to basic project information such as source code, JavaDocs, Issue tracking, etc.
+The main project [website](http://projects.spring.io/spring-data) contains links to basic project information such as source code, JavaDocs, Issue tracking, etc.
-For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=27). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://www.springsource.org/projects). You should also have a look at our new Spring Guide
+For more detailed questions, use [stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-jpa) or the [forum](forum.spring.io/forum/jpa-orm). If you are new to Spring as well as to Spring Data, look for information about [Spring projects](http://projects.spring.io). You should also have a look at our new Spring Guide
[Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) that leverages the simplified configuration provided by [Spring Boot](http://projects.spring.io/spring-boot/).
@@ -44,7 +44,7 @@ class AppConfig {
@Bean
public DataSource dataSource() {
- return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).build();
+ return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build();
}
@Bean
@@ -125,9 +125,9 @@ public class UserRepositoryIntegrationTest {
Here are some ways for you to get involved in the community:
-* Get involved with the Spring community on the Spring Community Forums. Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=27) by responding to questions and joining the debate.
+* Get involved with the Spring community by helping out on [stackoverflow](http://stackoverflow.com/questions/tagged/spring-data-jpa) and the [forum](forum.spring.io/forum/jpa-orm) by responding to questions and joining the debate.
* Create [JIRA](https://jira.springsource.org/browse/DATAJPA) tickets for bugs and new features and comment and vote on the ones that you are interested in.
* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
+* Watch for upcoming articles on Spring by [subscribing](http://spring.io/blog) to spring.io.
Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup). Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
diff --git a/src/docbkx/faq.xml b/src/docbkx/faq.xml
index cdeddc434..a7fc24e8d 100644
--- a/src/docbkx/faq.xml
+++ b/src/docbkx/faq.xml
@@ -50,7 +50,8 @@
You have to replace
AnnotationSessionFactoryBean with the
- HibernateJpaSessionFactoryBean as follows:
+ HibernateJpaSessionFactoryBean as
+ follows:
Looking up a SessionFactory from a
diff --git a/src/docbkx/glossary.xml b/src/docbkx/glossary.xml
index b4df26fd9..d45972923 100644
--- a/src/docbkx/glossary.xml
+++ b/src/docbkx/glossary.xml
@@ -1,114 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
- <glossary id="glossary">
- <glossdiv>
- <title>A
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+
+ A
-
- AOP
+
+ AOP
-
- Aspect oriented programming
-
-
-
+
+ Aspect oriented programming
+
+
+
-
- C
+
+ C
-
- Commons DBCP
+
+ Commons DBCP
-
- Commons DataBase Connection Pools - Library of the Apache
- foundation offering pooling implementations of the
- DataSource interface.
-
-
+
+ Commons DataBase Connection Pools - Library of the Apache
+ foundation offering pooling implementations of the
+ DataSource interface.
+
+
-
- CRUD
+
+ CRUD
-
- Create, Read, Update, Delete - Basic persistence
- operations
-
-
-
+
+ Create, Read, Update, Delete - Basic persistence
+ operations
+
+
+
-
- D
+
+ D
-
- DAO
+
+ DAO
-
- Data Access Object - Pattern to separate persisting logic from
- the object to be persisted
-
-
+
+ Data Access Object - Pattern to separate persisting logic from
+ the object to be persisted
+
+
-
- Dependency Injection
+
+ Dependency Injection
-
- Pattern to hand a component's dependency to the component from
- outside, freeing the component to lookup the dependant itself. For
- more information see http://en.wikipedia.org/wiki/Dependency_Injection.
-
-
-
+
+ Pattern to hand a component's dependency to the component from
+ outside, freeing the component to lookup the dependant itself. For
+ more information see http://en.wikipedia.org/wiki/Dependency_Injection.
+
+
+
-
- E
+
+ E
-
- EclipseLink
+
+ EclipseLink
-
- Object relational mapper implementing JPA - http://www.eclipselink.org
-
-
-
+
+ Object relational mapper implementing JPA - http://www.eclipselink.org
+
+
+
-
- H
+
+ H
-
- Hibernate
+
+ Hibernate
-
- Object relational mapper implementing JPA - http://www.hibernate.org
-
-
-
+
+ Object relational mapper implementing JPA - http://www.hibernate.org
+
+
+
-
- J
+
+ J
-
- JPA
+
+ JPA
-
- Java Persistence Api
-
-
-
+
+ Java Persistence Api
+
+
+
-
- S
+
+ S
-
- Spring
+
+ Spring
-
- Java application framework - http://www.springframework.org
-
-
-
-
\ No newline at end of file
+
+ Java application framework - http://projects.spring.io/spring-framework
+
+
+
+
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index 5c99b7c3a..b2a6fc4de 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -1,11 +1,11 @@
-
+
Spring Data JPA - Reference Documentation
- &version;
+ version;
@@ -16,12 +16,12 @@
Software Engineer
- GoPivotal Deutschland GmbH
+ Pivotal Software, Inc.
ogierke@gopivotal.com
-
+
Thomas
@@ -30,11 +30,25 @@
Software Engineer
- GoPivotal Deutschland GmbH
+ Pivotal Software, Inc.
tdarimont@gopivotal.com
+
+
+ Christoph
+
+ Strobl
+
+
+ Software Engineer
+
+ Pivotal Software, Inc.
+
+
+ cstrobl@gopivotal.com
+
@@ -44,42 +58,45 @@
Notice, whether distributed in print or electronically.
-
-
- 2008-2013
+ 2008-2014
- The original authors
+ The original authors.
-
+
+ Spring Data JPA - Reference Documentation
-
+
-
+
Reference Documentation
-
-
+
+
-
+
Appendix
-
-
-
-
-
+
+
-
+
+
+
-
+
+
+
-
\ No newline at end of file
+
diff --git a/src/docbkx/jpa.xml b/src/docbkx/jpa.xml
index 9699a63e1..03a21ba05 100644
--- a/src/docbkx/jpa.xml
+++ b/src/docbkx/jpa.xml
@@ -42,7 +42,7 @@
in . Beyond that it
activates persistence exception translation for all beans annotated with
@Repository to let exceptions being
- thrown by the JPA presistence providers be converted into Spring's
+ thrown by the JPA persistence providers be converted into Spring's
DataAccessException hierarchy.
@@ -50,7 +50,7 @@
Beyond the default attributes of the repositories
element the JPA namespace offers additional attributes to gain more
- detailled control over the setup of the repositories:
+ detailed control over the setup of the repositories:
Custom JPA-specific attributes of the repositories
@@ -98,7 +98,7 @@
</simplesect>
</section>
- <section>
+ <section id="jpa.java-config">
<title>Annotation based configuration
The Spring Data JPA repositories support cannot only be activated
@@ -208,7 +208,7 @@ class ApplicationConfig {
Data JPA will delegate the new-detection to the
isNew - Method of the Entity. See the
JavaDoc
+ url="http://docs.spring.io/spring-data/data-commons/docs/current/api/index.html?org/springframework/data/domain/Persistable.html">JavaDoc
for details.
@@ -226,7 +226,7 @@ class ApplicationConfig {
implementation of JpaRepositoryFactory
as a Spring bean. Note that this should be rarely necessary.
See the JavaDoc
+ url="http://docs.spring.io/spring-data/data-jpa/docs/current/api/index.html?org/springframework/data/jpa/repository/support/JpaRepositoryFactory.html">JavaDoc
for details.
@@ -321,6 +321,14 @@ class ApplicationConfig {
… where x.lastname = ?1 or x.firstname =
?2
+
+
+ Is,Equals
+
+ findByFirstname,findByFirstnameIs,findByFirstnameEquals
+
+ … where x.firstname = 1?
+
Between
@@ -338,6 +346,14 @@ class ApplicationConfig {
… where x.age < ?1
+
+
+ LessThanEqual
+
+ findByAgeLessThanEqual
+
+ … where x.age <= ?1
+
GreaterThan
@@ -346,6 +362,14 @@ class ApplicationConfig {
… where x.age > ?1
+
+
+ GreaterThanEqual
+
+ findByAgeGreaterThanEqual
+
+ … where x.age >= ?1
+
After
@@ -472,6 +496,15 @@ class ApplicationConfig {
… where x.active = false
+
+
+ IgnoreCase
+
+ findByFirstnameIgnoreCase
+
+ … where UPPER(x.firstame) = UPPER(?1)
+
+
@@ -645,7 +678,7 @@ public class User {
binding as described in all the samples above. This makes query methods
a little error prone to refactoring regarding the parameter position. To
solve this issue you can use @Param annotation to give a
- method parameter a concrete name and bind the name in the query:
+ method parameter a concrete name and bind the name in the query.
Using named parameters
@@ -662,7 +695,7 @@ public class User {
-
+
Using SpEL expressions
As of Spring Data JPA Release 1.4 we support the usage of
@@ -722,7 +755,10 @@ public class User {
@Entity
public class User {
- @Id @GeneratedValue Long id;
+ @Id
+ @GeneratedValue
+ Long id;
+
String lastname;
}
@@ -814,7 +850,7 @@ int setFixedFirstnameFor(String firstname, String lastname);
you wish the EntityManager to be cleared
automatically you can set @Modifying
annotation's clearAutomatically attribute to
- true;
+ true.
@@ -1031,9 +1067,10 @@ class UserManagementImpl implements UserManagement {
none already running). The transaction configuration at the repositories
will be neglected then as the outer transaction configuration determines
the actual one used. Note that you will have to activate
- <tx:annotation-driven /> explicitly to get annotation
- based configuration at facades working. The example above assumes you
- are using component scanning.
+ <tx:annotation-driven /> or use
+ @EnableTransactionManagement explicitly
+ to get annotation based configuration at facades working. The example
+ above assumes you are using component scanning.
@@ -1122,12 +1159,12 @@ public interface UserRepository extends JpaRepository<User, Long> {
Auditing
-
-
+
General auditing configuration
Spring Data JPA ships with an entity listener that can be used to
@@ -1250,7 +1287,7 @@ class Config {
As of Spring 3.1 a package to scan can be configured on the
LocalContainerEntityManagerFactoryBean directly
to enable classpath scanning for entity classes. See the JavaDoc
+ url="http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.html#setPackagesToScan(java.lang.String...)">JavaDoc
for details.
diff --git a/src/docbkx/preface.xml b/src/docbkx/preface.xml
index c626e09df..6ed1eee00 100644
--- a/src/docbkx/preface.xml
+++ b/src/docbkx/preface.xml
@@ -10,7 +10,7 @@
Version control - git://github.com/SpringSource/spring-data-jpa.git
+ url="git://github.com/spring-projects/spring-data-jpa.git">git://github.com/spring-projects/spring-data-jpa.git
@@ -20,18 +20,18 @@
Release repository - http://repo.springsource.org/libs-release
+ url="http://repo.spring.io/libs-release">http://repo.spring.io/libs-release
Milestone repository - http://repo.springsource.org/libs-milestone
+ url="http://repo.spring.io/libs-milestone">http://repo.spring.io/libs-milestone
Snapshot repository - http://repo.springsource.org/libs-snapshot
+ url="http://repo.spring.io/libs-snapshot">http://repo.spring.io/libs-snapshot
-
\ No newline at end of file
+
diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt
index 4f304d38b..7a60ce195 100644
--- a/src/main/resources/readme.txt
+++ b/src/main/resources/readme.txt
@@ -13,5 +13,5 @@ The reference manual and javadoc are located in the 'docs' directory.
ADDITIONAL RESOURCES:
-Spring Data Homepage: http://www.springsource.org/spring-data
-Spring Data Forum: http://forum.springsource.org/forumdisplay.php?f=27
\ No newline at end of file
+Spring Data Homepage: http://projects.spring.io/spring-data
+Spring Data Forum: http://forum.spring.io/forum/jpa-orm
\ No newline at end of file
diff --git a/template.mf b/template.mf
index b5cb6e5ce..3d5133124 100644
--- a/template.mf
+++ b/template.mf
@@ -1,7 +1,7 @@
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.springframework.data.jpa
Bundle-Name: ${project.name}
-Bundle-Vendor: SpringSource
+Bundle-Vendor: Pivotal Software, Inc
Bundle-Version: ${project.version}
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Template: