Browse Source

DATADOC-271 Re-packaging Mongo cross-store support, removing 'document' in package name

pull/1/head
Thomas Risberg 14 years ago
parent
commit
ccf981b8fb
  1. 2
      spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java
  2. 2
      spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java
  3. 6
      spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj
  4. 2
      spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java
  5. 8
      spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java
  6. 2
      spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java
  7. 4
      spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java
  8. 2
      spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java
  9. 2
      spring-data-mongodb-cross-store/src/test/resources/META-INF/persistence.xml
  10. 6
      spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java

@ -1,4 +1,4 @@
package org.springframework.data.persistence.mongodb; package org.springframework.data.mongodb.crossstore;
import org.springframework.data.persistence.ChangeSetBacked; import org.springframework.data.persistence.ChangeSetBacked;

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java

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

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

@ -1,4 +1,4 @@
package org.springframework.data.persistence.mongodb; package org.springframework.data.mongodb.crossstore;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -13,8 +13,8 @@ import org.aspectj.lang.reflect.FieldSignature;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.persistence.mongodb.RelatedDocument; import org.springframework.data.mongodb.crossstore.RelatedDocument;
import org.springframework.data.persistence.mongodb.DocumentBacked; import org.springframework.data.mongodb.crossstore.DocumentBacked;
import org.springframework.data.persistence.ChangeSetBackedTransactionSynchronization; import org.springframework.data.persistence.ChangeSetBackedTransactionSynchronization;
import org.springframework.data.persistence.ChangeSet; import org.springframework.data.persistence.ChangeSet;
import org.springframework.data.persistence.ChangeSetPersister; import org.springframework.data.persistence.ChangeSetPersister;

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java

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

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

@ -1,4 +1,4 @@
package org.springframework.data.document.persistence; package org.springframework.data.mongodb.crossstore;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
@ -7,10 +7,10 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
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.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.crossstore.test.Address;
import org.springframework.data.mongodb.crossstore.test.Person;
import org.springframework.data.mongodb.crossstore.test.Resume;
import org.springframework.test.annotation.Rollback; import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

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

@ -1,4 +1,4 @@
package org.springframework.data.document.persistence.test; package org.springframework.data.mongodb.crossstore.test;
public class Address { public class Address {

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

@ -1,9 +1,9 @@
package org.springframework.data.document.persistence.test; package org.springframework.data.mongodb.crossstore.test;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import org.springframework.data.persistence.mongodb.RelatedDocument; import org.springframework.data.mongodb.crossstore.RelatedDocument;
@Entity @Entity
public class Person { public class Person {

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

@ -1,4 +1,4 @@
package org.springframework.data.document.persistence.test; package org.springframework.data.mongodb.crossstore.test;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

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

@ -4,7 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> 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"> <persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider> <provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.springframework.data.document.persistence.test.Person</class> <class>org.springframework.data.mongodb.crossstore.test.Person</class>
<properties> <properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> <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--> <!--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-->

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

@ -13,7 +13,7 @@
<context:spring-configured/> <context:spring-configured/>
<context:component-scan base-package="org.springframework.persistence.test"> <context:component-scan base-package="org.springframework.persistence.mongodb.test">
<context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/> <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
</context:component-scan> </context:component-scan>
@ -38,12 +38,12 @@
<bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/> <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
<!-- Mongo aspect config --> <!-- Mongo aspect config -->
<bean class="org.springframework.data.persistence.mongodb.MongoDocumentBacking" <bean class="org.springframework.data.mongodb.crossstore.MongoDocumentBacking"
factory-method="aspectOf"> factory-method="aspectOf">
<property name="changeSetPersister" ref="mongoChangeSetPersister"/> <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
</bean> </bean>
<bean id="mongoChangeSetPersister" <bean id="mongoChangeSetPersister"
class="org.springframework.data.persistence.mongodb.MongoChangeSetPersister"> class="org.springframework.data.mongodb.crossstore.MongoChangeSetPersister">
<property name="mongoTemplate" ref="mongoTemplate"/> <property name="mongoTemplate" ref="mongoTemplate"/>
<property name="entityManagerFactory" ref="entityManagerFactory"/> <property name="entityManagerFactory" ref="entityManagerFactory"/>
</bean> </bean>

Loading…
Cancel
Save