diff --git a/spring-datastore-mongodb/.project b/spring-datastore-mongodb/.project index d56e29ce6..942129127 100644 --- a/spring-datastore-mongodb/.project +++ b/spring-datastore-mongodb/.project @@ -1,36 +1,36 @@ - - - spring-datastore-mongodb - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - + + + spring-data-mongodb + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-datastore-mongodb/.settings/org.eclipse.wst.common.component b/spring-datastore-mongodb/.settings/org.eclipse.wst.common.component index 527e0b144..17553d89a 100644 --- a/spring-datastore-mongodb/.settings/org.eclipse.wst.common.component +++ b/spring-datastore-mongodb/.settings/org.eclipse.wst.common.component @@ -1,6 +1,6 @@ - - - - - - + + + + + + diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CannotGetMongoDbConnectionException.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java similarity index 94% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CannotGetMongoDbConnectionException.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java index 61735fac8..7feb98f21 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CannotGetMongoDbConnectionException.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CannotGetMongoDbConnectionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.springframework.dao.DataAccessResourceFailureException; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionCallback.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java similarity index 91% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionCallback.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java index 44fc46be1..5b6dca2f1 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionCallback.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.springframework.dao.DataAccessException; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionOptions.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java similarity index 91% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionOptions.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java index 9b7315785..3c884ae32 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/CollectionOptions.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/CollectionOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public class CollectionOptions { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBCallback.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java similarity index 91% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBCallback.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java index 99478106c..a22968f99 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBCallback.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.springframework.dao.DataAccessException; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBHolder.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java similarity index 96% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBHolder.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java index d0509d0c6..ed1034e44 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/DBHolder.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/DBHolder.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/FluentDbObject.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java similarity index 88% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/FluentDbObject.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java index 5dc9fd08e..1c1679e92 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/FluentDbObject.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/FluentDbObject.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.util.HashMap; import java.util.Map; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoConverter.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java similarity index 90% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoConverter.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java index 5e33793f0..9f13e08f9 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoConverter.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public interface MongoConverter extends MongoWriter, MongoReader { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDbUtils.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java similarity index 99% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDbUtils.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java index 1d47cec20..1a00e5c03 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDbUtils.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentSource.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java similarity index 93% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentSource.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java index 29d061dcc..1e3bcd40a 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentSource.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.springframework.datastore.document.DocumentSource; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentWriter.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java similarity index 89% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentWriter.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java index 52237a42a..bbcabcd70 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoDocumentWriter.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDocumentWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public interface MongoDocumentWriter { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReader.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java similarity index 90% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReader.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java index e0e6f1b32..5c081147b 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReader.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import com.mongodb.DBObject; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReaderWriter.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java similarity index 90% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReaderWriter.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java index 14e6767b8..0b67eddef 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoReaderWriter.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoReaderWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public interface MongoReaderWriter extends MongoWriter, MongoReader { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoSynchronization.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java similarity index 89% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoSynchronization.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java index 8307d1f3f..815eeff07 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoSynchronization.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoSynchronization.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import org.springframework.transaction.support.ResourceHolder; import org.springframework.transaction.support.ResourceHolderSynchronization; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoTemplate.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java similarity index 98% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoTemplate.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java index 54a9138e0..3ce01e6f9 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoTemplate.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.util.ArrayList; @@ -23,8 +23,8 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.dao.InvalidDataAccessApiUsageException; +import org.springframework.data.document.mongodb.query.Query; import org.springframework.datastore.document.AbstractDocumentStoreTemplate; -import org.springframework.datastore.document.mongodb.query.Query; import com.mongodb.BasicDBObject; import com.mongodb.CommandResult; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoWriter.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java similarity index 90% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoWriter.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java index 2e5351a31..8635fc9b3 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoWriter.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import com.mongodb.DBObject; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/SimpleMongoConverter.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java similarity index 96% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/SimpleMongoConverter.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java index 7502d2c53..0bd679e77 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/SimpleMongoConverter.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.beans.PropertyDescriptor; import java.lang.reflect.Array; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoFactoryBean.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java similarity index 93% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoFactoryBean.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java index 2639eb044..4e03e0566 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/MongoFactoryBean.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/bean/factory/MongoFactoryBean.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb.bean.factory; 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.data.document.mongodb.MongoDbUtils; import org.springframework.util.Assert; -import com.mongodb.DB; import com.mongodb.Mongo; import com.mongodb.MongoOptions; @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; public class MongoFactoryBean implements FactoryBean, InitializingBean, PersistenceExceptionTranslator { + /** * Logger, available to subclasses. */ @@ -49,8 +50,6 @@ public class MongoFactoryBean implements FactoryBean, InitializingBean, private MongoOptions mongoOptions; private String host; private Integer port; - private String databaseName; - public void setMongo(Mongo mongo) { this.mongo = mongo; @@ -60,10 +59,6 @@ public class MongoFactoryBean implements FactoryBean, InitializingBean, this.mongoOptions = mongoOptions; } - public void setDatabaseName(String databaseName) { - this.databaseName = databaseName; - } - public void setHost(String host) { this.host = host; } diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/BasicQuery.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java similarity index 94% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/BasicQuery.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java index a3ae5f017..296b51307 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/BasicQuery.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/BasicQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import com.mongodb.DBObject; import com.mongodb.util.JSON; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Criteria.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java similarity index 98% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Criteria.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java index 9e045f64c..62c65c040 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Criteria.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Criteria.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/CriteriaSpec.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java similarity index 92% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/CriteriaSpec.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java index c4548205a..d0837050f 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/CriteriaSpec.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/CriteriaSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import com.mongodb.DBObject; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/FieldSpecification.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java similarity index 92% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/FieldSpecification.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java index 5977f5191..a1987f274 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/FieldSpecification.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/FieldSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; public class FieldSpecification { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/OrCriteria.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java similarity index 95% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/OrCriteria.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java index 434008592..966740b07 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/OrCriteria.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/OrCriteria.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import org.bson.types.BasicBSONList; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Query.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java similarity index 91% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Query.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java index 132dc5475..dcd87797a 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/Query.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/Query.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import com.mongodb.DBObject; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/QueryBuilder.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java similarity index 96% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/QueryBuilder.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java index c710ad6cb..e6486b7f9 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/QueryBuilder.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/QueryBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; import java.util.LinkedHashMap; diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SliceSpecification.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java similarity index 92% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SliceSpecification.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java index 92aaf6f6c..d2dfdc8ac 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SliceSpecification.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SliceSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; public class SliceSpecification { diff --git a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SortSpecification.java b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java similarity index 92% rename from spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SortSpecification.java rename to spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java index 9bf117527..3d2c4b3c7 100644 --- a/spring-datastore-mongodb/src/main/java/org/springframework/datastore/document/mongodb/query/SortSpecification.java +++ b/spring-datastore-mongodb/src/main/java/org/springframework/data/document/mongodb/query/SortSpecification.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb.query; +package org.springframework.data.document.mongodb.query; public class SortSpecification { diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Person.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java similarity index 90% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Person.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java index 8fa80f475..01b134f64 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Person.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public class Person { diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Portfolio.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java similarity index 93% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Portfolio.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java index 9f5868539..1cc405527 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Portfolio.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Portfolio.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.util.ArrayList; import java.util.List; diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/SimpleMongoConverterTests.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java similarity index 95% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/SimpleMongoConverterTests.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java index 6c0bbc363..74feba182 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/SimpleMongoConverterTests.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; @@ -28,6 +28,7 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; +import org.springframework.data.document.mongodb.SimpleMongoConverter; import org.springframework.util.ReflectionUtils; import com.mongodb.BasicDBObject; diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Trade.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java similarity index 91% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Trade.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java index 4036a14c0..a370e4bee 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/Trade.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/Trade.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public class Trade { diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/User.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java similarity index 93% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/User.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java index 351da7928..70ec2ec2e 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/User.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.datastore.document.mongodb; +package org.springframework.data.document.mongodb; public class User { diff --git a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/analytics/MvcAnalyticsTests.java b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java similarity index 94% rename from spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/analytics/MvcAnalyticsTests.java rename to spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java index 0c1b1dc4d..631af6a1a 100644 --- a/spring-datastore-mongodb/src/test/java/org/springframework/datastore/document/mongodb/analytics/MvcAnalyticsTests.java +++ b/spring-datastore-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.document.mongodb.analytics; +package org.springframework.data.document.mongodb.analytics; import java.util.Calendar; import java.util.Date; @@ -11,11 +11,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.springframework.data.document.mongodb.MongoReader; +import org.springframework.data.document.mongodb.MongoTemplate; import org.springframework.datastore.document.analytics.ControllerCounter; import org.springframework.datastore.document.analytics.MvcEvent; import org.springframework.datastore.document.analytics.Parameters; -import org.springframework.datastore.document.mongodb.MongoReader; -import org.springframework.datastore.document.mongodb.MongoTemplate; import com.mongodb.BasicDBList; import com.mongodb.BasicDBObject;