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

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

@@ -0,0 +1,32 @@
+/*
+ * 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.persistence.document;
+
+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 {
+}

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>