preparing for 1.0.0.M2 MongoDB release

look for entity collection on finds in mongotemplate

.gitignore

@@ -1,4 +1,12 @@
+.DS_Store
+*.iml
+*.ipr
+*.iws
 target
 .springBeans
 .ant-targets-build.xml
+.settings/
+.project
+.classpath
 src/ant/.ant-targets-upload-dist.xml
+atlassian-ide-plugin.xml

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-dist</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Fri Oct 08 14:31:54 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

pom.xml

@@ -1,256 +1,268 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-document-dist</artifactId>
-	<name>Spring Data Document Distribution</name>
-	<version>1.0.0.M1</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>spring-data-document-parent</module>
-		<module>spring-data-document-core</module>
-		<module>spring-data-mongodb</module>
-		<!-- <module>spring-data-couchdb</module> -->
-	</modules>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-document-dist</artifactId>
+  <name>Spring Data Document Distribution</name>
+  <version>1.0.0.M2</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>spring-data-document-parent</module>
+    <module>spring-data-document-core</module>
+    <module>spring-data-mongodb</module>
+    <module>spring-data-mongodb-cross-store</module>
+    <module>spring-data-mongodb-log4j</module>
+    <!-- <module>spring-data-couchdb</module> -->
+  </modules>
 
-	<developers>
-		<developer>
-			<id>trisberg</id>
-			<name>Thomas Risberg</name>
-			<email>trisberg at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.SpringSource.com</organizationUrl>
-			<roles>
-				<role>Project Admin</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>-5</timezone>
-		</developer>
-		<developer>
-			<id>mpollack</id>
-			<name>Mark Pollack</name>
-			<email>mpollack at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.SpringSource.com</organizationUrl>
-			<roles>
-				<role>Project Admin</role>
-				<role>Developer</role>
-			</roles>
-			<timezone>-5</timezone>
-		</developer>
-		<developer>
-			<id>ogierke</id>
-			<name>Oliver Gierke</name>
-			<email>ogierke at vmware.com</email>
-			<organization>SpringSource</organization>
-			<organizationUrl>http://www.springsource.com</organizationUrl>
-			<roles>
-				<role>Developer</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
-	</developers>
+  <developers>
+    <developer>
+      <id>trisberg</id>
+      <name>Thomas Risberg</name>
+      <email>trisberg at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>mpollack</id>
+      <name>Mark Pollack</name>
+      <email>mpollack at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.SpringSource.com</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+    <developer>
+      <id>ogierke</id>
+      <name>Oliver Gierke</name>
+      <email>ogierke at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>jbrisbin</id>
+      <name>Jon Brisbin</name>
+      <email>jbrisbin at vmware.com</email>
+      <organization>SpringSource</organization>
+      <organizationUrl>http://www.springsource.com</organizationUrl>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>-6</timezone>
+    </developer>
+  </developers>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
-			<comments>
-			Copyright 2010 the original author or authors.
-			 
-			Licensed under the Apache License, Version 2.0 (the "License");
-			you may not use this file except in compliance with the License.
-			You may obtain a copy of the License at
-			
-			     http://www.apache.org/licenses/LICENSE-2.0
-			
-			Unless required by applicable law or agreed to in writing, software
-			distributed under the License is distributed on an "AS IS" BASIS,
-			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-			implied.
-			See the License for the specific language governing permissions and
-			limitations under the License.
-			</comments>
-		</license>
-	</licenses>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>
+        Copyright 2010 the original author or authors.
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- dist.* properties are used by the antrun tasks below -->
-		<dist.id>spring-data-document</dist.id>
-		<dist.name>Spring Data Document</dist.name>
-		<dist.key>DATADOC</dist.key>
-		<dist.version>${project.version}</dist.version>
-		<dist.releaseType>snapshot</dist.releaseType>
-		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
-		<dist.fileName>${dist.finalName}.zip</dist.fileName>
-		<dist.filePath>target/${dist.fileName}</dist.filePath>
-		<dist.bucketName>dist.springframework.org</dist.bucketName>
-		<!-- these properties should be in ~/.m2/settings.xml
-		<dist.accessKey>s3 access key</dist.accessKey>
-		<dist.secretKey>s3 secret key</dist.secretKey>
-		-->
-	</properties>
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
 
-	<build>
-		<extensions>
-			<extension>
-				<groupId>org.springframework.build.aws</groupId>
-				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
-			</extension>
-		</extensions>
+        http://www.apache.org/licenses/LICENSE-2.0
 
-		<plugins>
-			<plugin>
-			  <artifactId>maven-compiler-plugin</artifactId>
-			  <configuration>
-			    <source>1.6</source>
-			    <target>1.6</target>
-			  </configuration>
-			</plugin>
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+        implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+      </comments>
+    </license>
+  </licenses>
 
-			<plugin>
-				<groupId>com.agilejava.docbkx</groupId>
-				<artifactId>docbkx-maven-plugin</artifactId>
-				<version>2.0.7</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-html</goal>
-							<goal>generate-pdf</goal>
-						</goals>
-						<phase>pre-site</phase>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.docbook</groupId>
-						<artifactId>docbook-xml</artifactId>
-						<version>4.4</version>
-						<scope>runtime</scope>
-					</dependency>
-				</dependencies>
-				<configuration>
-				        <includes>index.xml</includes>
-					<xincludeSupported>true</xincludeSupported>
-					<foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-					<htmlStylesheet>css/html.css</htmlStylesheet>
-					<chunkedOutput>false</chunkedOutput>
-					<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-					<useExtensions>1</useExtensions>
-					<highlightSource>1</highlightSource>
-					<highlightDefaultLanguage></highlightDefaultLanguage>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- dist.* properties are used by the antrun tasks below -->
+    <dist.id>spring-data-document</dist.id>
+    <dist.name>Spring Data</dist.name>
+    <dist.key>DATADOC</dist.key>
+    <dist.version>${project.version}</dist.version>
+    <dist.releaseType>snapshot</dist.releaseType>
+    <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
+    <dist.fileName>${dist.finalName}.zip</dist.fileName>
+    <dist.filePath>target/${dist.fileName}</dist.filePath>
+    <dist.bucketName>dist.springframework.org</dist.bucketName>
+    <!-- these properties should be in ~/.m2/settings.xml
+      <dist.accessKey>s3 access key</dist.accessKey>
+      <dist.secretKey>s3 secret key</dist.secretKey>
+      -->
+  </properties>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.springframework.build.aws</groupId>
+        <artifactId>org.springframework.build.aws.maven</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </extension>
+    </extensions>
+
+    <plugins>
+      <plugin>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+	<!-- yes it really needs to be this (2.0.7) otherwise pdf generation from a clean build doesn't work -->
+        <version>2.0.7</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-html</goal>
+              <goal>generate-pdf</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.docbook</groupId>
+            <artifactId>docbook-xml</artifactId>
+            <version>4.4</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <includes>index.xml</includes>
+          <xincludeSupported>true</xincludeSupported>
+          <foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+          <htmlStylesheet>css/html.css</htmlStylesheet>
+          <chunkedOutput>false</chunkedOutput>
+          <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
+          <useExtensions>1</useExtensions>
+          <highlightSource>1</highlightSource>
+          <highlightDefaultLanguage></highlightDefaultLanguage>
           <!-- callouts -->
-					<entities>
-						<entity>
-							<name>version</name>
-							<value>${pom.version}</value>
-						</entity>
-					</entities>
-					<postProcess>
-						<copy todir="${project.basedir}/target/site/reference">
-							<fileset dir="${project.basedir}/target/docbkx">
-								<include name="**/*.html" />
-								<include name="**/*.pdf" />
-							</fileset>
-						</copy>
-						<copy todir="${project.basedir}/target/site/reference/html">
-							<fileset dir="${project.basedir}/src/docbkx/resources">
-								<include name="**/*.css" />
-								<include name="**/*.png" />
-								<include name="**/*.gif" />
-								<include name="**/*.jpg" />
-							</fileset>
-						</copy>
-						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-							tofile="${project.basedir}/target/site/reference/pdf/spring-data-document-reference.pdf"
-							failonerror="false" />
-					</postProcess>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<javadoc:aggregate>true</javadoc:aggregate>
-					<breakiterator>true</breakiterator>
-					<header>Spring Data Graph</header>
-					<source>1.6</source>
-					<quiet>true</quiet>
-					<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-					<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-					<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-					<!-- copies doc-files subdirectory which contains image resources -->
-					<docfilessubdirs>true</docfilessubdirs>
-					<links>
-						<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-						<link>http://java.sun.com/javase/6/docs/api</link>
-						<link>http://api.mongodb.org/java/2.3</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin><!--
+          <entities>
+            <entity>
+              <name>version</name>
+              <value>${pom.version}</value>
+            </entity>
+          </entities>
+          <postProcess>
+            <copy todir="${project.basedir}/target/site/reference">
+              <fileset dir="${project.basedir}/target/docbkx">
+                <include name="**/*.html"/>
+                <include name="**/*.pdf"/>
+              </fileset>
+            </copy>
+            <copy todir="${project.basedir}/target/site/reference/html">
+              <fileset dir="${project.basedir}/src/docbkx/resources">
+                <include name="**/*.css"/>
+                <include name="**/*.png"/>
+                <include name="**/*.gif"/>
+                <include name="**/*.jpg"/>
+              </fileset>
+            </copy>
+            <copy todir="${project.basedir}/target/site/reference/html">
+              <fileset dir="${project.basedir}/src/docbkx/resources/images">
+                <include name="*.png"/>
+              </fileset>
+            </copy>
+            <move file="${project.basedir}/target/site/reference/pdf/index.pdf"
+                  tofile="${project.basedir}/target/site/reference/pdf/spring-data-document-reference.pdf"
+                  failonerror="false"/>
+          </postProcess>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <javadoc:aggregate>true</javadoc:aggregate>
+          <breakiterator>true</breakiterator>
+          <header>Spring Data Document</header>
+          <source>1.5</source>
+          <quiet>true</quiet>
+          <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+          <overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+          <stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+          <!-- copies doc-files subdirectory which contains image resources -->
+          <docfilessubdirs>true</docfilessubdirs>
+          <links>
+            <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+            <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+            <link>http://api.mongodb.org/java/2.3</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin><!--
 				run `mvn package assembly:assembly` to trigger assembly creation.
 				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>distribution</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<id>upload-dist</id>
-						<phase>deploy</phase>
-						<configuration>
-							<tasks>
-								<ant antfile="${basedir}/src/ant/upload-dist.xml">
-									<target name="upload-dist"/>
-								</ant>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.0.5.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.7.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-		<!-- the name of this project is 'spring-data-document-dist';
-			 make sure the zip file is just 'spring-data-document'. -->
-		<finalName>${dist.finalName}</finalName>
-	</build>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>distribution</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>upload-dist</id>
+            <phase>deploy</phase>
+            <configuration>
+              <tasks>
+                <ant antfile="${basedir}/src/ant/upload-dist.xml">
+                  <target name="upload-dist"/>
+                </ant>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.springframework.build</groupId>
+            <artifactId>org.springframework.build.aws.ant</artifactId>
+            <version>3.0.5.RELEASE</version>
+          </dependency>
+          <dependency>
+            <groupId>net.java.dev.jets3t</groupId>
+            <artifactId>jets3t</artifactId>
+            <version>0.7.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+    <!-- the name of this project is 'spring-data-document-dist';
+         make sure the zip file is just 'spring-data-document'. -->
+    <finalName>${dist.finalName}</finalName>
+  </build>
 
   <distributionManagement>
     <!-- see 'staging' profile for dry-run deployment settings -->

spring-data-couchdb/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-couchdb/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-couchdb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

spring-data-couchdb/.settings/org.eclipse.jdt.core.prefs

@@ -1,6 +0,0 @@
-#Wed Oct 06 14:49:48 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-couchdb/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-couchdb/pom.xml

@@ -1,103 +1,133 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-document-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>spring-data-couchdb</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data CouchDB Support</name>
-	<dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-document-parent</artifactId>
+    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-couchdb</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring Data CouchDB Support</name>
 
-		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-		<!--  Spring Data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-document-core</artifactId>
-		</dependency>
+  <developers>
+    <developer>
+      <id>tareq.abedrabbo</id>
+      <name>Tareq Abedrabbo</name>
+      <email>tareq.abedrabbo@opencredo.com</email>
+      <organization>OpenCredo</organization>
+      <organizationUrl>http://www.opencredo.org</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>+0</timezone>
+    </developer>
+    <developer>
+      <id>tomas.lukosius</id>
+      <name>Tomas Lukosius</name>
+      <email>tomas.lukosius@opencredo.com</email>
+      <organization>OpenCredo</organization>
+      <organizationUrl>http://www.opencredo.org</organizationUrl>
+      <roles>
+        <role>Project Admin</role>
+        <role>Developer</role>
+      </roles>
+      <timezone>+0</timezone>
+    </developer>
+  </developers>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>runtime</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
+  <dependencies>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <!--  Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-		<!-- Couch DB -->
-		<dependency>
-			<groupId>com.google.code.jcouchdb</groupId>
-			<artifactId>jcouchdb</artifactId>
-			<version>0.11.0-1</version>
-		</dependency>
+	<!--  Spring Data -->
+    <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-document-core</artifactId>
+    </dependency>
+
+    <!-- Jackson JSON -->
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <!-- Couch DB -->
+    <dependency>
+      <groupId>com.google.code.jcouchdb</groupId>
+      <artifactId>jcouchdb</artifactId>
+      <version>0.11.0-1</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.springsource.bundlor</groupId>
+        <artifactId>com.springsource.bundlor.maven</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CannotGetCouchDbConnectionException.java

@@ -1,11 +0,0 @@
-package org.springframework.data.document.couchdb;
-
-import org.springframework.dao.DataAccessResourceFailureException;
-
-public class CannotGetCouchDbConnectionException extends DataAccessResourceFailureException {
-
-	public CannotGetCouchDbConnectionException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbFactoryBean.java

@@ -1,96 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.document.couchdb;
-
-import org.jcouchdb.db.Database;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.util.Assert;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Convenient factory for configuring MongoDB.
- *
- * @author Thomas Risberg
- * @since 1.0
- */
-public class CouchDbFactoryBean implements FactoryBean<Database>, InitializingBean, 
-		PersistenceExceptionTranslator {
-
-	/**
-	 * Logger, available to subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private String host;
-	private Integer port;
-	private String databaseName;
-	
-	public void setDatabaseName(String databaseName) {
-		this.databaseName = databaseName;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public Database getObject() throws Exception {
-		Assert.hasText(host, "Host must not be empty");
-		Assert.hasText(databaseName, "Database name must not be empty");
-		if (port == null) {
-			return new Database(host, databaseName);
-		}
-		else {
-			return new Database(host, port, databaseName);
-		}
-	}
-
-	public Class<? extends Database> getObjectType() {
-		return Database.class;
-	}
-
-	public boolean isSingleton() {
-		return false;
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		// apply defaults - convenient when used to configure for tests 
-		// in an application context
-		if (host == null) {
-			logger.warn("Property host not specified. Using default 'localhost'");
-			databaseName = "localhost";
-		}
-		if (databaseName == null) {
-			logger.warn("Property databaseName not specified. Using default name 'test'");
-			databaseName = "test";
-		}
-	}
-
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		logger.debug("Translating " + ex);
-		return CouchDbUtils.translateCouchExceptionIfPossible(ex);
-	}
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchDbUtils.java

@@ -1,57 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.document.couchdb;
-
-import org.jcouchdb.exception.CouchDBException;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.UncategorizedDocumentStoreException;
-
-/**
- * Helper class featuring helper methods for internal MongoDb classes.
- *
- * <p>Mainly intended for internal use within the framework.
- *
- * @author Thomas Risberg
- * @since 1.0
- */
-public class CouchDbUtils {
-
-	/**
-	 * Convert the given runtime exception to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy.
-	 * Return null if no translation is appropriate: any other exception may
-	 * have resulted from user code, and should not be translated.
-	 * @param ex runtime exception that occurred
-	 * @return the corresponding DataAccessException instance,
-	 * or <code>null</code> if the exception should not be translated
-	 */
-	public static DataAccessException translateCouchExceptionIfPossible(RuntimeException ex) {
-
-		// Check for well-known MongoException subclasses.
-		
-		// All other MongoExceptions
-		if (ex instanceof CouchDBException) {
-			return new UncategorizedDocumentStoreException(ex.getMessage(), ex);
-		}
-		
-		// If we get here, we have an exception that resulted from user code,
-		// rather than the persistence provider, so we return null to indicate
-		// that translation should not occur.
-		return null;				
-	}
-
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchServerResourceUsageException.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb;
+
+import org.springframework.dao.InvalidDataAccessResourceUsageException;
+import org.springframework.web.client.HttpServerErrorException;
+
+public class CouchServerResourceUsageException extends InvalidDataAccessResourceUsageException {
+
+  /**
+   * Create a new CouchServerResourceUsageException,
+   * wrapping an arbitrary HttpServerErrorException.
+   *
+   * @param cause the HttpServerErrorException thrown
+   */
+  public CouchServerResourceUsageException(HttpServerErrorException cause) {
+    super(cause != null ? cause.getMessage() : null, cause);
+  }
+
+}
+

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchTemplate.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.document.couchdb;
-
-
-import org.jcouchdb.db.Database;
-import org.jcouchdb.document.BaseDocument;
-import org.springframework.data.document.AbstractDocumentStoreTemplate;
-
-	public class CouchTemplate extends AbstractDocumentStoreTemplate<Database> {
-
-	private Database database;
-	
-	public CouchTemplate() {
-		super();
-	}
-	
-	public CouchTemplate(String host, String databaseName) {
-		super();
-		database = new Database(host, databaseName);
-	}
-
-	public CouchTemplate(Database database) {
-		super();
-		this.database = database;
-	}
-	
-	public void save(BaseDocument document) {
-		getConnection().createDocument(document);
-	}
-
-	@Override
-	public Database getConnection() {
-		return database;
-	}
-	
-	
-}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/CouchUsageException.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb;
+
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.web.client.HttpClientErrorException;
+
+public class CouchUsageException extends InvalidDataAccessApiUsageException {
+
+  /**
+   * Create a new CouchUsageException,
+   * wrapping an arbitrary HttpServerErrorException.
+   *
+   * @param cause the HttpServerErrorException thrown
+   */
+  public CouchUsageException(HttpClientErrorException cause) {
+    super(cause != null ? cause.getMessage() : null, cause);
+  }
+
+}
+

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/DocumentExistsException.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb;
+
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.web.client.HttpStatusCodeException;
+
+public class DocumentExistsException extends DataIntegrityViolationException {
+
+  /**
+   * Create a new DocumentExistsException,
+   * wrapping an arbitrary HttpServerErrorException.
+   *
+   * @param cause the HttpServerErrorException thrown
+   */
+  public DocumentExistsException(String documentId, HttpStatusCodeException cause) {
+    super(cause != null ? cause.getMessage() : null, cause);
+  }
+
+}
+

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/DocumentRetrievalFailureException.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb;
+
+import org.springframework.dao.DataRetrievalFailureException;
+
+public class DocumentRetrievalFailureException extends
+    DataRetrievalFailureException {
+
+  private String documentPath;
+
+  public DocumentRetrievalFailureException(String documentPath) {
+    super("Could not find document at path = " + documentPath);
+    this.documentPath = documentPath;
+  }
+
+  public String getDocumentPath() {
+    return documentPath;
+  }
+
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/UncategorizedCouchDataAccessException.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb;
+
+import org.springframework.dao.UncategorizedDataAccessException;
+import org.springframework.web.client.RestClientException;
+
+public class UncategorizedCouchDataAccessException extends UncategorizedDataAccessException {
+
+  /**
+   * Create a new HibernateSystemException,
+   * wrapping an arbitrary HibernateException.
+   *
+   * @param cause the HibernateException thrown
+   */
+  public UncategorizedCouchDataAccessException(RestClientException cause) {
+    super(cause != null ? cause.getMessage() : null, cause);
+  }
+
+}
+

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/admin/CouchAdmin.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.admin;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.document.couchdb.support.CouchUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestOperations;
+import org.springframework.web.client.RestTemplate;
+
+public class CouchAdmin implements CouchAdminOperations {
+
+  private String databaseUrl;
+  private RestOperations restOperations = new RestTemplate();
+
+  public CouchAdmin(String databaseUrl) {
+
+    if (!databaseUrl.trim().endsWith("/")) {
+      this.databaseUrl = databaseUrl.trim() + "/";
+    } else {
+      this.databaseUrl = databaseUrl.trim();
+    }
+  }
+
+  public List<String> listDatabases() {
+    String dbs = restOperations.getForObject(databaseUrl + "_all_dbs", String.class);
+    return Arrays.asList(StringUtils.commaDelimitedListToStringArray(dbs));
+  }
+
+  public void createDatabase(String dbName) {
+    org.springframework.util.Assert.hasText(dbName);
+    restOperations.put(databaseUrl + dbName, null);
+
+  }
+
+  public void deleteDatabase(String dbName) {
+    org.springframework.util.Assert.hasText(dbName);
+    restOperations.delete(CouchUtils.ensureTrailingSlash(databaseUrl + dbName));
+
+  }
+
+  public DbInfo getDatabaseInfo(String dbName) {
+    String url = CouchUtils.ensureTrailingSlash(databaseUrl + dbName);
+    Map dbInfoMap = (Map) restOperations.getForObject(url, Map.class);
+    return new DbInfo(dbInfoMap);
+  }
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/admin/CouchAdminOperations.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.admin;
+
+import java.util.List;
+
+public interface CouchAdminOperations {
+
+
+  // functionality for /_special - replication, logs, UUIDs
+
+  List<String> listDatabases();
+
+  void createDatabase(String name);
+
+  void deleteDatabase(String name);
+
+  DbInfo getDatabaseInfo(String name);
+
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/admin/DbInfo.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.admin;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class DbInfo {
+
+  private Map dbInfoMap;
+
+  public DbInfo(Map dbInfoMap) {
+    super();
+    this.dbInfoMap = dbInfoMap;
+  }
+
+  public boolean isCompactRunning() {
+    return (Boolean) this.dbInfoMap.get("compact_running");
+  }
+
+  public String getDbName() {
+    return (String) this.dbInfoMap.get("db_name");
+  }
+
+  public long getDiskFormatVersion() {
+    return (Long) this.dbInfoMap.get("disk_format_version");
+  }
+
+  public long getDiskSize() {
+    return (Long) this.dbInfoMap.get("disk_size");
+  }
+
+  public long getDocCount() {
+    return (Long) this.dbInfoMap.get("doc_count");
+  }
+
+  public long getDocDeleteCount() {
+    return (Long) this.dbInfoMap.get("doc_del_count");
+  }
+
+  public long getInstanceStartTime() {
+    return (Long) this.dbInfoMap.get("instance_start_time");
+  }
+
+  public long getPurgeSequence() {
+    return (Long) this.dbInfoMap.get("purge_seq");
+  }
+
+  public long getUpdateSequence() {
+    return (Long) this.dbInfoMap.get("update_seq");
+  }
+
+  public Map getDbInfoMap() {
+    return Collections.unmodifiableMap(dbInfoMap);
+  }
+
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/config/CouchJmxParser.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.document.couchdb.monitor.ServerInfo;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+public class CouchJmxParser implements BeanDefinitionParser {
+
+  public BeanDefinition parse(Element element, ParserContext parserContext) {
+    String databaseUrl = element.getAttribute("database-url");
+    if (!StringUtils.hasText(databaseUrl)) {
+      databaseUrl = "http://localhost:5984";
+    }
+    registerJmxComponents(databaseUrl, element, parserContext);
+    return null;
+  }
+
+  protected void registerJmxComponents(String databaseUrl, Element element, ParserContext parserContext) {
+    Object eleSource = parserContext.extractSource(element);
+
+    CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
+
+    /*
+      createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
+      createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
+      */
+    createBeanDefEntry(ServerInfo.class, compositeDef, databaseUrl, eleSource, parserContext);
+    //createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
+
+
+    parserContext.registerComponent(compositeDef);
+
+  }
+
+  protected void createBeanDefEntry(Class clazz, CompositeComponentDefinition compositeDef, String databaseUrl, Object eleSource, ParserContext parserContext) {
+    BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
+    builder.getRawBeanDefinition().setSource(eleSource);
+    builder.addConstructorArg(databaseUrl);
+    BeanDefinition assertDef = builder.getBeanDefinition();
+    String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
+    compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
+  }
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/config/CouchNamespaceHandler.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+
+/**
+ * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Couch DB
+ * based repositories.
+ *
+ * @author Oliver Gierke
+ */
+public class CouchNamespaceHandler extends NamespaceHandlerSupport {
+
+  /*
+  * (non-Javadoc)
+  *
+  * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+  */
+  public void init() {
+
+    /*
+    registerBeanDefinitionParser("repositories",
+            new MongoRepositoryConfigDefinitionParser());
+    */
+
+    registerBeanDefinitionParser("jmx", new CouchJmxParser());
+  }
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/CouchOperations.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.core;
+
+import java.net.URI;
+
+
+public interface CouchOperations {
+
+  /**
+   * Reads a document from the database and maps it a Java object.
+   * </p>
+   * This method is intended to work when a default database
+   * is set on the CouchDbDocumentOperations instance.
+   *
+   * @param id          the id of the CouchDB document to read
+   * @param targetClass the target type to map to
+   * @return the mapped object
+   */
+  <T> T findOne(String id, Class<T> targetClass);
+
+  /**
+   * Reads a document from the database and maps it a Java object.
+   *
+   * @param uri         the full URI of the document to read
+   * @param targetClass the target type to map to
+   * @return the mapped object
+   */
+  <T> T findOne(URI uri, Class<T> targetClass);
+
+
+  /**
+   * Maps a Java object to JSON and writes it to the database
+   * </p>
+   * This method is intended to work when a default database
+   * is set on the CouchDbDocumentOperations instance.
+   *
+   * @param id       the id of the document to write
+   * @param document the object to write
+   */
+  void save(String id, Object document);
+
+  /**
+   * Maps a Java object to JSON and writes it to the database
+   *
+   * @param uri      the full URI of the document to write
+   * @param document the object to write
+   */
+  void save(URI uri, Object document);
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/CouchTemplate.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.core;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.document.couchdb.CouchServerResourceUsageException;
+import org.springframework.data.document.couchdb.CouchUsageException;
+import org.springframework.data.document.couchdb.DocumentRetrievalFailureException;
+import org.springframework.data.document.couchdb.UncategorizedCouchDataAccessException;
+import org.springframework.data.document.couchdb.support.CouchUtils;
+import org.springframework.http.*;
+import org.springframework.util.Assert;
+import org.springframework.web.client.*;
+
+
+public class CouchTemplate implements CouchOperations {
+
+  protected final Log logger = LogFactory.getLog(this.getClass());
+
+  private String defaultDocumentUrl;
+
+  private RestOperations restOperations = new RestTemplate();
+
+  /**
+   * Constructs an instance of CouchDbDocumentTemplate with a default database
+   *
+   * @param defaultDatabaseUrl the default database to connect to
+   */
+  public CouchTemplate(String defaultDatabaseUrl) {
+    Assert.hasText(defaultDatabaseUrl, "defaultDatabaseUrl must not be empty");
+    defaultDocumentUrl = CouchUtils.addId(defaultDatabaseUrl);
+  }
+
+  /**
+   * Constructs an instance of CouchDbDocumentTemplate with a default database
+   *
+   * @param defaultDatabaseUrl the default database to connect to
+   */
+  public CouchTemplate(String defaultDatabaseUrl, RestOperations restOperations) {
+    this(defaultDatabaseUrl);
+    Assert.notNull(restOperations, "restOperations must not be null");
+    this.restOperations = restOperations;
+  }
+
+
+  public <T> T findOne(String id, Class<T> targetClass) {
+    Assert.state(defaultDocumentUrl != null, "defaultDatabaseUrl must be set to use this method");
+    try {
+      return restOperations.getForObject(defaultDocumentUrl, targetClass, id);
+      //TODO check this exception translation and centralize.
+    } catch (HttpClientErrorException clientError) {
+      if (clientError.getStatusCode() == HttpStatus.NOT_FOUND) {
+        throw new DocumentRetrievalFailureException(defaultDocumentUrl + "/" + id);
+      }
+      throw new CouchUsageException(clientError);
+    } catch (HttpServerErrorException serverError) {
+      throw new CouchServerResourceUsageException(serverError);
+    } catch (RestClientException otherError) {
+      throw new UncategorizedCouchDataAccessException(otherError);
+    }
+  }
+
+  public <T> T findOne(URI uri, Class<T> targetClass) {
+    Assert.state(uri != null, "uri must be set to use this method");
+    try {
+      return restOperations.getForObject(uri, targetClass);
+      //TODO check this exception translation and centralize.
+    } catch (HttpClientErrorException clientError) {
+      if (clientError.getStatusCode() == HttpStatus.NOT_FOUND) {
+        throw new DocumentRetrievalFailureException(uri.getPath());
+      }
+      throw new CouchUsageException(clientError);
+    } catch (HttpServerErrorException serverError) {
+      throw new CouchServerResourceUsageException(serverError);
+    } catch (RestClientException otherError) {
+      throw new UncategorizedCouchDataAccessException(otherError);
+    }
+  }
+
+  public void save(String id, Object document) {
+    Assert.notNull(document, "document must not be null for save");
+    HttpEntity<?> httpEntity = createHttpEntity(document);
+    try {
+      ResponseEntity<Map> response = restOperations.exchange(defaultDocumentUrl, HttpMethod.PUT, httpEntity, Map.class, id);
+      //TODO update the document revision id on the object from the returned value
+      //TODO better exception translation
+    } catch (RestClientException e) {
+      throw new UncategorizedCouchDataAccessException(e);
+    }
+
+  }
+
+  public void save(URI uri, Object document) {
+    Assert.notNull(document, "document must not be null for save");
+    Assert.notNull(uri, "URI must not be null for save");
+    HttpEntity<?> httpEntity = createHttpEntity(document);
+    try {
+      ResponseEntity<Map> response = restOperations.exchange(uri, HttpMethod.PUT, httpEntity, Map.class);
+      //TODO update the document revision id on the object from the returned value
+      //TODO better exception translation
+    } catch (RestClientException e) {
+      throw new UncategorizedCouchDataAccessException(e);
+    }
+
+
+  }
+
+  private HttpEntity<?> createHttpEntity(Object document) {
+
+    if (document instanceof HttpEntity) {
+      HttpEntity httpEntity = (HttpEntity) document;
+      Assert.isTrue(httpEntity.getHeaders().getContentType().equals(MediaType.APPLICATION_JSON),
+          "HttpEntity payload with non application/json content type found.");
+      return httpEntity;
+    }
+
+    HttpHeaders httpHeaders = new HttpHeaders();
+    httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+    HttpEntity<Object> httpEntity = new HttpEntity<Object>(document, httpHeaders);
+
+    return httpEntity;
+  }
+
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/core/support/CouchDbMappingJacksonHttpMessageConverter.java

@@ -0,0 +1,315 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.core.support;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.*;
+
+import org.codehaus.jackson.*;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.type.TypeFactory;
+import org.codehaus.jackson.type.JavaType;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.AbstractHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.util.Assert;
+
+public class CouchDbMappingJacksonHttpMessageConverter extends
+    AbstractHttpMessageConverter<Object> {
+
+  public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+
+  private static final String ROWS_FIELD_NAME = "rows";
+  private static final String VALUE_FIELD_NAME = "value";
+  private static final String INCLUDED_DOC_FIELD_NAME = "doc";
+  private static final String TOTAL_ROWS_FIELD_NAME = "total_rows";
+
+  private ObjectMapper objectMapper = new ObjectMapper();
+
+  private boolean prefixJson = false;
+
+  /**
+   * Construct a new {@code BindingJacksonHttpMessageConverter}.
+   */
+  public CouchDbMappingJacksonHttpMessageConverter() {
+    super(new MediaType("application", "json", DEFAULT_CHARSET));
+  }
+
+  /**
+   * Sets the {@code ObjectMapper} for this view. If not set, a default
+   * {@link ObjectMapper#ObjectMapper() ObjectMapper} is used.
+   * <p/>
+   * Setting a custom-configured {@code ObjectMapper} is one way to take
+   * further control of the JSON serialization process. For example, an
+   * extended {@link org.codehaus.jackson.map.SerializerFactory} can be
+   * configured that provides custom serializers for specific types. The other
+   * option for refining the serialization process is to use Jackson's
+   * provided annotations on the types to be serialized, in which case a
+   * custom-configured ObjectMapper is unnecessary.
+   */
+  public void setObjectMapper(ObjectMapper objectMapper) {
+    Assert.notNull(objectMapper, "'objectMapper' must not be null");
+    this.objectMapper = objectMapper;
+  }
+
+  /**
+   * Indicates whether the JSON output by this view should be prefixed with
+   * "{} &&". Default is false.
+   * <p/>
+   * Prefixing the JSON string in this manner is used to help prevent JSON
+   * Hijacking. The prefix renders the string syntactically invalid as a
+   * script so that it cannot be hijacked. This prefix does not affect the
+   * evaluation of JSON, but if JSON validation is performed on the string,
+   * the prefix would need to be ignored.
+   */
+  public void setPrefixJson(boolean prefixJson) {
+    this.prefixJson = prefixJson;
+  }
+
+  @Override
+  public boolean canRead(Class<?> clazz, MediaType mediaType) {
+    JavaType javaType = getJavaType(clazz);
+    return this.objectMapper.canDeserialize(javaType) && canRead(mediaType);
+  }
+
+  /**
+   * Returns the Jackson {@link JavaType} for the specific class.
+   * <p/>
+   * <p/>
+   * Default implementation returns
+   * {@link TypeFactory#type(java.lang.reflect.Type)}, but this can be
+   * overridden in subclasses, to allow for custom generic collection
+   * handling. For instance:
+   * <p/>
+   * <pre class="code">
+   * protected JavaType getJavaType(Class&lt;?&gt; clazz) {
+   * if (List.class.isAssignableFrom(clazz)) {
+   * return TypeFactory.collectionType(ArrayList.class, MyBean.class);
+   * } else {
+   * return super.getJavaType(clazz);
+   * }
+   * }
+   * </pre>
+   *
+   * @param clazz the class to return the java type for
+   * @return the java type
+   */
+  protected JavaType getJavaType(Class<?> clazz) {
+    return TypeFactory.type(clazz);
+  }
+
+  @Override
+  public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+    return this.objectMapper.canSerialize(clazz) && canWrite(mediaType);
+  }
+
+  @Override
+  protected boolean supports(Class<?> clazz) {
+    // should not be called, since we override canRead/Write instead
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
+      throws IOException, HttpMessageNotReadableException {
+    JavaType javaType = getJavaType(clazz);
+    try {
+      return success(clazz, inputMessage);
+
+      // return this.objectMapper.readValue(inputMessage.getBody(),
+      // javaType);
+    } catch (Exception ex) {
+      throw new HttpMessageNotReadableException("Could not read JSON: "
+          + ex.getMessage(), ex);
+    }
+  }
+
+  private Object success(Class<?> clazz, HttpInputMessage inputMessage)
+      throws JsonParseException, IOException {
+
+    //Note, parsing code used from ektorp project
+    JsonParser jp = objectMapper.getJsonFactory().createJsonParser(
+        inputMessage.getBody());
+    if (jp.nextToken() != JsonToken.START_OBJECT) {
+      throw new RuntimeException("Expected data to start with an Object");
+    }
+    Map<String, Integer> fields = readHeaderFields(jp);
+
+    List result;
+    if (fields.containsKey(TOTAL_ROWS_FIELD_NAME)) {
+      int totalRows = fields.get(TOTAL_ROWS_FIELD_NAME);
+      if (totalRows == 0) {
+        return Collections.emptyList();
+      }
+      result = new ArrayList(totalRows);
+    } else {
+      result = new ArrayList();
+    }
+
+    ParseState state = new ParseState();
+
+    Object first = parseFirstRow(jp, state, clazz);
+    if (first == null) {
+      return Collections.emptyList();
+    } else {
+      result.add(first);
+    }
+
+    while (jp.getCurrentToken() != null) {
+      skipToField(jp, state.docFieldName, state);
+      if (atEndOfRows(jp)) {
+        return result;
+      }
+      result.add(jp.readValueAs(clazz));
+      endRow(jp, state);
+    }
+    return result;
+  }
+
+  private Object parseFirstRow(JsonParser jp, ParseState state, Class clazz)
+      throws JsonParseException, IOException, JsonProcessingException,
+      JsonMappingException {
+    skipToField(jp, VALUE_FIELD_NAME, state);
+    JsonNode value = null;
+    if (atObjectStart(jp)) {
+      value = jp.readValueAsTree();
+      jp.nextToken();
+      if (isEndOfRow(jp)) {
+        state.docFieldName = VALUE_FIELD_NAME;
+        Object doc = objectMapper.readValue(value, clazz);
+        endRow(jp, state);
+        return doc;
+      }
+    }
+    skipToField(jp, INCLUDED_DOC_FIELD_NAME, state);
+    if (atObjectStart(jp)) {
+      state.docFieldName = INCLUDED_DOC_FIELD_NAME;
+      Object doc = jp.readValueAs(clazz);
+      endRow(jp, state);
+      return doc;
+    }
+    return null;
+  }
+
+
+  private boolean isEndOfRow(JsonParser jp) {
+    return jp.getCurrentToken() == JsonToken.END_OBJECT;
+  }
+
+  private void endRow(JsonParser jp, ParseState state) throws IOException, JsonParseException {
+    state.inRow = false;
+    jp.nextToken();
+  }
+
+  private boolean atObjectStart(JsonParser jp) {
+    return jp.getCurrentToken() == JsonToken.START_OBJECT;
+  }
+
+  private boolean atEndOfRows(JsonParser jp) {
+    return jp.getCurrentToken() != JsonToken.START_OBJECT;
+  }
+
+  private void skipToField(JsonParser jp, String fieldName, ParseState state) throws JsonParseException, IOException {
+    String lastFieldName = null;
+    while (jp.getCurrentToken() != null) {
+      switch (jp.getCurrentToken()) {
+        case FIELD_NAME:
+          lastFieldName = jp.getCurrentName();
+          jp.nextToken();
+          break;
+        case START_OBJECT:
+          if (!state.inRow) {
+            state.inRow = true;
+            jp.nextToken();
+          } else {
+            if (isInField(fieldName, lastFieldName)) {
+              return;
+            } else {
+              jp.skipChildren();
+            }
+          }
+          break;
+        default:
+          if (isInField(fieldName, lastFieldName)) {
+            jp.nextToken();
+            return;
+          }
+          jp.nextToken();
+          break;
+      }
+    }
+  }
+
+  private boolean isInField(String fieldName, String lastFieldName) {
+    return lastFieldName != null && lastFieldName.equals(fieldName);
+  }
+
+
+  private Map<String, Integer> readHeaderFields(JsonParser jp)
+      throws JsonParseException, IOException {
+    Map<String, Integer> map = new HashMap<String, Integer>();
+    jp.nextToken();
+    String nextFieldName = jp.getCurrentName();
+    while (!nextFieldName.equals(ROWS_FIELD_NAME)) {
+      jp.nextToken();
+      map.put(nextFieldName, Integer.valueOf(jp.getIntValue()));
+      jp.nextToken();
+      nextFieldName = jp.getCurrentName();
+    }
+    return map;
+  }
+
+  @Override
+  protected void writeInternal(Object o, HttpOutputMessage outputMessage)
+      throws IOException, HttpMessageNotWritableException {
+
+    JsonEncoding encoding = getEncoding(outputMessage.getHeaders()
+        .getContentType());
+    JsonGenerator jsonGenerator = this.objectMapper.getJsonFactory()
+        .createJsonGenerator(outputMessage.getBody(), encoding);
+    try {
+      if (this.prefixJson) {
+        jsonGenerator.writeRaw("{} && ");
+      }
+      this.objectMapper.writeValue(jsonGenerator, o);
+    } catch (JsonGenerationException ex) {
+      throw new HttpMessageNotWritableException("Could not write JSON: "
+          + ex.getMessage(), ex);
+    }
+  }
+
+  private JsonEncoding getEncoding(MediaType contentType) {
+    if (contentType != null && contentType.getCharSet() != null) {
+      Charset charset = contentType.getCharSet();
+      for (JsonEncoding encoding : JsonEncoding.values()) {
+        if (charset.name().equals(encoding.getJavaName())) {
+          return encoding;
+        }
+      }
+    }
+    return JsonEncoding.UTF8;
+  }
+
+  private static class ParseState {
+    boolean inRow;
+    String docFieldName = "";
+  }
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.monitor;
+
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Base class to encapsulate common configuration settings when connecting to a CouchDB database
+ *
+ * @author Mark Pollack
+ */
+public abstract class AbstractMonitor {
+
+
+  protected RestTemplate restTemplate;
+  protected String databaseUrl;
+
+  /**
+   * Gets the databaseUrl used to connect to CouchDB
+   *
+   * @return
+   */
+  public String getDatabaseUrl() {
+    return this.databaseUrl;
+  }
+
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.monitor;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Expose basic server information via JMX
+ *
+ * @author Mark Pollack
+ */
+@ManagedResource(description = "Server Information")
+public class ServerInfo extends AbstractMonitor {
+
+
+  public ServerInfo(String databaseUrl) {
+    this.databaseUrl = databaseUrl;
+    this.restTemplate = new RestTemplate();
+  }
+
+
+  @ManagedOperation(description = "Server host name")
+  public String getHostName() throws UnknownHostException {
+    return InetAddress.getLocalHost().getHostName();
+  }
+
+
+  @ManagedOperation(description = "CouchDB Server Version")
+  public String getVersion() {
+    return (String) getRoot().get("version");
+  }
+
+  @ManagedOperation(description = "Message of the day")
+  public String getMotd() {
+    return (String) getRoot().get("greeting");
+  }
+
+  public Map getRoot() {
+    Map map = restTemplate.getForObject(getDatabaseUrl(), Map.class);
+    return map;
+  }
+
+}

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * CouchDB specific JMX monitoring support.
+ */
+package org.springframework.data.document.couchdb.monitor;

spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.support;
+
+import org.springframework.dao.DataAccessException;
+
+/**
+ * Helper class featuring helper methods for internal CouchDB classes.
+ * <p/>
+ * <p>Mainly intended for internal use within the framework.
+ *
+ * @author Thomas Risberg
+ * @author Tareq Abedrabbo
+ * @since 1.0
+ */
+public abstract class CouchUtils {
+
+  /**
+   * Convert the given runtime exception to an appropriate exception from the
+   * <code>org.springframework.dao</code> hierarchy.
+   * Return null if no translation is appropriate: any other exception may
+   * have resulted from user code, and should not be translated.
+   *
+   * @param ex runtime exception that occurred
+   * @return the corresponding DataAccessException instance,
+   *         or <code>null</code> if the exception should not be translated
+   */
+  public static DataAccessException translateCouchExceptionIfPossible(RuntimeException ex) {
+
+    return null;
+  }
+
+  /**
+   * Adds an id variable to a URL
+   *
+   * @param url the URL to modify
+   * @return the modified URL
+   */
+  public static String addId(String url) {
+    return ensureTrailingSlash(url) + "{id}";
+  }
+
+
+  /**
+   * Adds a 'changes since' variable to a URL
+   *
+   * @param url
+   * @return
+   */
+  public static String addChangesSince(String url) {
+    return ensureTrailingSlash(url) + "_changes?since={seq}";
+  }
+
+  /**
+   * Ensures that a URL ends with a slash.
+   *
+   * @param url the URL to modify
+   * @return the modified URL
+   */
+  public static String ensureTrailingSlash(String url) {
+    if (!url.endsWith("/")) {
+      url += "/";
+    }
+    return url;
+  }
+
+}

spring-data-couchdb/src/main/resources/META-INF/spring.handlers

@@ -0,0 +1 @@
+http\://www.springframework.org/schema/data/couch=org.springframework.data.document.couchdb.config.CouchNamespaceHandler

spring-data-couchdb/src/main/resources/META-INF/spring.schemas

@@ -0,0 +1,2 @@
+http\://www.springframework.org/schema/data/couch/spring-couch-1.0.xsd=org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd
+http\://www.springframework.org/schema/data/couch/spring-couch.xsd=org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd

spring-data-couchdb/src/main/resources/META-INF/spring.tooling

@@ -0,0 +1,4 @@
+# Tooling related information for the Couch DB namespace
+http\://www.springframework.org/schema/data/couch@name=Couch Namespace
+http\://www.springframework.org/schema/data/couch@prefix=couch
+http\://www.springframework.org/schema/data/couch@icon=org/springframework/jdbc/config/spring-jdbc.gif

spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://www.springframework.org/schema/data/couch"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:tool="http://www.springframework.org/schema/tool"
+            xmlns:context="http://www.springframework.org/schema/context"
+            xmlns:repository="http://www.springframework.org/schema/data/repository"
+            targetNamespace="http://www.springframework.org/schema/data/couch"
+            elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.springframework.org/schema/tool"/>
+  <xsd:import namespace="http://www.springframework.org/schema/context"
+              schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd"/>
+  <xsd:import namespace="http://www.springframework.org/schema/data/repository"
+              schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
+
+
+  <xsd:element name="jmx">
+    <xsd:annotation>
+      <xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a CouchDB server'.
+			]]></xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:attribute name="database-url" type="xsd:string" use="optional">
+        <xsd:annotation>
+          <xsd:documentation><![CDATA[
+The database URL of the CouchDB]]></xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+    </xsd:complexType>
+  </xsd:element>
+
+</xsd:schema>

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb;
+
+import java.util.Date;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
+/**
+ * @author Tareq Abedrabbo (tareq.abedrabbo@opencredo.com)
+ * @since 13/01/2011
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DummyDocument {
+
+  private String message;
+
+  private String timestamp = new Date().toString();
+
+  public DummyDocument() {
+  }
+
+  public DummyDocument(String message) {
+    this.message = message;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public String getTimestamp() {
+    return timestamp;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    DummyDocument document = (DummyDocument) o;
+
+    if (message != null ? !message.equals(document.message) : document.message != null) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return message != null ? message.hashCode() : 0;
+  }
+
+  @Override
+  public String toString() {
+    return "DummyDocument{" +
+        "message='" + message + '\'' +
+        ", timestamp=" + timestamp +
+        '}';
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.springframework.http.HttpEntity;
+
+/**
+ * Matches the content of the body of an HttpEntity.
+ *
+ * @author Tareq Abedrabbo
+ * @since 31/01/2011
+ */
+public class IsBodyEqual extends TypeSafeMatcher<HttpEntity> {
+
+  private Object object;
+
+  public IsBodyEqual(Object object) {
+    this.object = object;
+  }
+
+  @Override
+  public boolean matchesSafely(HttpEntity httpEntity) {
+    return httpEntity.getBody().equals(object);
+  }
+
+  public void describeTo(Description description) {
+    description.appendText("body equals ").appendValue(object);
+  }
+
+  @Factory
+  public static Matcher<HttpEntity> bodyEqual(Object object) {
+    return new IsBodyEqual(object);
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.admin;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.data.document.couchdb.core.CouchConstants;
+
+public class CouchAdminIntegrationTests {
+
+  @Test
+  @Ignore("until CI has couch server running")
+  public void dbLifecycle() {
+
+    CouchAdmin admin = new CouchAdmin(CouchConstants.COUCHDB_URL);
+    admin.deleteDatabase("foo");
+    List<String> dbs = admin.listDatabases();
+    admin.createDatabase("foo");
+    List<String> newDbs = admin.listDatabases();
+    Assert.assertEquals(dbs.size() + 1, newDbs.size());
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.core;
+
+import static org.junit.Assume.assumeNoException;
+import static org.junit.Assume.assumeTrue;
+import static org.springframework.http.HttpStatus.OK;
+
+import java.io.IOException;
+import java.util.UUID;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.springframework.http.*;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Base class for CouchDB integration tests. Checks whether CouchDB is available before running each test,
+ * in which case the test is executed. If CouchDB is not available, tests are ignored.
+ *
+ * @author Tareq Abedrabbo (tareq.abedrabbo@opencredo.com)
+ * @since 13/01/2011
+ */
+
+public abstract class AbstractCouchTemplateIntegrationTests {
+
+
+  protected static final Log log = LogFactory.getLog(AbstractCouchTemplateIntegrationTests.class);
+
+  protected static final RestTemplate restTemplate = new RestTemplate();
+
+  /**
+   * This methods ensures that the database is running. Otherwise, the test is ignored.
+   */
+  @BeforeClass
+  public static void assumeDatabaseIsUpAndRunning() {
+    try {
+      ResponseEntity<String> responseEntity = restTemplate.getForEntity(CouchConstants.COUCHDB_URL, String.class);
+      assumeTrue(responseEntity.getStatusCode().equals(OK));
+      log.debug("CouchDB is running on " + CouchConstants.COUCHDB_URL +
+          " with status " + responseEntity.getStatusCode());
+    } catch (RestClientException e) {
+      log.debug("CouchDB is not running on " + CouchConstants.COUCHDB_URL);
+      assumeNoException(e);
+    }
+  }
+
+  @Before
+  public void setUpTestDatabase() throws Exception {
+    RestTemplate template = new RestTemplate();
+    template.setErrorHandler(new DefaultResponseErrorHandler() {
+      @Override
+      public void handleError(ClientHttpResponse response) throws IOException {
+        // do nothing, error status will be handled in the switch statement
+      }
+    });
+    ResponseEntity<String> response = template.getForEntity(CouchConstants.TEST_DATABASE_URL, String.class);
+    HttpStatus statusCode = response.getStatusCode();
+    switch (statusCode) {
+      case NOT_FOUND:
+        createNewTestDatabase();
+        break;
+      case OK:
+        deleteExisitingTestDatabase();
+        createNewTestDatabase();
+        break;
+      default:
+        throw new IllegalStateException("Unsupported http status [" + statusCode + "]");
+    }
+  }
+
+  private void deleteExisitingTestDatabase() {
+    restTemplate.delete(CouchConstants.TEST_DATABASE_URL);
+  }
+
+  private void createNewTestDatabase() {
+    restTemplate.put(CouchConstants.TEST_DATABASE_URL, null);
+  }
+
+  /**
+   * Reads a CouchDB document and converts it to the expected type.
+   */
+  protected <T> T getDocument(String id, Class<T> expectedType) {
+    String url = CouchConstants.TEST_DATABASE_URL + "{id}";
+    return restTemplate.getForObject(url, expectedType, id);
+  }
+
+  /**
+   * Writes a CouchDB document
+   */
+  protected String putDocument(Object document) {
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.APPLICATION_JSON);
+    HttpEntity request = new HttpEntity(document, headers);
+    String id = UUID.randomUUID().toString();
+    restTemplate.put(CouchConstants.TEST_DATABASE_URL + "{id}", request, id);
+    return id;
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011 the original author or authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.document.couchdb.core;
+
+public abstract class CouchConstants {
+
+  public static final String COUCHDB_URL = "http://127.0.0.1:5984/";
+  public static final String TEST_DATABASE_URL = COUCHDB_URL + "si_couchdb_test/";
+
+  public CouchConstants() {
+    // TODO Auto-generated constructor stub
+  }
+
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.core;
+
+import java.util.UUID;
+
+import junit.framework.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.data.document.couchdb.DummyDocument;
+
+public class CouchTemplateIntegrationTests extends AbstractCouchTemplateIntegrationTests {
+
+
+  @Test
+  @Ignore("until CI has couch server running")
+  public void saveAndFindTest() {
+    CouchTemplate template = new CouchTemplate(CouchConstants.TEST_DATABASE_URL);
+    DummyDocument document = new DummyDocument("hello");
+    String id = UUID.randomUUID().toString();
+    template.save(id, document);
+    DummyDocument foundDocument = template.findOne(id, DummyDocument.class);
+    Assert.assertEquals(document.getMessage(), foundDocument.getMessage());
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateTests.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.core;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for CouchTemplate with mocks
+ */
+public class CouchTemplateTests {
+
+  @Test
+  public void foo() {
+
+  }
+}

spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/monitor/JmxServer.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.couchdb.monitor;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Server application to test JMX functionality.
+ *
+ * @author Mark Pollack
+ */
+public class JmxServer {
+
+  public static void main(String[] args) {
+    new JmxServer().run();
+  }
+
+  public void run() {
+    new ClassPathXmlApplicationContext(new String[]{"server-jmx.xml"});
+  }
+
+}

spring-data-couchdb/src/test/resources/log4j.properties

@@ -0,0 +1,13 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.apache.activemq=ERROR
+log4j.category.org.springframework.batch=DEBUG
+log4j.category.org.springframework.transaction=INFO
+
+log4j.category.org.hibernate.SQL=DEBUG
+# for debugging datasource initialization
+# log4j.category.test.jdbc=DEBUG

spring-data-couchdb/src/test/resources/server-jmx.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:couch="http://www.springframework.org/schema/data/couch"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/data/couch http://www.springframework.org/schema/data/couch/spring-couch-1.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+
+  <couch:jmx/>
+
+  <context:mbean-export/>
+
+  <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean"
+        p:port="1099"/>
+
+  <!-- Expose JMX over RMI -->
+  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry"
+        p:objectName="connector:name=rmi"
+        p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector"/>
+
+</beans>

spring-data-couchdb/template.mf

@@ -8,10 +8,15 @@ Import-Template:
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.core.*;version="[3.0.0, 4.0.0)",
  org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.http.*;version="[3.0.0, 4.0.0)",
+ org.springframework.web.*;version="[3.0.0, 4.0.0)",
  org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jmx.*;version="[3.0.0, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.document.*;version="[1.0.0, 2.0.0)",
- org.jcouchdb.*;version="0",
+ org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"

spring-data-document-core/.classpath

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-document-core/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

spring-data-document-core/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +0,0 @@
-#Thu Oct 14 10:28:37 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-document-core/.settings/org.eclipse.wst.common.component

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-datastore-document-core">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>

spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>

spring-data-document-core/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-document-core/pom.xml

@@ -1,132 +1,79 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-document-parent</artifactId>
-		<version>1.0.0.M1</version>
-		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
-	</parent>
-	<artifactId>spring-data-document-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Data Document Support</name>
-	<dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-document-parent</artifactId>
+    <version>1.0.0.M2</version>
+    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-document-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring Data Document Support</name>
+  <dependencies>
 
-		<!--  Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
+    <!--  Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>runtime</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>jsr250-api</artifactId>
-			<optional>true</optional>
-		</dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <optional>true</optional>
+    </dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		
-		
-		<!-- Dependencies for web analytics functionality - to me moved into spring framework  -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- Spring dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>	
-		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>	
-    	<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+
+    <!-- Dependencies for web analytics functionality - to me moved into spring framework  -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.springsource.bundlor</groupId>
+        <artifactId>com.springsource.bundlor.maven</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>

spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java

@@ -18,16 +18,15 @@ package org.springframework.data.document;
 
 
 public abstract class AbstractDocumentStoreTemplate<C> {
-	
-	public abstract C getConnection();
 
-	public <T> T execute(DocumentStoreConnectionCallback<C, T> action) {
-		try {
-			return action.doInConnection(getConnection());
-		}
-		catch (Exception e) {
-			throw new UncategorizedDocumentStoreException("Failure executing using datastore connection", e);
-		}
-	}
-	
+  public abstract C getConnection();
+
+  public <T> T execute(DocumentStoreConnectionCallback<C, T> action) {
+    try {
+      return action.doInConnection(getConnection());
+    } catch (Exception e) {
+      throw new UncategorizedDocumentStoreException("Failure executing using datastore connection", e);
+    }
+  }
+
 }

spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java

@@ -23,7 +23,7 @@ package org.springframework.data.document;
  * @since 1.0
  */
 public interface DocumentMapper<D, T> {
-	
-	T mapDocument(D document);
+
+  T mapDocument(D document);
 
 }

spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java

@@ -18,5 +18,5 @@ package org.springframework.data.document;
 
 public interface DocumentStoreConnectionCallback<C, T> {
 
-	T doInConnection(C con) throws Exception;
+  T doInConnection(C con) throws Exception;
 }

spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUsageException.java

@@ -20,12 +20,12 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
 
 public class InvalidDocumentStoreApiUsageException extends InvalidDataAccessApiUsageException {
 
-	public InvalidDocumentStoreApiUsageException(String msg) {
-		super(msg);
-	}
+  public InvalidDocumentStoreApiUsageException(String msg) {
+    super(msg);
+  }
 
-	public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+  public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
 
 }

spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java

@@ -20,8 +20,8 @@ import org.springframework.dao.UncategorizedDataAccessException;
 
 public class UncategorizedDocumentStoreException extends UncategorizedDataAccessException {
 
-	public UncategorizedDocumentStoreException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+  public UncategorizedDocumentStoreException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
 
 }

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java

@@ -1,45 +1,43 @@
 package org.springframework.data.document.analytics;
 
-import java.util.Date;
 import java.util.Map;
 
 public class ControllerCounter {
-	
-	public String getName() {
-		return name;
-	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
+  public String getName() {
+    return name;
+  }
 
-	public double getCount() {
-		return count;
-	}
+  public void setName(String name) {
+    this.name = name;
+  }
 
-	public void setCount(double count) {
-		this.count = count;
-	}
+  public double getCount() {
+    return count;
+  }
 
-	public Map<String, Double> getMethods() {
-		return methods;
-	}
-	
-	
+  public void setCount(double count) {
+    this.count = count;
+  }
 
-	public void setMethods(Map<String, Double> methods) {
-		this.methods = methods;
-	}
+  public Map<String, Double> getMethods() {
+    return methods;
+  }
 
-	private String name;
-	
-	private double count;
-	
-	private Map<String, Double> methods;
-	
-	@Override
-	public String toString() {
-		return "ControllerCounter [name=" + name + ", count=" + count
-				+ ", methods=" + methods + "]";
-	}	
+
+  public void setMethods(Map<String, Double> methods) {
+    this.methods = methods;
+  }
+
+  private String name;
+
+  private double count;
+
+  private Map<String, Double> methods;
+
+  @Override
+  public String toString() {
+    return "ControllerCounter [name=" + name + ", count=" + count
+        + ", methods=" + methods + "]";
+  }
 }

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java

@@ -4,81 +4,80 @@ import java.util.Date;
 
 public class MvcEvent {
 
-	private String controller;
-	
-	private String action;
-	
-	private Parameters parameters;
-	
-	private Date date;
-	
-	private String requestUri;
-	
-	private String requestAddress;
-	
-	private String remoteUser;
-	
-	private String view;
+  private String controller;
 
-	public String getController() {
-		return controller;
-	}
+  private String action;
 
-	public void setController(String controller) {
-		this.controller = controller;
-	}
+  private Parameters parameters;
 
-	public String getAction() {
-		return action;
-	}
+  private Date date;
 
-	public void setAction(String action) {
-		this.action = action;
-	}
+  private String requestUri;
 
-	public Parameters getParameters() {
-		return parameters;
-	}
+  private String requestAddress;
 
-	public void setParameters(Parameters parameters) {
-		this.parameters = parameters;
-	}
+  private String remoteUser;
 
-	public Date getDate() {
-		return date;
-	}
+  private String view;
 
-	public void setDate(Date date) {
-		this.date = date;
-	}
+  public String getController() {
+    return controller;
+  }
 
-	public String getRequestUri() {
-		return requestUri;
-	}
+  public void setController(String controller) {
+    this.controller = controller;
+  }
 
-	public void setRequestUri(String requestUri) {
-		this.requestUri = requestUri;
-	}
+  public String getAction() {
+    return action;
+  }
 
-	public String getRequestAddress() {
-		return requestAddress;
-	}
+  public void setAction(String action) {
+    this.action = action;
+  }
 
-	public void setRequestAddress(String requestAddress) {
-		this.requestAddress = requestAddress;
-	}
+  public Parameters getParameters() {
+    return parameters;
+  }
+
+  public void setParameters(Parameters parameters) {
+    this.parameters = parameters;
+  }
+
+  public Date getDate() {
+    return date;
+  }
+
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  public String getRequestUri() {
+    return requestUri;
+  }
+
+  public void setRequestUri(String requestUri) {
+    this.requestUri = requestUri;
+  }
+
+  public String getRequestAddress() {
+    return requestAddress;
+  }
+
+  public void setRequestAddress(String requestAddress) {
+    this.requestAddress = requestAddress;
+  }
+
+  public String getRemoteUser() {
+    return remoteUser;
+  }
+
+  public void setRemoteUser(String remoteUser) {
+    this.remoteUser = remoteUser;
+  }
+
+  //TODO
+  //Map sessionAttributes
 
-	public String getRemoteUser() {
-		return remoteUser;
-	}
 
-	public void setRemoteUser(String remoteUser) {
-		this.remoteUser = remoteUser;
-	}
-	
-	//TODO
-	//Map sessionAttributes
-	
-	
-	
 }

spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java

@@ -2,34 +2,34 @@ package org.springframework.data.document.analytics;
 
 public class Parameters {
 
-	private String p1;
-	
-	private String p2;
-	
-	private String p3;
+  private String p1;
 
-	public String getP1() {
-		return p1;
-	}
+  private String p2;
 
-	public void setP1(String p1) {
-		this.p1 = p1;
-	}
+  private String p3;
 
-	public String getP2() {
-		return p2;
-	}
+  public String getP1() {
+    return p1;
+  }
 
-	public void setP2(String p2) {
-		this.p2 = p2;
-	}
+  public void setP1(String p1) {
+    this.p1 = p1;
+  }
 
-	public String getP3() {
-		return p3;
-	}
+  public String getP2() {
+    return p2;
+  }
+
+  public void setP2(String p2) {
+    this.p2 = p2;
+  }
+
+  public String getP3() {
+    return p3;
+  }
+
+  public void setP3(String p3) {
+    this.p3 = p3;
+  }
 
-	public void setP3(String p3) {
-		this.p3 = p3;
-	}
-	
 }

spring-data-document-core/src/main/java/org/springframework/data/document/annotation/RelatedDocument.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Thomas Risberg
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({
+    ElementType.FIELD
+})
+public @interface RelatedDocument {
+
+  String collection() default "";
+
+}

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutedContext.java

@@ -22,40 +22,37 @@ import org.springframework.web.servlet.ModelAndView;
 public class ActionExecutedContext extends ActionExecutingContext {
 
 
-	private ModelAndView modelAndView;
-	
-	private Exception exception;
-	
-	public ActionExecutedContext(ActionExecutingContext actionExecutingContext, ModelAndView modelAndView, Exception exception) {
-		super(actionExecutingContext.getServletWebRequest(), actionExecutingContext.getHandler(),
-				actionExecutingContext.getHandlerMethod(), actionExecutingContext.getHandlerParameters(), 
-				actionExecutingContext.getImplicitModel());
-		this.modelAndView = modelAndView;
-		this.exception = exception;
-	}
+  private ModelAndView modelAndView;
 
-	@Override
-	public String toString() {
-		return "ActionExecutedContext [handler=" + getHandler()
-				+ ", servletWebRequest=" + getServletWebRequest()
-				+ ", implicitModel=" + getImplicitModel() + ", handlerMethod="
-				+ getHandlerMethod() + ", handlerParameters="
-				+ Arrays.toString(getHandlerParameters()) + ",modelAndView=" + modelAndView
-				+ ", exception=" + exception + "]";
-	}
-	
+  private Exception exception;
+
+  public ActionExecutedContext(ActionExecutingContext actionExecutingContext, ModelAndView modelAndView, Exception exception) {
+    super(actionExecutingContext.getServletWebRequest(), actionExecutingContext.getHandler(),
+        actionExecutingContext.getHandlerMethod(), actionExecutingContext.getHandlerParameters(),
+        actionExecutingContext.getImplicitModel());
+    this.modelAndView = modelAndView;
+    this.exception = exception;
+  }
+
+  @Override
+  public String toString() {
+    return "ActionExecutedContext [handler=" + getHandler()
+        + ", servletWebRequest=" + getServletWebRequest()
+        + ", implicitModel=" + getImplicitModel() + ", handlerMethod="
+        + getHandlerMethod() + ", handlerParameters="
+        + Arrays.toString(getHandlerParameters()) + ",modelAndView=" + modelAndView
+        + ", exception=" + exception + "]";
+  }
 
 
-	public ModelAndView getModelAndView() {
-		return modelAndView;
-	}
+  public ModelAndView getModelAndView() {
+    return modelAndView;
+  }
 
 
-	public Exception getException() {
-		return exception;
-	}
+  public Exception getException() {
+    return exception;
+  }
 
 
-	
-	
 }

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionExecutingContext.java

@@ -17,7 +17,6 @@ package org.springframework.data.document.web.servlet;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -26,67 +25,65 @@ import org.springframework.web.context.request.ServletWebRequest;
 
 public class ActionExecutingContext {
 
-	
-	private Object handler;
-	
-	private ServletWebRequest servletWebRequest;
-	
-	private ExtendedModelMap implicitModel;
-	
-	private Method handlerMethod;
-	
-	private Object[] handlerParameters;
-	
 
-	public ActionExecutingContext(ServletWebRequest servletWebRequest,
-			Object handler, Method handlerMethod, Object[] handlerParameters,
-			ExtendedModelMap implicitModel) {
-		super();
-		this.servletWebRequest = servletWebRequest;
-		this.handler = handler;
-		this.handlerMethod = handlerMethod;
-		this.handlerParameters = handlerParameters;
-		this.implicitModel = implicitModel;
-	}
+  private Object handler;
 
-	public HttpServletRequest getHttpServletRequest() {
-		return servletWebRequest.getRequest();
-	}
+  private ServletWebRequest servletWebRequest;
 
-	public HttpServletResponse getHttpServletResponse() {
-		return servletWebRequest.getResponse();
-	}
+  private ExtendedModelMap implicitModel;
 
-	public Object getHandler() {
-		return handler;
-	}
+  private Method handlerMethod;
 
-	public ServletWebRequest getServletWebRequest() {
-		return servletWebRequest;
-	}
+  private Object[] handlerParameters;
 
-	public ExtendedModelMap getImplicitModel() {
-		return implicitModel;
-	}
 
-	public Method getHandlerMethod() {
-		return handlerMethod;
-	}
+  public ActionExecutingContext(ServletWebRequest servletWebRequest,
+                                Object handler, Method handlerMethod, Object[] handlerParameters,
+                                ExtendedModelMap implicitModel) {
+    super();
+    this.servletWebRequest = servletWebRequest;
+    this.handler = handler;
+    this.handlerMethod = handlerMethod;
+    this.handlerParameters = handlerParameters;
+    this.implicitModel = implicitModel;
+  }
+
+  public HttpServletRequest getHttpServletRequest() {
+    return servletWebRequest.getRequest();
+  }
+
+  public HttpServletResponse getHttpServletResponse() {
+    return servletWebRequest.getResponse();
+  }
+
+  public Object getHandler() {
+    return handler;
+  }
+
+  public ServletWebRequest getServletWebRequest() {
+    return servletWebRequest;
+  }
+
+  public ExtendedModelMap getImplicitModel() {
+    return implicitModel;
+  }
+
+  public Method getHandlerMethod() {
+    return handlerMethod;
+  }
+
+  public Object[] getHandlerParameters() {
+    return handlerParameters;
+  }
+
+  @Override
+  public String toString() {
+    return "ActionExecutingContext [handler=" + handler
+        + ", servletWebRequest=" + servletWebRequest
+        + ", implicitModel=" + implicitModel + ", handlerMethod="
+        + handlerMethod + ", handlerParameters="
+        + Arrays.toString(handlerParameters) + "]";
+  }
 
-	public Object[] getHandlerParameters() {
-		return handlerParameters;
-	}
-	
-	@Override
-	public String toString() {
-		return "ActionExecutingContext [handler=" + handler
-				+ ", servletWebRequest=" + servletWebRequest
-				+ ", implicitModel=" + implicitModel + ", handlerMethod="
-				+ handlerMethod + ", handlerParameters="
-				+ Arrays.toString(handlerParameters) + "]";
-	}
-	
 
-	
-	
 }

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/ActionInterceptor.java

@@ -17,9 +17,9 @@ package org.springframework.data.document.web.servlet;
 
 public interface ActionInterceptor {
 
-	boolean preHandle(ActionExecutingContext actionExecutingContext);
-	
-	void postHandle(ActionExecutedContext actionExecutedContext);
-	
-	void afterCompletion(ActionExecutedContext actionExecutedContext);
+  boolean preHandle(ActionExecutingContext actionExecutingContext);
+
+  void postHandle(ActionExecutedContext actionExecutedContext);
+
+  void afterCompletion(ActionExecutedContext actionExecutedContext);
 }

spring-data-document-core/src/main/java/org/springframework/data/document/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java

@@ -34,110 +34,108 @@ import org.springframework.web.util.WebUtils;
  */
 abstract class ServletAnnotationMappingUtils {
 
-	/**
-	 * Check whether the given request matches the specified request methods.
-	 * @param methods the HTTP request methods to check against
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkRequestMethod(RequestMethod[] methods, HttpServletRequest request) {
-		if (ObjectUtils.isEmpty(methods)) {
-			return true;
-		}
-		for (RequestMethod method : methods) {
-			if (method.name().equals(request.getMethod())) {
-				return true;
-			}
-		}
-		return false;
-	}
+  /**
+   * Check whether the given request matches the specified request methods.
+   *
+   * @param methods the HTTP request methods to check against
+   * @param request the current HTTP request to check
+   */
+  public static boolean checkRequestMethod(RequestMethod[] methods, HttpServletRequest request) {
+    if (ObjectUtils.isEmpty(methods)) {
+      return true;
+    }
+    for (RequestMethod method : methods) {
+      if (method.name().equals(request.getMethod())) {
+        return true;
+      }
+    }
+    return false;
+  }
 
-	/**
-	 * Check whether the given request matches the specified parameter conditions.
-	 * @param params  the parameter conditions, following
-	 *                {@link org.springframework.web.bind.annotation.RequestMapping#params() RequestMapping.#params()}
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkParameters(String[] params, HttpServletRequest request) {
-		if (!ObjectUtils.isEmpty(params)) {
-			for (String param : params) {
-				int separator = param.indexOf('=');
-				if (separator == -1) {
-					if (param.startsWith("!")) {
-						if (WebUtils.hasSubmitParameter(request, param.substring(1))) {
-							return false;
-						}
-					}
-					else if (!WebUtils.hasSubmitParameter(request, param)) {
-						return false;
-					}
-				}
-				else {
-					boolean negated = separator > 0 && param.charAt(separator - 1) == '!';
-					String key = !negated ? param.substring(0, separator) : param.substring(0, separator - 1);
-					String value = param.substring(separator + 1);
-					if (!value.equals(request.getParameter(key))) {
-						return negated;
-					}
-				}
-			}
-		}
-		return true;
-	}
+  /**
+   * Check whether the given request matches the specified parameter conditions.
+   *
+   * @param params  the parameter conditions, following
+   *                {@link org.springframework.web.bind.annotation.RequestMapping#params() RequestMapping.#params()}
+   * @param request the current HTTP request to check
+   */
+  public static boolean checkParameters(String[] params, HttpServletRequest request) {
+    if (!ObjectUtils.isEmpty(params)) {
+      for (String param : params) {
+        int separator = param.indexOf('=');
+        if (separator == -1) {
+          if (param.startsWith("!")) {
+            if (WebUtils.hasSubmitParameter(request, param.substring(1))) {
+              return false;
+            }
+          } else if (!WebUtils.hasSubmitParameter(request, param)) {
+            return false;
+          }
+        } else {
+          boolean negated = separator > 0 && param.charAt(separator - 1) == '!';
+          String key = !negated ? param.substring(0, separator) : param.substring(0, separator - 1);
+          String value = param.substring(separator + 1);
+          if (!value.equals(request.getParameter(key))) {
+            return negated;
+          }
+        }
+      }
+    }
+    return true;
+  }
 
-	/**
-	 * Check whether the given request matches the specified header conditions.
-	 * @param headers the header conditions, following
-	 *                {@link org.springframework.web.bind.annotation.RequestMapping#headers() RequestMapping.headers()}
-	 * @param request the current HTTP request to check
-	 */
-	public static boolean checkHeaders(String[] headers, HttpServletRequest request) {
-		if (!ObjectUtils.isEmpty(headers)) {
-			for (String header : headers) {
-				int separator = header.indexOf('=');
-				if (separator == -1) {
-					if (header.startsWith("!")) {
-						if (request.getHeader(header.substring(1)) != null) {
-							return false;
-						}
-					}
-					else if (request.getHeader(header) == null) {
-						return false;
-					}
-				}
-				else {
-					boolean negated = separator > 0 && header.charAt(separator - 1) == '!';
-					String key = !negated ? header.substring(0, separator) : header.substring(0, separator - 1);
-					String value = header.substring(separator + 1);
-					if (isMediaTypeHeader(key)) {
-						List<MediaType> requestMediaTypes = MediaType.parseMediaTypes(request.getHeader(key));
-						List<MediaType> valueMediaTypes = MediaType.parseMediaTypes(value);
-						boolean found = false;
-						for (Iterator<MediaType> valIter = valueMediaTypes.iterator(); valIter.hasNext() && !found;) {
-							MediaType valueMediaType = valIter.next();
-							for (Iterator<MediaType> reqIter = requestMediaTypes.iterator();
-									reqIter.hasNext() && !found;) {
-								MediaType requestMediaType = reqIter.next();
-								if (valueMediaType.includes(requestMediaType)) {
-									found = true;
-								}
-							}
+  /**
+   * Check whether the given request matches the specified header conditions.
+   *
+   * @param headers the header conditions, following
+   *                {@link org.springframework.web.bind.annotation.RequestMapping#headers() RequestMapping.headers()}
+   * @param request the current HTTP request to check
+   */
+  public static boolean checkHeaders(String[] headers, HttpServletRequest request) {
+    if (!ObjectUtils.isEmpty(headers)) {
+      for (String header : headers) {
+        int separator = header.indexOf('=');
+        if (separator == -1) {
+          if (header.startsWith("!")) {
+            if (request.getHeader(header.substring(1)) != null) {
+              return false;
+            }
+          } else if (request.getHeader(header) == null) {
+            return false;
+          }
+        } else {
+          boolean negated = separator > 0 && header.charAt(separator - 1) == '!';
+          String key = !negated ? header.substring(0, separator) : header.substring(0, separator - 1);
+          String value = header.substring(separator + 1);
+          if (isMediaTypeHeader(key)) {
+            List<MediaType> requestMediaTypes = MediaType.parseMediaTypes(request.getHeader(key));
+            List<MediaType> valueMediaTypes = MediaType.parseMediaTypes(value);
+            boolean found = false;
+            for (Iterator<MediaType> valIter = valueMediaTypes.iterator(); valIter.hasNext() && !found;) {
+              MediaType valueMediaType = valIter.next();
+              for (Iterator<MediaType> reqIter = requestMediaTypes.iterator();
+                   reqIter.hasNext() && !found;) {
+                MediaType requestMediaType = reqIter.next();
+                if (valueMediaType.includes(requestMediaType)) {
+                  found = true;
+                }
+              }
 
-						}
-						if (!found) {
-							return negated;
-						}
-					}
-					else if (!value.equals(request.getHeader(key))) {
-						return negated;
-					}
-				}
-			}
-		}
-		return true;
-	}
+            }
+            if (!found) {
+              return negated;
+            }
+          } else if (!value.equals(request.getHeader(key))) {
+            return negated;
+          }
+        }
+      }
+    }
+    return true;
+  }
 
-	private static boolean isMediaTypeHeader(String headerName) {
-		return "Accept".equalsIgnoreCase(headerName) || "Content-Type".equalsIgnoreCase(headerName);
-	}
+  private static boolean isMediaTypeHeader(String headerName) {
+    return "Accept".equalsIgnoreCase(headerName) || "Content-Type".equalsIgnoreCase(headerName);
+  }
 
 }

spring-data-document-core/template.mf

@@ -24,9 +24,15 @@ Import-Template:
  org.springframework.core.*;version="[3.0.0, 4.0.0)",
  org.springframework.dao.*;version="[3.0.0, 4.0.0)",
  org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.0, 4.0.0)",
+ org.springframework.expression.common.*;version="[3.0.0, 4.0.0)",
+ org.springframework.expression.spel.standard.*;version="[3.0.0, 4.0.0)",
+ org.springframework.expression.spel.support.*;version="[3.0.0, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.w3c.dom.*;version="0"
+ org.w3c.dom.*;version="0",
+ javax.persistence.*;version="[1.0, 2.0)"
 
 

spring-data-document-parent/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-document-parent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

spring-data-document-parent/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Tue Jun 29 21:59:00 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-document-parent/pom.xml

@@ -1,383 +1,415 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-document-parent</artifactId>
-	<name>Spring Data Document Parent</name>
-	<url>http://www.springsource.org/spring-data/data-document</url>
-	<version>1.0.0.M1</version>
-	<packaging>pom</packaging>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- versions for commonly-used dependencies -->
-		<junit.version>4.8.1</junit.version>
-		<log4j.version>1.2.15</log4j.version>
-		<org.mockito.version>1.8.4</org.mockito.version>
-		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
-	</properties>
-	<profiles>
-		<profile>
-			<id>strict</id>
-			<properties>
-				<maven.test.failure.ignore>false</maven.test.failure.ignore>
-			</properties>
-		</profile>
-		<profile>
-			<id>fast</id>
-			<properties>
-				<maven.test.skip>true</maven.test.skip>
-				<maven.javadoc.skip>true</maven.javadoc.skip>
-			</properties>
-		</profile>
-		<profile>
-			<id>staging</id>
-			<distributionManagement>
-				<site>
-					<id>spring-site-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-document/docs</url>
-				</site>
-				<repository>
-					<id>spring-milestone-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-document/milestone</url>
-				</repository>
-				<snapshotRepository>
-					<id>spring-snapshot-staging</id>
-					<url>file:///${java.io.tmpdir}/spring-data/data-document/snapshot</url>
-				</snapshotRepository>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>bootstrap</id>
-			<!-- TODO: move the repositories in here before release -->
-		</profile>
-	</profiles>
-	<distributionManagement>
-		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/download/community
-		</downloadUrl>
-		<site>
-			<id>static.springframework.org</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-document/docs/${project.version}
-			</url>
-		</site>
-		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-	<dependencyManagement>
-		<!--
-			inheritable <dependency> declarations for child poms. children still
-			must explicitly declare the groupId/artifactId of these dependencies
-			in order for them to show up on the classpath, but metadata like
-			<version> and <scope> are inherited, which cuts down on verbosity.
-			see
-			http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-dep-manage.html
-		-->
-		<dependencies>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-document-parent</artifactId>
+  <name>Spring Data Document Parent</name>
+  <url>http://www.springsource.org/spring-data/data-document</url>
+  <version>1.0.0.M2</version>
+  <packaging>pom</packaging>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- versions for commonly-used dependencies -->
+    <junit.version>4.8.1</junit.version>
+    <log4j.version>1.2.15</log4j.version>
+    <org.mockito.version>1.8.4</org.mockito.version>
+    <org.slf4j.version>1.5.10</org.slf4j.version>
+    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
+    <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+    <data.commons.version>1.0.0.RC1</data.commons.version>
+    <aspectj.version>1.6.11.RELEASE</aspectj.version>
+  </properties>
+  <profiles>
+    <profile>
+      <id>strict</id>
+      <properties>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+      </properties>
+    </profile>
+    <profile>
+      <id>fast</id>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+      </properties>
+    </profile>
+    <profile>
+      <id>staging</id>
+      <distributionManagement>
+        <site>
+          <id>spring-site-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/data-document/docs</url>
+        </site>
+        <repository>
+          <id>spring-milestone-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/data-document/milestone</url>
+        </repository>
+        <snapshotRepository>
+          <id>spring-snapshot-staging</id>
+          <url>file:///${java.io.tmpdir}/spring-data/data-document/snapshot</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+    <profile>
+      <id>bootstrap</id>
+      <!-- TODO: move the repositories in here before release -->
+    </profile>
+  </profiles>
+  <distributionManagement>
+    <!-- see 'staging' profile for dry-run deployment settings -->
+    <downloadUrl>http://www.springsource.com/download/community
+    </downloadUrl>
+    <site>
+      <id>static.springframework.org</id>
+      <url>
+        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-document/docs/${project.version}
+      </url>
+    </site>
+    <repository>
+      <id>spring-milestone</id>
+      <name>Spring Milestone Repository</name>
+      <url>s3://maven.springframework.org/milestone</url>
+    </repository>
+    <snapshotRepository>
+      <id>spring-snapshot</id>
+      <name>Spring Snapshot Repository</name>
+      <url>s3://maven.springframework.org/snapshot</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <dependencyManagement>
+    <!--
+        inheritable <dependency> declarations for child poms. children still
+        must explicitly declare the groupId/artifactId of these dependencies
+        in order for them to show up on the classpath, but metadata like
+        <version> and <scope> are inherited, which cuts down on verbosity.
+        see
+        http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-dep-manage.html
+      -->
+    <dependencies>
 
-			<!--  Spring -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-aop</artifactId>
-				<version>${org.springframework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>${org.springframework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${org.springframework.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-tx</artifactId>
-				<version>${org.springframework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-test</artifactId>
-				<version>${org.springframework.version}</version>
-				<scope>test</scope>
-			</dependency>
+      <!--  Spring -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${org.springframework.version}</version>
+        <scope>test</scope>
+      </dependency>
 
-			<!--  Spring Data -->
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-document-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-couchdb</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-mongodb</artifactId>
-				<version>${project.version}</version>
-			</dependency>
+      <!--  Spring Data -->
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-commons-core</artifactId>
+        <version>${data.commons.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-commons-aspects</artifactId>
+        <version>${data.commons.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-document-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-couchdb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-mongodb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
-			<!-- Logging -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${org.slf4j.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>jcl-over-slf4j</artifactId>
-				<version>${org.slf4j.version}</version>
-				<scope>runtime</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>${org.slf4j.version}</version>
-				<scope>runtime</scope>
-			</dependency>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>${log4j.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.mail</groupId>
-						<artifactId>mail</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.jms</groupId>
-						<artifactId>jms</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.sun.jdmk</groupId>
-						<artifactId>jmxtools</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.sun.jmx</groupId>
-						<artifactId>jmxri</artifactId>
-					</exclusion>
-				</exclusions>
-				<scope>runtime</scope>
-			</dependency>
+      <!-- Logging -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${org.slf4j.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.jms</groupId>
+            <artifactId>jms</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+          </exclusion>
+        </exclusions>
+        <scope>runtime</scope>
+      </dependency>
 
-			<dependency>
-				<groupId>javax.annotation</groupId>
-				<artifactId>jsr250-api</artifactId>
-				<version>1.0</version>
-				<optional>true</optional>
-			</dependency>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>jsr250-api</artifactId>
+        <version>1.0</version>
+        <optional>true</optional>
+      </dependency>
 
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-all</artifactId>
-				<version>${org.mockito.version}</version>
-				<scope>test</scope>
-			</dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>${org.mockito.version}</version>
+        <scope>test</scope>
+      </dependency>
 
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-				<scope>test</scope>
-			</dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
 
-		</dependencies>
-	</dependencyManagement>
-	<dependencies>
-		<!--
-			dependency definitions to be inherited by child poms. any
-			<dependency> declarations here will automatically show up on child
-			project classpaths. only items that are truly common across all
-			projects (modules and samples) should go here. otherwise, consider
-			<dependencyManagement> above
-		-->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!--
+        dependency definitions to be inherited by child poms. any
+        <dependency> declarations here will automatically show up on child
+        project classpaths. only items that are truly common across all
+        projects (modules and samples) should go here. otherwise, consider
+        <dependencyManagement> above
+      -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-	<build>
-		<extensions>
-			<extension>
-				<!--
-					available only in the springframework maven repository. see
-					<repositories> section below
-				-->
-				<groupId>org.springframework.build.aws</groupId>
-				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
-			</extension>
-		</extensions>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>${project.basedir}/src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>${project.basedir}/src/test/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-			<testResource>
-				<directory>${project.basedir}/src/test/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-					<compilerArgument>-Xlint:all</compilerArgument>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<useFile>false</useFile>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-					</excludes>
-					<junitArtifactName>junit:junit</junitArtifactName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<!--
-						configures the springsource bundlor plugin, which generates
-						OSGI-compatible MANIFEST.MF files during the 'compile' phase of
-						the maven build. this plugin is declared within the
-						pluginManagement section because not every module that inherits
-						from this pom needs bundlor's services, e.g.:
-						spring-integration-samples and all its children. for this reason,
-						all modules that wish to use bundlor must declare it explicitly.
-						it is not necessary to specify the <version> or <configuration>
-						sections, but groupId and artifactId are required. see
-						http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-						for more info
-					-->
-					<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>1.0.0.RELEASE</version>
-					<configuration>
-						<failOnWarnings>true</failOnWarnings>
-					</configuration>
-					<executions>
-						<execution>
-							<id>bundlor</id>
-							<goals>
-								<goal>bundlor</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<pluginRepositories>
-		<pluginRepository>
-			<!-- necessary for bundlor and utils -->
-			<id>repository.plugin.springsource.release</id>
-			<name>SpringSource Maven Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
-		</pluginRepository>
-	</pluginRepositories>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
-	<reporting>
-		<plugins>
-			<plugin>
-				<!--
-					significantly speeds up the 'Dependencies' report during site
-					creation see
-					http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
-				-->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.1</version>
-				<configuration>
-					<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
+  <build>
+    <extensions>
+      <extension>
+        <!--
+              available only in the springframework maven repository. see
+              <repositories> section below
+            -->
+        <groupId>org.springframework.build.aws</groupId>
+        <artifactId>org.springframework.build.aws.maven</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </extension>
+    </extensions>
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <directory>${project.basedir}/src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${project.basedir}/src/test/java</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </testResource>
+      <testResource>
+        <directory>${project.basedir}/src/test/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <compilerArgument>-Xlint:all</compilerArgument>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>false</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+           <useDefaultManifestFile>true</useDefaultManifestFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <useFile>false</useFile>
+          <includes>
+            <include>**/*Tests.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/Abstract*.java</exclude>
+          </excludes>
+          <junitArtifactName>junit:junit</junitArtifactName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!--
+                 configures the springsource bundlor plugin, which generates
+                 OSGI-compatible MANIFEST.MF files during the 'compile' phase of
+                 the maven build. this plugin is declared within the
+                 pluginManagement section because not every module that inherits
+                 from this pom needs bundlor's services, e.g.:
+                 spring-integration-samples and all its children. for this reason,
+                 all modules that wish to use bundlor must declare it explicitly.
+                 it is not necessary to specify the <version> or <configuration>
+                 sections, but groupId and artifactId are required. see
+                 http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
+                 for more info
+               -->
+          <groupId>com.springsource.bundlor</groupId>
+          <artifactId>com.springsource.bundlor.maven</artifactId>
+          <version>1.0.0.RELEASE</version>
+          <configuration>
+            <failOnWarnings>true</failOnWarnings>
+          </configuration>
+          <executions>
+            <execution>
+              <id>bundlor</id>
+              <goals>
+                <goal>bundlor</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <pluginRepositories>
+    <pluginRepository>
+      <!-- necessary for bundlor and utils -->
+      <id>repository.plugin.springsource.release</id>
+      <name>SpringSource Maven Repository</name>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>repository.springframework.maven.release</id>
+      <name>Spring Framework Maven Release Repository</name>
+      <url>http://maven.springframework.org/release</url>
+    </repository>
+    <repository>
+      <id>repository.springframework.maven.milestone</id>
+      <name>Spring Framework Maven Milestone Repository</name>
+      <url>http://maven.springframework.org/milestone</url>
+    </repository>
+    <repository>
+      <id>repository.springframework.maven.snapshot</id>
+      <name>Spring Framework Maven Snapshot Repository</name>
+      <url>http://maven.springframework.org/snapshot</url>
+    </repository>
+  </repositories>
+  <reporting>
+    <plugins>
+      <plugin>
+        <!--
+              significantly speeds up the 'Dependencies' report during site
+              creation see
+              http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
+            -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

spring-data-mongodb-cross-store/pom.xml

@@ -0,0 +1,222 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-document-parent</artifactId>
+    <version>1.0.0.M2</version>
+    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-mongodb-cross-store</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring Data MongoDB Cross-store Persistence Support</name>
+  <dependencies>
+
+    <!--  Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aspects</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!--  Spring Data -->
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons-core</artifactId>
+    </dependency>
+    <!-- <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons-aspects</artifactId>
+    </dependency> -->
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-mongodb</artifactId>
+    </dependency>
+
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>${aspectj.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.2</version>
+    </dependency>
+
+    <!-- JPA -->
+    <dependency>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <version>1.0.0.Final</version>
+    </dependency>
+
+  <!-- For Tests -->
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-entitymanager</artifactId>
+        <version>3.5.5-Final</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>1.8.0.10</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.0.0.GA</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-validator</artifactId>
+        <version>4.0.2.GA</version>
+        <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jboss-repository</id>
+      <name>JBoss Public Repository</name>
+      <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
+    </repository>
+    <repository>
+      <id>spring-maven-snapshot</id>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <name>Springframework Maven SNAPSHOT Repository</name>
+      <url>http://maven.springframework.org/snapshot</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>spring-maven-milestones</id>
+      <name>Springframework Maven Milestone Repository</name>
+      <url>http://maven.springframework.org/milestone</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>aspectj-maven-plugin</artifactId>
+        <version>1.2</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjtools</artifactId>
+            <version>${aspectj.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outxml>true</outxml>
+          <aspectLibraries>
+            <aspectLibrary>
+              <groupId>org.springframework</groupId>
+              <artifactId>spring-aspects</artifactId>
+            </aspectLibrary>
+            <!-- <aspectLibrary>
+              <groupId>org.springframework.data</groupId>
+              <artifactId>spring-data-commons-aspects</artifactId>
+            </aspectLibrary> -->
+          </aspectLibraries>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java

@@ -0,0 +1,7 @@
+package org.springframework.data.persistence.document;
+
+import org.springframework.data.persistence.ChangeSetBacked;
+
+public interface DocumentBacked extends ChangeSetBacked {
+
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java

@@ -0,0 +1,63 @@
+package org.springframework.data.persistence.document;
+
+//public class DocumentBackedTransactionSynchronization {
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.persistence.ChangeSetBacked;
+import org.springframework.data.persistence.ChangeSetPersister;
+import org.springframework.transaction.support.TransactionSynchronization;
+
+public class DocumentBackedTransactionSynchronization implements TransactionSynchronization {
+
+	protected final Log log = LogFactory.getLog(getClass());
+
+	private ChangeSetPersister<Object> changeSetPersister;
+
+	private ChangeSetBacked entity;
+
+	private int changeSetTxStatus = -1;
+
+	public DocumentBackedTransactionSynchronization(ChangeSetPersister<Object> changeSetPersister, ChangeSetBacked entity) {
+		this.changeSetPersister = changeSetPersister;
+		this.entity = entity;
+	}
+	
+	public void afterCommit() {
+		log.debug("After Commit called for " + entity);
+		changeSetPersister.persistState(entity, entity.getChangeSet());
+		changeSetTxStatus = 0;
+	}
+
+	public void afterCompletion(int status) {
+		log.debug("After Completion called with status = " + status);
+		if (changeSetTxStatus == 0) {
+			if (status == STATUS_COMMITTED) {
+				// this is good
+				log.debug("ChangedSetBackedTransactionSynchronization completed successfully for " + this.entity);
+			}
+			else {
+				// this could be bad - TODO: compensate
+				log.error("ChangedSetBackedTransactionSynchronization failed for " + this.entity);
+			}
+		}
+	}
+
+	public void beforeCommit(boolean readOnly) {
+	}
+
+	public void beforeCompletion() {
+	}
+
+	public void flush() {
+	}
+
+	public void resume() {
+		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
+	}
+
+	public void suspend() {
+		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
+	}
+	
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoChangeSetPersister.java

@@ -0,0 +1,169 @@
+package org.springframework.data.persistence.document.mongo;
+
+import javax.persistence.EntityManagerFactory;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.document.mongodb.CollectionCallback;
+import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.persistence.ChangeSet;
+import org.springframework.data.persistence.ChangeSetBacked;
+import org.springframework.data.persistence.ChangeSetPersister;
+import org.springframework.util.ClassUtils;
+
+public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
+
+  private static final String ENTITY_CLASS = "_entity_class";
+
+  private static final String ENTITY_ID = "_entity_id";
+
+  private static final String ENTITY_FIELD_NAME = "_entity_field_name";
+
+  private static final String ENTITY_FIELD_CLASS = "_entity_field_class";
+
+  protected final Log log = LogFactory.getLog(getClass());
+
+  private MongoTemplate mongoTemplate;
+
+  private EntityManagerFactory entityManagerFactory;
+
+  public void setMongoTemplate(MongoTemplate mongoTemplate) {
+    this.mongoTemplate = mongoTemplate;
+  }
+
+  public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) {
+    this.entityManagerFactory = entityManagerFactory;
+  }
+
+
+  public void getPersistentState(Class<? extends ChangeSetBacked> entityClass,
+      Object id, final ChangeSet changeSet) 
+      throws DataAccessException, NotFoundException {
+    
+    if (id == null) {
+      log.debug("Unable to load MongoDB data for null id");
+      return;
+    }
+    
+    String collName = getCollectionNameForEntity(entityClass);
+
+    final DBObject dbk = new BasicDBObject();
+    dbk.put(ENTITY_ID, id);
+    dbk.put(ENTITY_CLASS, entityClass.getName());
+    if (log.isDebugEnabled()) {
+      log.debug("Loading MongoDB data for " + dbk);
+    }
+    mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+      public Object doInCollection(DBCollection collection)
+          throws MongoException, DataAccessException {
+        for (DBObject dbo : collection.find(dbk)) {
+          String key = (String) dbo.get(ENTITY_FIELD_NAME);
+          if (log.isDebugEnabled()) {
+            log.debug("Processing key: " + key);
+          }
+          if (!changeSet.getValues().containsKey(key)) {
+            String className = (String) dbo.get(ENTITY_FIELD_CLASS);
+            if (className == null) {
+              throw new DataIntegrityViolationException(
+                  "Unble to convert property " + key
+                      + ": Invalid metadata, " + ENTITY_FIELD_CLASS + " not available");
+            }
+            Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
+            Object value = mongoTemplate.getConverter().read(clazz, dbo);
+            if (log.isDebugEnabled()) {
+              log.debug("Adding to ChangeSet: " + key);
+            }
+            changeSet.set(key, value);
+          }
+        }
+        return null;
+      }
+    });
+  }
+
+  public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
+    log.debug("getPersistentId called on " + entity);
+    if (entityManagerFactory == null) {
+      throw new DataAccessResourceFailureException("EntityManagerFactory cannot be null");
+    }
+    Object o = entityManagerFactory.getPersistenceUnitUtil().getIdentifier(entity);
+    return o;
+  }
+
+  public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
+    if (cs == null) {
+      log.debug("Flush: changeset was null, nothing to flush.");
+      return 0L;
+    }
+        
+    if (log.isDebugEnabled()) {
+      log.debug("Flush: changeset: " + cs.getValues());
+    }
+
+    String collName = getCollectionNameForEntity(entity.getClass());
+    DBCollection dbc = mongoTemplate.getCollection(collName);
+    if (dbc == null) {
+      dbc = mongoTemplate.createCollection(collName);
+    }
+    for (String key : cs.getValues().keySet()) {
+      if (key != null && !key.startsWith("_") && !key.equals(ChangeSetPersister.ID_KEY)) {
+        Object value = cs.getValues().get(key);
+        final DBObject dbQuery = new BasicDBObject();
+        dbQuery.put(ENTITY_ID, getPersistentId(entity, cs));
+        dbQuery.put(ENTITY_CLASS, entity.getClass().getName());
+        dbQuery.put(ENTITY_FIELD_NAME, key);
+        DBObject dbId = mongoTemplate.execute(collName,
+            new CollectionCallback<DBObject>() {
+              public DBObject doInCollection(DBCollection collection)
+                  throws MongoException, DataAccessException {
+                return collection.findOne(dbQuery);
+              }
+            });
+        if (value == null) {
+          if (log.isDebugEnabled()) {
+            log.debug("Flush: removing: " + dbQuery);
+          }
+          mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+            public Object doInCollection(DBCollection collection)
+                throws MongoException, DataAccessException {
+              collection.remove(dbQuery);
+              return null;
+            }
+          });
+        }
+        else {
+          final DBObject dbDoc = new BasicDBObject();
+          dbDoc.putAll(dbQuery);
+          if (log.isDebugEnabled()) {
+            log.debug("Flush: saving: " + dbQuery);
+          }
+          mongoTemplate.getConverter().write(value, dbDoc);
+          dbDoc.put(ENTITY_FIELD_CLASS, value.getClass().getName());
+          if (dbId != null) {
+            dbDoc.put("_id", dbId.get("_id"));
+          }
+          mongoTemplate.execute(collName, new CollectionCallback<Object>() {
+            public Object doInCollection(DBCollection collection)
+                throws MongoException, DataAccessException {
+              collection.save(dbDoc);
+              return null;
+            }
+          });
+        }
+      }
+    }
+    return 0L;
+  }
+
+  private String getCollectionNameForEntity(Class<? extends ChangeSetBacked> entityClass) {
+    return ClassUtils.getQualifiedName(entityClass);
+  }
+
+}

spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoDocumentBacking.aj

@@ -0,0 +1,259 @@
+package org.springframework.data.persistence.document.mongo;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Transient;
+import javax.persistence.Entity;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.reflect.FieldSignature;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.document.annotation.RelatedDocument;
+
+import org.springframework.data.persistence.document.DocumentBacked;
+import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
+import org.springframework.data.persistence.ChangeSet;
+import org.springframework.data.persistence.ChangeSetBacked;
+import org.springframework.data.persistence.ChangeSetPersister;
+import org.springframework.data.persistence.ChangeSetPersister.NotFoundException;
+import org.springframework.data.persistence.HashMapChangeSet;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * Aspect to turn an object annotated with @Document into a persistent document
+ * using Mongo.
+ * 
+ * @author Thomas Risberg
+ */
+public aspect MongoDocumentBacking {
+
+  private static final Log LOGGER = LogFactory
+      .getLog(MongoDocumentBacking.class);
+
+  // Aspect shared config
+  private ChangeSetPersister<Object> changeSetPersister;
+
+  public void setChangeSetPersister(
+      ChangeSetPersister<Object> changeSetPersister) {
+    this.changeSetPersister = changeSetPersister;
+  }
+
+  // ITD to introduce N state to Annotated objects
+  declare parents : (@Entity *) implements DocumentBacked;
+
+  // The annotated fields that will be persisted in MongoDB rather than with JPA
+  declare @field: @RelatedDocument * (@Entity+ *).*:@Transient;
+
+  // -------------------------------------------------------------------------
+  // Advise user-defined constructors of ChangeSetBacked objects to create a new
+  // backing ChangeSet
+  // -------------------------------------------------------------------------
+  pointcut arbitraryUserConstructorOfChangeSetBackedObject(DocumentBacked entity) : 
+		execution((DocumentBacked+).new(..)) &&
+		!execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity);
+
+  pointcut finderConstructorOfChangeSetBackedObject(DocumentBacked entity,
+      ChangeSet cs) : 
+		execution((DocumentBacked+).new(ChangeSet)) &&
+		this(entity) && 
+		args(cs);
+
+  protected pointcut entityFieldGet(DocumentBacked entity) :
+        get(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        !get(* DocumentBacked.*);
+
+  protected pointcut entityFieldSet(DocumentBacked entity, Object newVal) :
+        set(@RelatedDocument * DocumentBacked+.*) &&
+        this(entity) &&
+        args(newVal) &&
+        !set(* DocumentBacked.*);
+
+  // intercept EntityManager.merge calls
+  public pointcut entityManagerMerge(EntityManager em, Object entity) : 
+    call(* EntityManager.merge(Object)) &&
+    target(em) &&
+    args(entity);
+  
+  // intercept EntityManager.remove calls
+//  public pointcut entityManagerRemove(EntityManager em, Object entity) : 
+//    call(* EntityManager.remove(Object)) &&
+//    target(em) &&
+//    args(entity);
+
+  // move changeSet from detached entity to the newly merged persistent object
+  Object around(EntityManager em, Object entity) : entityManagerMerge(em, entity) {
+    Object mergedEntity = proceed(em, entity);
+    if (entity instanceof DocumentBacked && mergedEntity instanceof DocumentBacked) {
+      ((DocumentBacked)mergedEntity).changeSet = ((DocumentBacked)entity).getChangeSet();
+    }
+    return mergedEntity;
+  }
+
+  // clear changeSet from removed entity
+//  Object around(EntityManager em, Object entity) : entityManagerRemove(em, entity) {
+//    if (entity instanceof DocumentBacked) {
+//      removeChangeSetValues((DocumentBacked)entity);
+//    }
+//    return proceed(em, entity);
+//  }
+
+  private static void removeChangeSetValues(DocumentBacked entity) {
+    LOGGER.debug("Removing all change-set values for " + entity);	
+	ChangeSet nulledCs = new HashMapChangeSet();
+	DocumentBacked documentEntity = (DocumentBacked) entity;
+	@SuppressWarnings("unchecked")
+	ChangeSetPersister<Object> changeSetPersister = (ChangeSetPersister<Object>)documentEntity.itdChangeSetPersister;
+	try {
+        changeSetPersister.getPersistentState(
+            documentEntity.getClass(),
+            documentEntity.get_persistent_id(), 
+            documentEntity.getChangeSet());
+	} 
+	catch (DataAccessException e) {} 
+	catch (NotFoundException e) {}
+	for (String key :entity.getChangeSet().getValues().keySet()) {
+        nulledCs.set(key, null);
+	}
+	entity.setChangeSet(nulledCs);
+  }
+
+  before(DocumentBacked entity) : arbitraryUserConstructorOfChangeSetBackedObject(entity) {
+    LOGGER
+        .debug("User-defined constructor called on DocumentBacked object of class "
+            + entity.getClass());
+    // Populate all ITD fields
+    entity.setChangeSet(new HashMapChangeSet());
+    entity.itdChangeSetPersister = changeSetPersister;
+    entity.itdTransactionSynchronization = 
+        new DocumentBackedTransactionSynchronization(changeSetPersister, entity);
+    //registerTransactionSynchronization(entity);
+  }
+
+  private static void registerTransactionSynchronization(DocumentBacked entity) {
+    if (TransactionSynchronizationManager.isSynchronizationActive()) {
+      if (!TransactionSynchronizationManager.getSynchronizations().contains(entity.itdTransactionSynchronization)) {
+        if (LOGGER.isDebugEnabled()) {
+          LOGGER.debug("Adding transaction synchronization for " + entity);
+        }
+        TransactionSynchronizationManager.registerSynchronization(entity.itdTransactionSynchronization);
+      }
+      else {
+        if (LOGGER.isDebugEnabled()) {
+          LOGGER.debug("Transaction synchronization already active for " + entity);
+        }
+      }
+    }
+    else {
+      if (LOGGER.isDebugEnabled()) {
+        LOGGER.debug("Transaction synchronization is not active for " + entity);
+      }
+    }
+  }
+
+  // -------------------------------------------------------------------------
+  // ChangeSet-related mixins
+  // -------------------------------------------------------------------------
+  // Introduced field
+  @Transient private ChangeSet DocumentBacked.changeSet;
+
+  @Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
+
+  @Transient private DocumentBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
+
+  public void DocumentBacked.setChangeSet(ChangeSet cs) {
+    this.changeSet = cs;
+  }
+
+  public ChangeSet DocumentBacked.getChangeSet() {
+    return changeSet;
+  }
+
+  // Flush the entity state to the persistent store
+  public void DocumentBacked.flush() {
+    Object id = itdChangeSetPersister.getPersistentId(this, this.changeSet);
+    itdChangeSetPersister.persistState(this, this.changeSet);
+  }
+
+  public Object DocumentBacked.get_persistent_id() {
+    return itdChangeSetPersister.getPersistentId(this, this.changeSet);
+  }
+
+  // lifecycle methods
+  @javax.persistence.PostPersist public void DocumentBacked.itdPostPersist() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PrePersist: " + this.getClass().getName());
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PreUpdate public void DocumentBacked.itdPreUpdate() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PreUpdate: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PostUpdate public void DocumentBacked.itdPostUpdate() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostUpdate: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  @javax.persistence.PostRemove public void DocumentBacked.itdPostRemove() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostRemove: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+    removeChangeSetValues(this);
+  }
+  @javax.persistence.PostLoad public void DocumentBacked.itdPostLoad() {
+    if (LOGGER.isDebugEnabled()) {
+      LOGGER.debug("JPA lifecycle event PostLoad: " + this.getClass().getName() + " :: " + this);
+    }
+    registerTransactionSynchronization(this);
+  }
+  
+  /**
+   * delegates field reads to the state accessors instance
+   */
+  Object around(DocumentBacked entity): entityFieldGet(entity) {
+    Field f = field(thisJoinPoint);
+    String propName = f.getName();
+    LOGGER.trace("GET " + f + " -> ChangeSet value property [" + propName
+        + "] using: " + entity.getChangeSet());
+    if (entity.getChangeSet().getValues().get(propName) == null) {
+      try {
+        this.changeSetPersister.getPersistentState(entity.getClass(),
+            entity.get_persistent_id(), entity.getChangeSet());
+      } catch (NotFoundException e) {
+      }
+    }
+    Object fValue = entity.getChangeSet().getValues().get(propName);
+    if (fValue != null) {
+      return fValue;
+    }
+    return proceed(entity);
+  }
+
+  /**
+   * delegates field writes to the state accessors instance
+   */
+  Object around(DocumentBacked entity, Object newVal) : entityFieldSet(entity, newVal) {
+    Field f = field(thisJoinPoint);
+    String propName = f.getName();
+    LOGGER.trace("SET " + f + " -> ChangeSet number value property [" + propName
+        + "] with value=[" + newVal + "]");
+    entity.getChangeSet().set(propName, newVal);
+    return proceed(entity, newVal);
+  }
+
+  Field field(JoinPoint joinPoint) {
+    FieldSignature fieldSignature = (FieldSignature) joinPoint.getSignature();
+    return fieldSignature.getField();
+  }
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/CrossStoreMongoTests.java

@@ -0,0 +1,154 @@
+package org.springframework.data.document.persistence;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.document.persistence.test.Address;
+import org.springframework.data.document.persistence.test.Person;
+import org.springframework.data.document.persistence.test.Resume;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
+public class CrossStoreMongoTests {
+
+  @Autowired
+  private MongoTemplate mongoTemplate;
+
+  private EntityManager entityManager;
+
+  @Autowired
+  private PlatformTransactionManager transactionManager;
+  
+  @PersistenceContext
+  public void setEntityManager(EntityManager entityManager) {
+    this.entityManager = entityManager;
+  }
+
+  private void clearData(String collectionName) {
+    DBCollection col = this.mongoTemplate.getCollection(collectionName);
+    if (col != null) {
+      this.mongoTemplate.dropCollection(collectionName);
+    }
+  }
+
+  @Test
+  @Transactional
+  @Rollback(false)
+  public void testCreateJpaToMongoEntityRelationship() {
+    clearData(Person.class.getName());
+    Person p = new Person("Thomas", 20);
+    Address a = new Address(12, "MAin St.", "Boston", "MA", "02101");
+    p.setAddress(a);
+    Resume r = new Resume();
+    r.addEducation("Skanstulls High School, 1975");
+    r.addEducation("Univ. of Stockholm, 1980");
+    r.addJob("DiMark, DBA, 1990-2000");
+    r.addJob("VMware, Developer, 2007-");
+    p.setResume(r);
+    p.setId(1L);
+    entityManager.persist(p);
+  }
+
+  @Test
+  @Transactional
+  @Rollback(false)
+  public void testReadJpaToMongoEntityRelationship() {
+    Person found = entityManager.find(Person.class, 1L);
+    Assert.assertNotNull(found);
+    Assert.assertEquals(Long.valueOf(1), found.getId());
+    Assert.assertNotNull(found);
+    Assert.assertEquals(Long.valueOf(1), found.getId());
+    Assert.assertNotNull(found.getResume());
+    Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
+        + "VMware, Developer, 2007-", found.getResume().getJobs());
+    found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006");
+    found.setAge(44);
+  }
+
+  @Test
+  @Transactional
+  @Rollback(false)
+  public void testUpdatedJpaToMongoEntityRelationship() {
+    Person found = entityManager.find(Person.class, 1L);
+    Assert.assertNotNull(found);
+    Assert.assertEquals(Long.valueOf(1), found.getId());
+    Assert.assertNotNull(found);
+    Assert.assertEquals(Long.valueOf(1), found.getId());
+    Assert.assertNotNull(found.getResume());
+    Assert.assertEquals("DiMark, DBA, 1990-2000" + "; "
+        + "VMware, Developer, 2007-" + "; "
+        + "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs());
+  }
+  
+  @Test
+  public void testMergeJpaEntityWithMongoDocument() {
+    TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+    final Person detached = entityManager.find(Person.class, 1L);
+    detached.getResume().addJob("TargetRx, Developer, 2000-2005");
+    Person merged = txTemplate.execute(new TransactionCallback<Person>() {
+      public Person doInTransaction(TransactionStatus status) {
+        return entityManager.merge(detached);
+      }
+    });
+    Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+    Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+    final Person updated = entityManager.find(Person.class, 1L);
+    Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005"));
+  }
+
+  @Test
+  public void testRemoveJpaEntityWithMongoDocument() {
+    TransactionTemplate txTemplate = new TransactionTemplate(transactionManager);
+    txTemplate.execute(new TransactionCallback<Person>() {
+      public Person doInTransaction(TransactionStatus status) {
+        Person p2 = new Person("Thomas", 20);
+        Resume r2 = new Resume();
+        r2.addEducation("Skanstulls High School, 1975");
+        r2.addJob("DiMark, DBA, 1990-2000");
+        p2.setResume(r2);
+        p2.setId(2L);
+        entityManager.persist(p2);
+        Person p3 = new Person("Thomas", 20);
+        Resume r3 = new Resume();
+        r3.addEducation("Univ. of Stockholm, 1980");
+        r3.addJob("VMware, Developer, 2007-");
+        p3.setResume(r3);
+        p3.setId(3L);
+        entityManager.persist(p3);
+        return null;
+      }
+    });
+    txTemplate.execute(new TransactionCallback<Person>() {
+      public Person doInTransaction(TransactionStatus status) {
+        final Person found2 = entityManager.find(Person.class, 2L);
+        entityManager.remove(found2);
+        return null;
+      }
+    });
+    boolean weFound3 = false;
+    for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) {
+      Assert.assertTrue(!dbo.get("_entity_id").equals(2L));
+      if (dbo.get("_entity_id").equals(3L)) {
+        weFound3 = true;
+      }
+    }
+    Assert.assertTrue(weFound3);
+  }
+  
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Address.java

@@ -0,0 +1,54 @@
+package org.springframework.data.document.persistence.test;
+
+public class Address {
+	
+	private Integer streetNumber;
+	private String streetName;
+	private String city;
+	private String state;
+	private String zip;
+	
+	public Address(Integer streetNumber, String streetName, String city,
+			String state, String zip) {
+		super();
+		this.streetNumber = streetNumber;
+		this.streetName = streetName;
+		this.city = city;
+		this.state = state;
+		this.zip = zip;
+	}
+	
+	public Integer getStreetNumber() {
+		return streetNumber;
+	}
+	public void setStreetNumber(Integer streetNumber) {
+		this.streetNumber = streetNumber;
+	}
+	public String getStreetName() {
+		return streetName;
+	}
+	public void setStreetName(String streetName) {
+		this.streetName = streetName;
+	}
+	public String getCity() {
+		return city;
+	}
+	public void setCity(String city) {
+		this.city = city;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getZip() {
+		return zip;
+	}
+	public void setZip(String zip) {
+		this.zip = zip;
+	}
+	
+	
+	
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java

@@ -0,0 +1,87 @@
+package org.springframework.data.document.persistence.test;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.springframework.data.document.annotation.RelatedDocument;
+
+@Entity
+public class Person {
+
+  @Id
+  Long id;
+
+  private String name;
+
+  private int age;
+
+  private java.util.Date birthDate;
+
+  @RelatedDocument
+  private Address address;
+
+  @RelatedDocument
+  private Resume resume;
+
+  public Person() {
+  }
+
+  public Person(String name, int age) {
+    this.name = name;
+    this.age = age;
+    this.birthDate = new java.util.Date();
+  }
+
+  public void birthday() {
+    ++age;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public int getAge() {
+    return age;
+  }
+
+  public void setAge(int age) {
+    this.age = age;
+  }
+
+  public java.util.Date getBirthDate() {
+    return birthDate;
+  }
+
+  public void setBirthDate(java.util.Date birthDate) {
+    this.birthDate = birthDate;
+  }
+
+  public Resume getResume() {
+    return resume;
+  }
+
+  public void setResume(Resume resume) {
+    this.resume = resume;
+  }
+
+  public Address getAddress() {
+	return address;
+  }
+
+  public void setAddress(Address address) {
+	this.address = address;
+  }
+
+}

spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Resume.java

@@ -0,0 +1,48 @@
+package org.springframework.data.document.persistence.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.document.mongodb.mapping.Document;
+
+@Document
+public class Resume {
+
+  private static final Log LOGGER = LogFactory.getLog(Resume.class);
+
+  @Id
+  private ObjectId id;
+
+  private String education = "";
+
+  private String jobs = "";
+
+  public String getId() {
+	  return id.toString();
+  }
+  
+  public String getEducation() {
+    return education;
+  }
+
+  public void addEducation(String education) {
+    LOGGER.debug("Adding education " + education);
+    this.education = this.education + (this.education.length() > 0 ? "; " : "") + education;
+  }
+
+  public String getJobs() {
+    return jobs;
+  }
+
+  public void addJob(String job) {
+    LOGGER.debug("Adding job " + job);
+    this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job;
+  }
+
+  @Override
+  public String toString() {
+    return "Resume [education=" + education + ", jobs=" + jobs + "]";
+  }
+
+}

spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             version="2.0"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <class>org.springframework.data.document.persistence.test.Person</class>
+    <properties>
+      <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+      <!--value='create' to build a new database on each run; value='update' to modify an existing database; value='create-drop' means the same as 'create' but also drops tables when Hibernate closes; value='validate' makes no changes to the database-->
+      <property name="hibernate.hbm2ddl.auto" value="update"/>
+      <property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>
+    </properties>
+  </persistence-unit>
+</persistence>

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+  <context:spring-configured/>
+
+  <context:component-scan base-package="org.springframework.persistence.test">
+    <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
+  </context:component-scan>
+
+  <mongo:mapping-converter/>
+  
+  <!--  Mongo config -->
+  <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
+    <property name="host" value="localhost"/>
+    <property name="port" value="27017"/>
+  </bean>
+
+  <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
+    <constructor-arg name="mongo" ref="mongo"/>
+    <constructor-arg name="databaseName" value="test"/>
+    <constructor-arg name="defaultCollectionName" value="cross-store"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
+  </bean>
+
+  <bean class="org.springframework.data.document.mongodb.MongoExceptionTranslator"/>
+
+  <!--  Mongo aspect config -->
+  <bean class="org.springframework.data.persistence.document.mongo.MongoDocumentBacking"
+        factory-method="aspectOf">
+    <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
+  </bean>
+  <bean id="mongoChangeSetPersister" 
+      class="org.springframework.data.persistence.document.mongo.MongoChangeSetPersister">
+    <property name="mongoTemplate" ref="mongoTemplate"/>
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <jdbc:embedded-database id="dataSource" type="HSQL">
+  </jdbc:embedded-database>
+
+  <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+    <property name="entityManagerFactory" ref="entityManagerFactory"/>
+  </bean>
+
+  <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
+
+  <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
+    <property name="persistenceUnitName" value="test"/>
+    <property name="dataSource" ref="dataSource"/>
+    <property name="jpaVendorAdapter">
+      <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+        <property name="showSql" value="true"/>
+        <property name="generateDdl" value="true"/>
+        <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect"/>
+      </bean>
+    </property>
+  </bean>
+
+</beans>

spring-data-mongodb-cross-store/src/test/resources/log4j.properties

@@ -0,0 +1,12 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.springframework=INFO
+log4j.category.org.springframework.data=TRACE
+
+log4j.category.org.hibernate.SQL=DEBUG
+# for debugging datasource initialization
+# log4j.category.test.jdbc=DEBUG

spring-data-mongodb-log4j/README.md

@@ -0,0 +1,52 @@
+# MongoDB Log4J Appender
+
+This module sets up a Log4J appender that puts logging events in MongoDB. It is fully configurable
+and connects directly to the MongoDB server using the driver. It has no dependency on any Spring package.
+
+To use it, configure a host, port, (optionally) applicationId, and database property in your Log4J configuration:
+
+    log4j.appender.stdout=org.springframework.data.document.mongodb.log4j.MongoLog4jAppender
+    log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+    log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+    log4j.appender.stdout.host = localhost
+    log4j.appender.stdout.port = 27017
+    log4j.appender.stdout.database = logs
+    log4j.appender.stdout.collectionPattern = %c
+    log4j.appender.stdout.applicationId = my.application
+    log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
+
+It will even support properties in your MDC (so long as they're Strings or support .toString()).
+
+The collection name is configurable as well. If you don't specify anything, it will use the Category name.
+If you want to specify a collection name, you can give it a Log4J pattern layout format string which will have
+the following additional MDC variables in the context when the collection name is rendered:
+
+    "year" = Calendar.YEAR
+    "month" = Calendar.MONTH + 1
+    "day" = Calendar.DAY_OF_MONTH
+    "hour" = Calendar.HOUR_OF_DAY
+    "applicationId" = configured applicationId
+
+An example log entry might look like:
+
+    {
+      "_id" : ObjectId("4d89341a8ef397e06940d5cd"),
+      "applicationId" : "my.application",
+      "name" : "org.springframework.data.document.mongodb.log4j.AppenderTest",
+      "level" : "DEBUG",
+      "timestamp" : ISODate("2011-03-23T16:53:46.778Z"),
+      "properties" : {
+        "property" : "one"
+      },
+      "message" : "DEBUG message"
+    }
+
+To set WriteConcern levels for WARN or higher messages, set warnOrHigherWriteConcern to one of the following:
+
+* FSYNC_SAFE
+* NONE
+* NORMAL
+* REPLICAS_SAFE
+* SAFE
+
+[http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail](http://api.mongodb.org/java/2.5-pre-/com/mongodb/WriteConcern.html#field_detail)

spring-data-mongodb-log4j/pom.xml

@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-document-parent</artifactId>
+    <version>1.0.0.M2</version>
+    <relativePath>../spring-data-document-parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>spring-data-mongodb-log4j</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring Data MongoDB Log4J Appender</name>
+
+  <properties>
+    <mongo.version>2.3</mongo.version>
+  </properties>
+
+  <dependencies>
+
+    <!-- MongoDB -->
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+      <version>${mongo.version}</version>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.jms</groupId>
+          <artifactId>jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jdmk</groupId>
+          <artifactId>jmxtools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jmx</groupId>
+          <artifactId>jmxri</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.springsource.bundlor</groupId>
+        <artifactId>com.springsource.bundlor.maven</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

spring-data-mongodb-log4j/src/main/java/org/springframework/data/document/mongodb/log4j/MongoLog4jAppender.java

@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.mongodb.log4j;
+
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Map;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.WriteConcern;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Level;
+import org.apache.log4j.MDC;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.spi.LoggingEvent;
+
+/**
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ */
+public class MongoLog4jAppender extends AppenderSkeleton {
+
+  public static final String LEVEL = "level";
+  public static final String NAME = "name";
+  public static final String APP_ID = "applicationId";
+  public static final String TIMESTAMP = "timestamp";
+  public static final String PROPERTIES = "properties";
+  public static final String TRACEBACK = "traceback";
+  public static final String MESSAGE = "message";
+  public static final String YEAR = "year";
+  public static final String MONTH = "month";
+  public static final String DAY = "day";
+  public static final String HOUR = "hour";
+
+  protected String host = "localhost";
+  protected int port = 27017;
+  protected String database = "logs";
+  protected String collectionPattern = "%c";
+  protected PatternLayout collectionLayout = new PatternLayout(collectionPattern);
+  protected String applicationId = System.getProperty("APPLICATION_ID", null);
+  protected WriteConcern warnOrHigherWriteConcern = WriteConcern.SAFE;
+  protected WriteConcern infoOrLowerWriteConcern = WriteConcern.NORMAL;
+  protected Mongo mongo;
+  protected DB db;
+
+  public MongoLog4jAppender() {
+  }
+
+  public MongoLog4jAppender(boolean isActive) {
+    super(isActive);
+  }
+
+  public String getHost() {
+    return host;
+  }
+
+  public void setHost(String host) {
+    this.host = host;
+  }
+
+  public int getPort() {
+    return port;
+  }
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
+  public String getDatabase() {
+    return database;
+  }
+
+  public void setDatabase(String database) {
+    this.database = database;
+  }
+
+  public String getCollectionPattern() {
+    return collectionPattern;
+  }
+
+  public void setCollectionPattern(String collectionPattern) {
+    this.collectionPattern = collectionPattern;
+    this.collectionLayout = new PatternLayout(collectionPattern);
+  }
+
+  public String getApplicationId() {
+    return applicationId;
+  }
+
+  public void setApplicationId(String applicationId) {
+    this.applicationId = applicationId;
+  }
+
+  public void setWarnOrHigherWriteConcern(String wc) {
+    this.warnOrHigherWriteConcern = WriteConcern.valueOf(wc);
+  }
+
+  public String getWarnOrHigherWriteConcern() {
+    return warnOrHigherWriteConcern.toString();
+  }
+
+  public String getInfoOrLowerWriteConcern() {
+    return infoOrLowerWriteConcern.toString();
+  }
+
+  public void setInfoOrLowerWriteConcern(String wc) {
+    this.infoOrLowerWriteConcern = WriteConcern.valueOf(wc);
+  }
+
+  protected void connectToMongo() throws UnknownHostException {
+    this.mongo = new Mongo(host, port);
+    this.db = mongo.getDB(database);
+  }
+
+  @SuppressWarnings({"unchecked"})
+  @Override
+  protected void append(final LoggingEvent event) {
+    if (null == db) {
+      try {
+        connectToMongo();
+      } catch (UnknownHostException e) {
+        throw new RuntimeException(e.getMessage(), e);
+      }
+    }
+
+    BasicDBObject dbo = new BasicDBObject();
+    if (null != applicationId) {
+      dbo.put(APP_ID, applicationId);
+      MDC.put(APP_ID, applicationId);
+    }
+    dbo.put(NAME, event.getLogger().getName());
+    dbo.put(LEVEL, event.getLevel().toString());
+    Calendar tstamp = Calendar.getInstance();
+    tstamp.setTimeInMillis(event.getTimeStamp());
+    dbo.put(TIMESTAMP, tstamp.getTime());
+
+    // Copy properties into document
+    Map<Object, Object> props = event.getProperties();
+    if (null != props && props.size() > 0) {
+      BasicDBObject propsDbo = new BasicDBObject();
+      for (Map.Entry<Object, Object> entry : props.entrySet()) {
+        propsDbo.put(entry.getKey().toString(), entry.getValue().toString());
+      }
+      dbo.put(PROPERTIES, propsDbo);
+    }
+
+    // Copy traceback info (if there is any) into the document
+    String[] traceback = event.getThrowableStrRep();
+    if (null != traceback && traceback.length > 0) {
+      BasicDBList tbDbo = new BasicDBList();
+      tbDbo.addAll(Arrays.asList(traceback));
+      dbo.put(TRACEBACK, tbDbo);
+    }
+
+    // Put the rendered message into the document
+    dbo.put(MESSAGE, event.getRenderedMessage());
+
+    // Insert the document
+    Calendar now = Calendar.getInstance();
+    MDC.put(YEAR, now.get(Calendar.YEAR));
+    MDC.put(MONTH, String.format("%1$02d", now.get(Calendar.MONTH) + 1));
+    MDC.put(DAY, String.format("%1$02d", now.get(Calendar.DAY_OF_MONTH)));
+    MDC.put(HOUR, String.format("%1$02d", now.get(Calendar.HOUR_OF_DAY)));
+
+    String coll = collectionLayout.format(event);
+
+    MDC.remove(YEAR);
+    MDC.remove(MONTH);
+    MDC.remove(DAY);
+    MDC.remove(HOUR);
+    if (null != applicationId) {
+      MDC.remove(APP_ID);
+    }
+
+    WriteConcern wc;
+    if (event.getLevel().isGreaterOrEqual(Level.WARN)) {
+      wc = warnOrHigherWriteConcern;
+    } else {
+      wc = infoOrLowerWriteConcern;
+    }
+    db.getCollection(coll).insert(dbo, wc);
+  }
+
+  public void close() {
+    mongo.close();
+  }
+
+  public boolean requiresLayout() {
+    return true;
+  }
+}

spring-data-mongodb-log4j/src/test/java/org/springframework/data/document/mongodb/log4j/AppenderTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.document.mongodb.log4j;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.net.UnknownHostException;
+import java.util.Calendar;
+
+import com.mongodb.DB;
+import com.mongodb.DBCursor;
+import com.mongodb.Mongo;
+import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Jon Brisbin <jbrisbin@vmware.com>
+ */
+public class AppenderTest {
+
+  private static final String NAME = AppenderTest.class.getName();
+  private Logger log = Logger.getLogger(NAME);
+  private Mongo mongo;
+  private DB db;
+  private String collection;
+
+  @Before
+  public void setup() {
+    try {
+      mongo = new Mongo("localhost", 27017);
+      db = mongo.getDB("logs");
+      Calendar now = Calendar.getInstance();
+      collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1);
+      db.getCollection(collection).drop();
+    } catch (UnknownHostException e) {
+      throw new RuntimeException(e.getMessage(), e);
+    }
+  }
+
+  @Test
+  public void testLogging() {
+    log.debug("DEBUG message");
+    log.info("INFO message");
+    log.warn("WARN message");
+    log.error("ERROR message");
+
+    DBCursor msgs = db.getCollection(collection).find();
+    assertThat(msgs.count(), is(4));
+
+  }
+
+  @Test
+  public void testProperties() {
+    MDC.put("property", "one");
+    log.debug("DEBUG message");
+  }
+
+}

spring-data-mongodb-log4j/src/test/resources/log4j.properties

@@ -0,0 +1,20 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.springframework.data.document.mongodb.log4j.MongoLog4jAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+log4j.appender.stdout.host = localhost
+log4j.appender.stdout.port = 27017
+log4j.appender.stdout.database = logs
+log4j.appender.stdout.collectionPattern = %X{year}%X{month}
+log4j.appender.stdout.applicationId = my.application
+log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE
+
+log4j.category.org.apache.activemq=ERROR
+log4j.category.org.springframework.batch=DEBUG
+log4j.category.org.springframework.data.document.mongodb=DEBUG
+log4j.category.org.springframework.transaction=INFO
+
+log4j.category.org.hibernate.SQL=DEBUG
+# for debugging datasource initialization
+# log4j.category.test.jdbc=DEBUG

spring-data-mongodb-log4j/template.mf

@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.springframework.data.mongodb.log4j
+Bundle-Name: Spring Data Mongo DB Log4J Appender
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Import-Template:
+ com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",
+ org.apache.log4j.*;version="[1.2.15, 2.0.0)",
+ org.apache.log4j.spi.*;version="[1.2.15, 2.0.0)"

spring-data-mongodb/.classpath

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

spring-data-mongodb/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-data-mongodb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

spring-data-mongodb/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +0,0 @@
-#Thu Oct 14 10:28:36 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

spring-data-mongodb/.settings/org.eclipse.wst.common.component

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-data-mongodb">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>

spring-data-mongodb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>

spring-data-mongodb/.settings/org.maven.ide.eclipse.prefs

@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1

spring-data-mongodb/pom.xml

@@ -1,15 +1,21 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-document-parent</artifactId>
-		<version>1.0.0.M1</version>
+		<version>1.0.0.M2</version>
 		<relativePath>../spring-data-document-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-mongodb</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Data MongoDB Support</name>
+
+	<properties>
+		<mongo.version>2.4</mongo.version>
+	</properties>
+
 	<dependencies>
 
 		<!--  Spring -->
@@ -21,6 +27,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -31,64 +41,74 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-document-core</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons-core</artifactId>
-			<version>1.0.0.M3</version>
+			<version>${data.commons.version}</version>
 		</dependency>
 
-		<!-- Logging -->
+		<!-- MongoDB -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo.version}</version>
 			<exclusions>
 				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
 				</exclusion>
 			</exclusions>
-			<scope>runtime</scope>
 		</dependency>
-		
+
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-mongodb</artifactId>
+			<version>2.1.1</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.morphia</groupId>
+					<artifactId>morphia</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>2.1.1</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>jsr250-api</artifactId>
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>jsr250-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!--
+				<dependency>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+					<version>1.0</version>
+				</dependency>
+				-->
+
+		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-all</artifactId>
@@ -99,14 +119,35 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
-		
-		
-		<!-- MongoDB -->
+
 		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>2.3</version>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>1.6</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
@@ -116,6 +157,35 @@
 				<groupId>com.springsource.bundlor</groupId>
 				<artifactId>com.springsource.bundlor.maven</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>com.mysema.maven</groupId>
+				<artifactId>maven-apt-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>generate-test-sources</phase>
+						<goals>
+							<goal>test-process</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/generated-sources/test-annotations</outputDirectory>
+							<processor>org.springframework.data.document.mongodb.repository.MongoAnnotationProcessor</processor>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
+
+	<repositories>
+		<repository>
+			<id>querydsl</id>
+			<name>Mysema QueryDsl</name>
+			<url>http://source.mysema.com/maven2/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 </project>

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java

@@ -19,13 +19,39 @@ import org.springframework.dao.DataAccessResourceFailureException;
 
 public class CannotGetMongoDbConnectionException extends DataAccessResourceFailureException {
 
-	private static final long serialVersionUID = 1172099106475265589L;
+  private String username;
+  
+  private char[] password;
+  
+  private String database;
+  
+  private static final long serialVersionUID = 1172099106475265589L;
 
-	public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
+  public CannotGetMongoDbConnectionException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+  
+  public CannotGetMongoDbConnectionException(String msg) {
+    super(msg);
+  }
 
-	public CannotGetMongoDbConnectionException(String msg) {
-		super(msg);
-	}
+  public CannotGetMongoDbConnectionException(String msg, String database, String username, char[] password2) {
+    super(msg);
+    this.username = username;
+    this.password = password2;
+    this.database = database;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public char[] getPassword() {
+    return password;
+  }
+
+  public String getDatabase() {
+    return database;
+  }
+ 
 }

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java

@@ -15,13 +15,12 @@
  */
 package org.springframework.data.document.mongodb;
 
-import org.springframework.dao.DataAccessException;
-
 import com.mongodb.DBCollection;
 import com.mongodb.MongoException;
+import org.springframework.dao.DataAccessException;
 
 public interface CollectionCallback<T> {
 
-	T doInCollection(DBCollection collection) throws MongoException, DataAccessException;
-	
+  T doInCollection(DBCollection collection) throws MongoException, DataAccessException;
+
 }

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java

@@ -16,56 +16,56 @@
 package org.springframework.data.document.mongodb;
 
 /**
- * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection. 
- * 
- * @author Thomas Risberg
+ * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.
  *
+ * @author Thomas Risberg
  */
 public class CollectionOptions {
-	
-	private Integer maxDocuments;
-	
-	private Integer size;
-	
-	private Boolean capped;
-	
-	/**
-	 * Constructs a new <code>CollectionOptions</code> instance.
-	 * @param size the collection size in bytes, this data space is preallocated
-	 * @param maxDocuments the maximum number of documents in the collection.
-	 * @param capped true to created a "capped" collection (fixed size with auto-FIFO behavior
-	 * based on insertion order), false otherwise.
-	 */
-	public CollectionOptions(Integer size, Integer maxDocuments, Boolean capped) {
-		super();
-		this.maxDocuments = maxDocuments;
-		this.size = size;
-		this.capped = capped;
-	}
 
-	public Integer getMaxDocuments() {
-		return maxDocuments;
-	}
+  private Integer maxDocuments;
 
-	public void setMaxDocuments(Integer maxDocuments) {
-		this.maxDocuments = maxDocuments;
-	}
+  private Integer size;
 
-	public Integer getSize() {
-		return size;
-	}
+  private Boolean capped;
 
-	public void setSize(Integer size) {
-		this.size = size;
-	}
+  /**
+   * Constructs a new <code>CollectionOptions</code> instance.
+   *
+   * @param size         the collection size in bytes, this data space is preallocated
+   * @param maxDocuments the maximum number of documents in the collection.
+   * @param capped       true to created a "capped" collection (fixed size with auto-FIFO behavior
+   *                     based on insertion order), false otherwise.
+   */
+  public CollectionOptions(Integer size, Integer maxDocuments, Boolean capped) {
+    super();
+    this.maxDocuments = maxDocuments;
+    this.size = size;
+    this.capped = capped;
+  }
+
+  public Integer getMaxDocuments() {
+    return maxDocuments;
+  }
+
+  public void setMaxDocuments(Integer maxDocuments) {
+    this.maxDocuments = maxDocuments;
+  }
+
+  public Integer getSize() {
+    return size;
+  }
+
+  public void setSize(Integer size) {
+    this.size = size;
+  }
+
+  public Boolean getCapped() {
+    return capped;
+  }
+
+  public void setCapped(Boolean capped) {
+    this.capped = capped;
+  }
 
-	public Boolean getCapped() {
-		return capped;
-	}
 
-	public void setCapped(Boolean capped) {
-		this.capped = capped;
-	}
-	
-	
 }