DATADOC-83 - removed the spring-data-document-core module; move @RelatedDocument to the spring-data-mongodb-cross-store module; renamed "org.springframework.data.persistence.document.mongo" package

pom.xml

@@ -9,7 +9,6 @@
   <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>

spring-data-couchdb/pom.xml

@@ -66,8 +66,31 @@
 
 	<!--  Spring Data -->
     <dependency>
-        <groupId>org.springframework.data</groupId>
+		<groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-document-core</artifactId>
+		<artifactId>spring-data-commons-core</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>
+    <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>
 
     <!-- Jackson JSON -->

spring-data-document-core/pom.xml

@@ -1,75 +0,0 @@
-<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-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>
-
-    <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>
-
-
-    <!-- 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/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

spring-data-document-core/template.mf

@@ -1,39 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.document
-Bundle-Name: Spring Data Document
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
-Import-Template: 
- javax.servlet;version="[2.4.0, 4.0.0)",
- javax.servlet.http;version="[2.4.0, 4.0.0)",
- org.springframework.http.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.converter.*;version="[3.0.0, 4.0.0)",
- org.springframework.http.server*;version="[3.0.0, 4.0.0)",
- org.springframework.ui.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.annotation.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.bind.support.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.context.request.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.support.*;version="[3.0.0, 4.0.0)",
- 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.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.springframework.context.support.*;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",
- javax.persistence.*;version="[1.0, 2.0)"
-
-

spring-data-document-parent/pom.xml

@@ -142,11 +142,6 @@
         <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>

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.annotation;
+package org.springframework.data.persistence.document;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -1,4 +1,4 @@
-package org.springframework.data.persistence.document.mongo;
+package org.springframework.data.persistence.document.mongodb;
 
 import javax.persistence.EntityManagerFactory;
 

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

@@ -1,7 +1,6 @@
-package org.springframework.data.persistence.document.mongo;
+package org.springframework.data.persistence.document.mongodb;
 
 import java.lang.reflect.Field;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Transient;
@@ -13,12 +12,11 @@ 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.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;

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

@@ -3,7 +3,7 @@ package org.springframework.data.document.persistence.test;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.springframework.data.document.annotation.RelatedDocument;
+import org.springframework.data.persistence.document.RelatedDocument;
 
 @Entity
 public class Person {

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

@@ -38,12 +38,12 @@
   <bean class="org.springframework.data.document.mongodb.MongoExceptionTranslator"/>
 
   <!--  Mongo aspect config -->
-  <bean class="org.springframework.data.persistence.document.mongo.MongoDocumentBacking"
+  <bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"
         factory-method="aspectOf">
     <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
   </bean>
   <bean id="mongoChangeSetPersister" 
-      class="org.springframework.data.persistence.document.mongo.MongoChangeSetPersister">
+      class="org.springframework.data.persistence.document.mongodb.MongoChangeSetPersister">
     <property name="mongoTemplate" ref="mongoTemplate"/>
     <property name="entityManagerFactory" ref="entityManagerFactory"/>
   </bean>

spring-data-mongodb/pom.xml

@@ -35,11 +35,6 @@
 		</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-commons-core</artifactId>

src/assembly/distribution.xml

@@ -42,7 +42,6 @@
     <moduleSet>
       <!-- adds module jars to the distribution archive under the 'dist' directory -->
       <includes>
-        <include>org.springframework.data:spring-data-document-core</include>
         <include>org.springframework.data:spring-data-mongodb</include>
         <include>org.springframework.data:spring-data-mongodb-cross-store</include>
         <include>org.springframework.data:spring-data-mongodb-log4j</include>

src/docbkx/reference/mongodb.xml

@@ -236,10 +236,6 @@ DEBUG [document.mongodb.MongoTemplate]: Dropped collection [database.person]</pr
             <para>spring-data-commons-core-1.1.0.M1.jar</para>
           </listitem>
 
-          <listitem>
-            <para>spring-data-document-core-1.0.0.M3.jar</para>
-          </listitem>
-
           <listitem>
             <para>spring-data-mongodb-1.0.0.M3.jar</para>
           </listitem>