DATADOC-191 - Removed 'document' from package names.

Polished template.mf as well by using Maven version placeholders.

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

@@ -11,8 +11,8 @@ 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.mongodb.CollectionCallback;
+import org.springframework.data.mongodb.MongoTemplate;
 import org.springframework.data.persistence.ChangeSet;
 import org.springframework.data.persistence.ChangeSetBacked;
 import org.springframework.data.persistence.ChangeSetPersister;

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

@@ -7,10 +7,10 @@ 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.data.mongodb.MongoTemplate;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

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

@@ -4,7 +4,7 @@ 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;
+import org.springframework.data.mongodb.mapping.Document;
 
 @Document
 public class Resume {

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

@@ -20,22 +20,22 @@
   <mongo:mapping-converter/>
   
   <!--  Mongo config -->
-  <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
+  <bean id="mongo" class="org.springframework.data.mongodb.MongoFactoryBean">
     <property name="host" value="localhost"/>
     <property name="port" value="27017"/>
   </bean>
 
-  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.SimpleMongoDbFactory">
+  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.SimpleMongoDbFactory">
   	<constructor-arg name="mongo" ref="mongo"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>
 
-  <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.MongoTemplate">
     <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
-  <bean class="org.springframework.data.document.mongodb.MongoExceptionTranslator"/>
+  <bean class="org.springframework.data.mongodb.MongoExceptionTranslator"/>
 
   <!--  Mongo aspect config -->
   <bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"

spring-data-mongodb/pom.xml

@@ -148,7 +148,7 @@
 						</goals>
 						<configuration>
 							<outputDirectory>target/generated-test-sources</outputDirectory>
-							<processor>org.springframework.data.document.mongodb.repository.MongoAnnotationProcessor</processor>
+							<processor>org.springframework.data.mongodb.repository.MongoAnnotationProcessor</processor>
 						</configuration>
 					</execution>
 				</executions>

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

@@ -1,5 +0,0 @@
-/**
- * MongoDB specific JMX monitoring support.
- */
-package org.springframework.data.document.mongodb.monitor;
-

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

@@ -1,5 +0,0 @@
-/**
- * MongoDB core support.
- */
-package org.springframework.data.document.mongodb;
-

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/query/package-info.java

@@ -1,5 +0,0 @@
-/**
- * MongoDB specific query and update support.
- */
-package org.springframework.data.document.mongodb.query;
-

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/package-info.java

@@ -1,5 +0,0 @@
-/**
- * MongoDB specific repository implementation.
- */
-package org.springframework.data.document.mongodb.repository;
-

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DBCollection;
 import com.mongodb.MongoException;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 /**
  * Provides a simple wrapper to encapsulate the variety of settings you can use when creating a collection.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CursorPreparer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DBCursor;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbCallback.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DB;
 import com.mongodb.MongoException;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DbHolder.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdmin.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;
@@ -45,7 +45,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	}
 
 	/* (non-Javadoc)
-	  * @see org.springframework.data.document.mongodb.MongoAdminOperations#dropDatabase(java.lang.String)
+	  * @see org.springframework.data.mongodb.MongoAdminOperations#dropDatabase(java.lang.String)
 	  */
 	@ManagedOperation
 	public void dropDatabase(String databaseName) {
@@ -53,7 +53,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	}
 
 	/* (non-Javadoc)
-	  * @see org.springframework.data.document.mongodb.MongoAdminOperations#createDatabase(java.lang.String)
+	  * @see org.springframework.data.mongodb.MongoAdminOperations#createDatabase(java.lang.String)
 	  */
 	@ManagedOperation
 	public void createDatabase(String databaseName) {
@@ -61,7 +61,7 @@ public class MongoAdmin implements MongoAdminOperations {
 	}
 
 	/* (non-Javadoc)
-	  * @see org.springframework.data.document.mongodb.MongoAdminOperations#getDatabaseStats(java.lang.String)
+	  * @see org.springframework.data.mongodb.MongoAdminOperations#getDatabaseStats(java.lang.String)
 	  */
 	@ManagedOperation
 	public String getDatabaseStats(String databaseName) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoAdminOperations.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.jmx.export.annotation.ManagedOperation;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.util.StringUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.DataAccessException;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DB;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDocumentWriter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 public interface MongoDocumentWriter {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExceptionTranslator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.MongoException;
 import com.mongodb.MongoException.CursorNotFound;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import java.util.List;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOperations.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import java.util.Collection;
 import java.util.List;
@@ -24,9 +24,9 @@ import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.WriteResult;
 
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.Update;
+import org.springframework.data.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.query.Query;
+import org.springframework.data.mongodb.query.Update;
 
 /**
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoOptionsFactoryBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.MongoOptions;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoPropertyDescriptors.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoReader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSynchronization.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.transaction.support.ResourceHolder;
 import org.springframework.transaction.support.ResourceHolderSynchronization;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTemplate.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
-import static org.springframework.data.document.mongodb.query.Criteria.*;
+import static org.springframework.data.mongodb.query.Criteria.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -53,26 +53,26 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverter;
-import org.springframework.data.document.mongodb.index.IndexDefinition;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
-import org.springframework.data.document.mongodb.mapping.event.AfterConvertEvent;
-import org.springframework.data.document.mongodb.mapping.event.AfterLoadEvent;
-import org.springframework.data.document.mongodb.mapping.event.AfterSaveEvent;
-import org.springframework.data.document.mongodb.mapping.event.BeforeConvertEvent;
-import org.springframework.data.document.mongodb.mapping.event.BeforeSaveEvent;
-import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
-import org.springframework.data.document.mongodb.mapping.event.MongoMappingEventPublisher;
-import org.springframework.data.document.mongodb.query.Query;
-import org.springframework.data.document.mongodb.query.QueryMapper;
-import org.springframework.data.document.mongodb.query.Update;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.convert.MongoConverter;
+import org.springframework.data.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.mapping.event.AfterConvertEvent;
+import org.springframework.data.mongodb.mapping.event.AfterLoadEvent;
+import org.springframework.data.mongodb.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.mapping.event.BeforeConvertEvent;
+import org.springframework.data.mongodb.mapping.event.BeforeSaveEvent;
+import org.springframework.data.mongodb.mapping.event.MongoMappingEvent;
+import org.springframework.data.mongodb.mapping.event.MongoMappingEventPublisher;
+import org.springframework.data.mongodb.query.Query;
+import org.springframework.data.mongodb.query.QueryMapper;
+import org.springframework.data.mongodb.query.Update;
 import org.springframework.jca.cci.core.ConnectionCallback;
 import org.springframework.util.Assert;
 
@@ -244,7 +244,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	/**
 	 * Returns the default
-	 * {@link org.springframework.data.document.mongodb.convert.MongoConverter}.
+	 * {@link org.springframework.data.mongodb.convert.MongoConverter}.
 	 * 
 	 * @return
 	 */
@@ -254,7 +254,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 	/**
 	 * Returns the
-	 * {@link org.springframework.data.document.mongodb.MongoDbFactory}.
+	 * {@link org.springframework.data.mongodb.MongoDbFactory}.
 	 * 
 	 * @return
 	 */
@@ -269,7 +269,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.springframework.data.document.mongodb.MongoOperations#
+	 * @see org.springframework.data.mongodb.MongoOperations#
 	 * getDefaultCollectionName()
 	 */
 	public String getCollectionName(Class<?> entityClass) {
@@ -280,7 +280,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#executeCommand
+	 * org.springframework.data.mongodb.MongoOperations#executeCommand
 	 * (java.lang.String)
 	 */
 	public CommandResult executeCommand(String jsonCommand) {
@@ -291,7 +291,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#executeCommand
+	 * org.springframework.data.mongodb.MongoOperations#executeCommand
 	 * (com.mongodb.DBObject)
 	 */
 	public CommandResult executeCommand(final DBObject command) {
@@ -319,7 +319,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+	 * org.springframework.data.mongodb.MongoOperations#execute(org.
 	 * springframework.data.document.mongodb.DBCallback)
 	 */
 	public <T> T execute(DbCallback<T> action) {
@@ -338,7 +338,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+	 * org.springframework.data.mongodb.MongoOperations#execute(org.
 	 * springframework.data.document.mongodb.CollectionCallback)
 	 */
 	public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
@@ -349,7 +349,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#execute(org.
+	 * org.springframework.data.mongodb.MongoOperations#execute(org.
 	 * springframework.data.document.mongodb.CollectionCallback,
 	 * java.lang.String)
 	 */
@@ -370,8 +370,8 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#executeInSession
-	 * (org.springframework.data.document.mongodb.DBCallback)
+	 * org.springframework.data.mongodb.MongoOperations#executeInSession
+	 * (org.springframework.data.mongodb.DBCallback)
 	 */
 	public <T> T executeInSession(final DbCallback<T> action) {
 
@@ -391,7 +391,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#createCollection
+	 * org.springframework.data.mongodb.MongoOperations#createCollection
 	 * (java.lang.Class)
 	 */
 	public <T> DBCollection createCollection(Class<T> entityClass) {
@@ -402,9 +402,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#createCollection
+	 * org.springframework.data.mongodb.MongoOperations#createCollection
 	 * (java.lang.Class,
-	 * org.springframework.data.document.mongodb.CollectionOptions)
+	 * org.springframework.data.mongodb.CollectionOptions)
 	 */
 	public <T> DBCollection createCollection(Class<T> entityClass,
 			CollectionOptions collectionOptions) {
@@ -415,7 +415,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#createCollection
+	 * org.springframework.data.mongodb.MongoOperations#createCollection
 	 * (java.lang.String)
 	 */
 	public DBCollection createCollection(final String collectionName) {
@@ -426,9 +426,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#createCollection
+	 * org.springframework.data.mongodb.MongoOperations#createCollection
 	 * (java.lang.String,
-	 * org.springframework.data.document.mongodb.CollectionOptions)
+	 * org.springframework.data.mongodb.CollectionOptions)
 	 */
 	public DBCollection createCollection(final String collectionName,
 			final CollectionOptions collectionOptions) {
@@ -440,7 +440,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#getCollection
+	 * org.springframework.data.mongodb.MongoOperations#getCollection
 	 * (java.lang.String)
 	 */
 	public DBCollection getCollection(final String collectionName) {
@@ -456,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#collectionExists
+	 * org.springframework.data.mongodb.MongoOperations#collectionExists
 	 * (java.lang.Class)
 	 */
 	public <T> boolean collectionExists(Class<T> entityClass) {
@@ -467,7 +467,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#collectionExists
+	 * org.springframework.data.mongodb.MongoOperations#collectionExists
 	 * (java.lang.String)
 	 */
 	public boolean collectionExists(final String collectionName) {
@@ -483,7 +483,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#dropCollection
+	 * org.springframework.data.mongodb.MongoOperations#dropCollection
 	 * (java.lang.Class)
 	 */
 	public <T> void dropCollection(Class<T> entityClass) {
@@ -496,7 +496,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#dropCollection
+	 * org.springframework.data.mongodb.MongoOperations#dropCollection
 	 * (java.lang.String)
 	 */
 	public void dropCollection(String collectionName) {
@@ -628,7 +628,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#insert(java
+	 * org.springframework.data.mongodb.MongoOperations#insert(java
 	 * .lang .Object)
 	 */
 	public void insert(Object objectToSave) {
@@ -640,7 +640,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#insert(java
+	 * org.springframework.data.mongodb.MongoOperations#insert(java
 	 * .lang .String, java.lang.Object)
 	 */
 	public void insert(Object objectToSave, String collectionName) {
@@ -701,7 +701,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#insertList(java
+	 * org.springframework.data.mongodb.MongoOperations#insertList(java
 	 * .util.List)
 	 */
 	public void insert(Collection<? extends Object> batchToSave, Class<?> entityClass) {
@@ -712,7 +712,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#insertList(java
+	 * org.springframework.data.mongodb.MongoOperations#insertList(java
 	 * .lang.String, java.util.List)
 	 */
 	public void insert(Collection<? extends Object> batchToSave,
@@ -724,7 +724,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#insertAll(java
+	 * org.springframework.data.mongodb.MongoOperations#insertAll(java
 	 * .util.Collection)
 	 */
 	public void insertAll(Collection<? extends Object> objectsToSave) {
@@ -790,7 +790,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#save(java.lang
+	 * org.springframework.data.mongodb.MongoOperations#save(java.lang
 	 * .Object)
 	 */
 	public void save(Object objectToSave) {
@@ -801,7 +801,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#save(java.lang
+	 * org.springframework.data.mongodb.MongoOperations#save(java.lang
 	 * .String, java.lang.Object)
 	 */
 	public void save(Object objectToSave, String collectionName) {
@@ -901,7 +901,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#updateFirst(com
+	 * org.springframework.data.mongodb.MongoOperations#updateFirst(com
 	 * .mongodb.DBObject, com.mongodb.DBObject)
 	 */
 	public WriteResult updateFirst(Query query, Update update,
@@ -914,7 +914,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#updateFirst
+	 * org.springframework.data.mongodb.MongoOperations#updateFirst
 	 * (java .lang.String, com.mongodb.DBObject, com.mongodb.DBObject)
 	 */
 	public WriteResult updateFirst(final Query query,
@@ -926,7 +926,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#updateMulti(com
+	 * org.springframework.data.mongodb.MongoOperations#updateMulti(com
 	 * .mongodb.DBObject, com.mongodb.DBObject)
 	 */
 	public WriteResult updateMulti(Query query, Update update,
@@ -939,7 +939,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#updateMulti
+	 * org.springframework.data.mongodb.MongoOperations#updateMulti
 	 * (java .lang.String, com.mongodb.DBObject, com.mongodb.DBObject)
 	 */
 	public WriteResult updateMulti(final Query query, final Update update,
@@ -1048,7 +1048,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#remove(java
+	 * org.springframework.data.mongodb.MongoOperations#remove(java
 	 * .lang .String, com.mongodb.DBObject)
 	 */
 	public void remove(final Query query, String collectionName) {
@@ -1059,7 +1059,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.springframework.data.document.mongodb.MongoOperations#getCollection
+	 * org.springframework.data.mongodb.MongoOperations#getCollection
 	 * (java.lang.Class)
 	 */
 	public <T> List<T> findAll(Class<T> entityClass) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoWriter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoDbFactory.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 import org.springframework.dao.UncategorizedDataAccessException;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/WriteResultChecking.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb;
+package org.springframework.data.mongodb;
 
 public enum WriteResultChecking {
 	NONE, LOG, EXCEPTION

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,13 +26,13 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.MongoTemplate;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.mapping.Document;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
 import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoTemplate;
+import org.springframework.data.mongodb.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.mapping.Document;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
 
 import java.util.List;
 import java.util.Set;
@@ -38,12 +38,12 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.document.mongodb.convert.CustomConversions;
-import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
-import org.springframework.data.document.mongodb.mapping.Document;
-import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mapping.context.MappingContextAwareBeanPostProcessor;
+import org.springframework.data.mongodb.convert.CustomConversions;
+import org.springframework.data.mongodb.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.mapping.Document;
+import org.springframework.data.mongodb.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntityIndexCreator;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
-import static org.springframework.data.document.mongodb.config.BeanNames.*;
+import static org.springframework.data.mongodb.config.BeanNames.*;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.authentication.UserCredentials;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.MongoFactoryBean;
+import org.springframework.data.mongodb.SimpleMongoDbFactory;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -21,8 +21,8 @@ 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.mongodb.MongoAdmin;
-import org.springframework.data.document.mongodb.monitor.*;
+import org.springframework.data.mongodb.MongoAdmin;
+import org.springframework.data.mongodb.monitor.*;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoFactoryBean;
-import org.springframework.data.document.mongodb.MongoOptionsFactoryBean;
+import org.springframework.data.mongodb.MongoFactoryBean;
+import org.springframework.data.mongodb.MongoOptionsFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryConfigParser.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
+import org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration;
 import org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser;
 import org.w3c.dom.Element;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryNamespaceHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ParsingUtils.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.document.mongodb.MongoOptionsFactoryBean;
+import org.springframework.data.mongodb.MongoOptionsFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/SimpleMongoRepositoryConfiguration.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 
-import org.springframework.data.document.mongodb.repository.MongoRepositoryFactoryBean;
+import org.springframework.data.mongodb.repository.MongoRepositoryFactoryBean;
 import org.springframework.data.repository.config.AutomaticRepositoryConfigInformation;
 import org.springframework.data.repository.config.ManualRepositoryConfigInformation;
 import org.springframework.data.repository.config.RepositoryConfig;
@@ -48,7 +48,7 @@ public class SimpleMongoRepositoryConfiguration
 	}
 
 	/**
-	 * Returns the bean name of the {@link org.springframework.data.document.mongodb.MongoTemplate} to be referenced.
+	 * Returns the bean name of the {@link org.springframework.data.mongodb.MongoTemplate} to be referenced.
 	 * 
 	 * @return
 	 */
@@ -136,7 +136,7 @@ public class SimpleMongoRepositoryConfiguration
 		/*
 		* (non-Javadoc)
 		*
-		* @see org.springframework.data.document.mongodb.repository.config.
+		* @see org.springframework.data.mongodb.repository.config.
 		* SimpleMongoRepositoryConfiguration
 		* .MongoRepositoryConfiguration#getMongoTemplateRef()
 		*/
@@ -146,7 +146,7 @@ public class SimpleMongoRepositoryConfiguration
 		}
 		
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
 		 */
 		public boolean getCreateQueryIndexes() {
 			
@@ -177,7 +177,7 @@ public class SimpleMongoRepositoryConfiguration
 		/*
 		* (non-Javadoc)
 		*
-		* @see org.springframework.data.document.mongodb.repository.config.
+		* @see org.springframework.data.mongodb.repository.config.
 		* SimpleMongoRepositoryConfiguration
 		* .MongoRepositoryConfiguration#getMongoTemplateRef()
 		*/
@@ -187,7 +187,7 @@ public class SimpleMongoRepositoryConfiguration
 		}
 		
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
+		 * @see org.springframework.data.mongodb.config.SimpleMongoRepositoryConfiguration.MongoRepositoryConfiguration#getCreateQueryIndexes()
 		 */
 		public boolean getCreateQueryIndexes() {
 			return getParent().getCreateQueryIndexes();

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java

@@ -1,5 +1,5 @@
 /**
  * Spring XML namespace configuration for MongoDB specific repositories.
  */
-package org.springframework.data.document.mongodb.config;
+package org.springframework.data.mongodb.config;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/AbstractMongoConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -28,12 +28,13 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigIntegerToObjectIdConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.ObjectIdToBigIntegerConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.ObjectIdToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToObjectIdConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.BigIntegerToObjectIdConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.ObjectIdToBigIntegerConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.ObjectIdToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToObjectIdConverter;
+
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
@@ -95,7 +96,7 @@ public abstract class AbstractMongoConverter implements MongoConverter, Initiali
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.convert.MongoConverter#getConversionService()
+	 * @see org.springframework.data.mongodb.convert.MongoConverter#getConversionService()
 	 */
 	public ConversionService getConversionService() {
 		return conversionService;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/CustomConversions.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,9 +30,9 @@ import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
 import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.document.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
-import org.springframework.data.document.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.mongodb.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.convert.MongoConverters.StringToBigDecimalConverter;
 import org.springframework.util.Assert;
 
 import com.mongodb.DBObject;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MappingMongoConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -42,9 +42,6 @@ import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
 import org.springframework.data.mapping.PreferredConstructor;
@@ -54,6 +51,9 @@ import org.springframework.data.mapping.model.BeanWrapper;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.ParameterValueProvider;
 import org.springframework.data.mapping.model.SpELAwareParameterValueProvider;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.Expression;
@@ -103,7 +103,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.convert.MongoConverter#getMappingContext()
+	 * @see org.springframework.data.mongodb.convert.MongoConverter#getMappingContext()
 	 */
 	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
 		return mappingContext;
@@ -130,7 +130,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
+	 * @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
 	 */
 	public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
 		return conversionService.convert(id, targetType);
@@ -138,7 +138,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
+	 * @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
 	 */
 	public ObjectId convertObjectId(Object id) {
 		return conversionService.convert(id, ObjectId.class);
@@ -146,7 +146,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
+	 * @see org.springframework.data.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
 	 */
 	public <S extends Object> S read(Class<S> clazz, final DBObject dbo) {
 		return read(ClassTypeInformation.from(clazz), dbo);
@@ -293,7 +293,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * Root entry method into write conversion. Adds a type discriminator to the {@link DBObject}. Shouldn't be called for
 	 * nested conversions.
 	 *
-	 * @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
+	 * @see org.springframework.data.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
 	 */
 	public void write(final Object obj, final DBObject dbo) {
 
@@ -613,7 +613,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		dbObject.put(key, valueToSet);
 	}
 
-	protected DBRef createDBRef(Object target, org.springframework.data.document.mongodb.mapping.DBRef dbref) {
+	protected DBRef createDBRef(Object target, org.springframework.data.mongodb.mapping.DBRef dbref) {
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
 		if (null == targetEntity || null == targetEntity.getIdProperty()) {
 			return null;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoBeanWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import static org.springframework.beans.PropertyAccessorFactory.forBeanPropertyAccess;
 import static org.springframework.beans.PropertyAccessorFactory.forDirectFieldAccess;
@@ -22,8 +22,8 @@ import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.ConfigurablePropertyAccessor;
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
+import org.springframework.data.mongodb.MongoPropertyDescriptors;
+import org.springframework.data.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
 import org.springframework.util.Assert;
 
 /**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoConverter.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import com.mongodb.BasicDBList;
 import org.bson.types.ObjectId;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.document.mongodb.MongoReader;
-import org.springframework.data.document.mongodb.MongoWriter;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoReader;
+import org.springframework.data.mongodb.MongoWriter;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
 
 public interface MongoConverter extends MongoWriter<Object>, MongoReader<Object> {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/MongoConverters.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/convert/SimpleMongoConverter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.convert;
+package org.springframework.data.mongodb.convert;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
@@ -49,11 +49,11 @@ import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.ConversionServiceFactory;
-import org.springframework.data.document.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
-import org.springframework.data.document.mongodb.mapping.SimpleMongoMappingContext;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoPropertyDescriptors.MongoPropertyDescriptor;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.mapping.SimpleMongoMappingContext;
 import org.springframework.util.Assert;
 import org.springframework.util.comparator.CompoundComparator;
 
@@ -64,7 +64,7 @@ import org.springframework.util.comparator.CompoundComparator;
  * @author Thomas Risberg
  * @author Oliver Gierke
  * 
- * @deprecated since Spring 1.0 M3 in favor of {@link org.springframework.data.document.mongodb.convert.MappingMongoConverter}
+ * @deprecated since Spring 1.0 M3 in favor of {@link org.springframework.data.mongodb.convert.MappingMongoConverter}
  * The MappingMongoConverter provides all the functionality of the SimpleMongoConverter and will replace it as the default
  * converter used. The SimpleMongoCOnverter will be removed at some point before the GA release.
  */
@@ -137,7 +137,7 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
 	}
 
 	/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.convert.MongoConverter#getMappingContext()
+		 * @see org.springframework.data.mongodb.convert.MongoConverter#getMappingContext()
 		 */
 	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
 		return mappingContext;
@@ -146,7 +146,7 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
 	/*
 			* (non-Javadoc)
 			*
-			* @see org.springframework.data.document.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
+			* @see org.springframework.data.mongodb.MongoWriter#write(java.lang.Object, com.mongodb.DBObject)
 			*/
 	@SuppressWarnings("rawtypes")
 	public void write(Object obj, DBObject dbo) {
@@ -318,7 +318,7 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
 	/*
 			* (non-Javadoc)
 			*
-			* @see org.springframework.data.document.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
+			* @see org.springframework.data.mongodb.MongoReader#read(java.lang.Class, com.mongodb.DBObject)
 			*/
 	public <S> S read(Class<S> clazz, DBObject source) {
 
@@ -501,14 +501,14 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
 	}
 
 	/* (non-Javadoc)
-			* @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
+			* @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(org.bson.types.ObjectId, java.lang.Class)
 			*/
 	public <T> T convertObjectId(ObjectId id, Class<T> targetType) {
 		return conversionService.convert(id, targetType);
 	}
 
 	/* (non-Javadoc)
-			* @see org.springframework.data.document.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
+			* @see org.springframework.data.mongodb.convert.MongoConverter#convertObjectId(java.lang.Object)
 			*/
 	public ObjectId convertObjectId(Object id) {
 		return conversionService.convert(id, ObjectId.class);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/geo/Box.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.geo;
+package org.springframework.data.mongodb.geo;
 
-import org.springframework.data.document.mongodb.mapping.Field;
+import org.springframework.data.mongodb.mapping.Field;
 import org.springframework.util.Assert;
 
 /**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/geo/Circle.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.geo;
+package org.springframework.data.mongodb.geo;
 
 import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.util.Assert;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/geo/Point.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.geo;
+package org.springframework.data.mongodb.geo;
 
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.document.mongodb.mapping.Field;
+import org.springframework.data.mongodb.mapping.Field;
 import org.springframework.util.Assert;
 
 /**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/CompoundIndex.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/CompoundIndexes.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/GeoSpatialIndexed.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/IndexDefinition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.index;
+package org.springframework.data.mongodb.index;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/IndexDirection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.index;
+package org.springframework.data.mongodb.index;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/IndexPredicate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.index;
+package org.springframework.data.mongodb.index;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/index/Indexed.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/BasicMongoPersistentEntity.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.util.Comparator;
 
-import org.springframework.data.document.mongodb.MongoCollectionUtils;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.mapping.model.MappingException;
+import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.StringUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/BasicMongoPersistentProperty.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
@@ -106,17 +106,17 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 			return ID_FIELD_NAME;
 		}
 
-		org.springframework.data.document.mongodb.mapping.Field annotation = getField().getAnnotation(
-				org.springframework.data.document.mongodb.mapping.Field.class);
+		org.springframework.data.mongodb.mapping.Field annotation = getField().getAnnotation(
+				org.springframework.data.mongodb.mapping.Field.class);
 		return annotation != null && StringUtils.hasText(annotation.value()) ? annotation.value() : field.getName();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#getFieldOrder()
+	 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#getFieldOrder()
 	 */
 	public int getFieldOrder() {
-		org.springframework.data.document.mongodb.mapping.Field annotation = getField().getAnnotation(
-				org.springframework.data.document.mongodb.mapping.Field.class);
+		org.springframework.data.mongodb.mapping.Field annotation = getField().getAnnotation(
+				org.springframework.data.mongodb.mapping.Field.class);
 		return annotation != null ? annotation.order() : Integer.MAX_VALUE;
 	}
 
@@ -129,14 +129,14 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope
 	}
 
 	/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#isDbReference()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#isDbReference()
 		 */
 	public boolean isDbReference() {
 		return getField().isAnnotationPresent(DBRef.class);
 	}
 
 	/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#getDBRef()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#getDBRef()
 		 */
 	public DBRef getDBRef() {
 		return getField().getAnnotation(DBRef.class);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/DBRef.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/Document.java

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

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/Field.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/MongoMappingContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/MongoPersistentEntity.java

@@ -1,4 +1,4 @@
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import org.springframework.data.mapping.PersistentEntity;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/MongoPersistentEntityIndexCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
@@ -27,15 +27,15 @@ import com.mongodb.util.JSON;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
-import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.index.CompoundIndex;
-import org.springframework.data.document.mongodb.index.CompoundIndexes;
-import org.springframework.data.document.mongodb.index.GeoSpatialIndexed;
-import org.springframework.data.document.mongodb.index.IndexDirection;
-import org.springframework.data.document.mongodb.index.Indexed;
-import org.springframework.data.document.mongodb.query.GeospatialIndex;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.event.MappingContextEvent;
+import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.index.CompoundIndex;
+import org.springframework.data.mongodb.index.CompoundIndexes;
+import org.springframework.data.mongodb.index.GeoSpatialIndexed;
+import org.springframework.data.mongodb.index.IndexDirection;
+import org.springframework.data.mongodb.index.Indexed;
+import org.springframework.data.mongodb.query.GeospatialIndex;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/MongoPersistentProperty.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import org.springframework.data.mapping.PersistentProperty;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/SimpleMongoMappingContext.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.mapping;
+package org.springframework.data.mongodb.mapping;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.data.document.mongodb.MongoCollectionUtils;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.model.AbstractPersistentProperty;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.util.TypeInformation;
 
 /**
@@ -76,7 +76,7 @@ public class SimpleMongoMappingContext extends
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#getKey()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#getKey()
 		 */
 		public String getFieldName() {
 			return isIdProperty() ? "_id" : getName();
@@ -84,7 +84,7 @@ public class SimpleMongoMappingContext extends
 		
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#getFieldOrder()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#getFieldOrder()
 		 */
 		public int getFieldOrder() {
 			return Integer.MAX_VALUE;
@@ -99,14 +99,14 @@ public class SimpleMongoMappingContext extends
 		}
 		
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#isDbReference()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#isDbReference()
 		 */
 		public boolean isDbReference() {
 			return false;
 		}
 		
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentProperty#getDBRef()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentProperty#getDBRef()
 		 */
 		public DBRef getDBRef() {
 			return null;
@@ -124,7 +124,7 @@ public class SimpleMongoMappingContext extends
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.document.mongodb.mapping.MongoPersistentEntity#getCollection()
+		 * @see org.springframework.data.mongodb.mapping.MongoPersistentEntity#getCollection()
 		 */
 		public String getCollection() {
 			return MongoCollectionUtils.getPreferredCollectionName(getType());

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/AbstractMappingEventListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 import org.apache.commons.logging.Log;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/AfterConvertEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/AfterLoadEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/AfterSaveEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/BeforeConvertEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/BeforeSaveEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/LoggingEventListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 import org.apache.commons.logging.Log;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/MongoMappingEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import com.mongodb.DBObject;
 import org.springframework.context.ApplicationEvent;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/mapping/event/MongoMappingEventPublisher.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.document.mongodb.mapping.event;
+package org.springframework.data.mongodb.mapping.event;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
-import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.mapping.event.MappingContextEvent;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.mapping.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.mapping.MongoPersistentProperty;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.CommandResult;
 import com.mongodb.DB;
@@ -21,7 +21,7 @@ import com.mongodb.Mongo;
 import com.mongodb.MongoException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.data.document.mongodb.MongoDbUtils;
+import org.springframework.data.mongodb.MongoDbUtils;
 
 /**
  * Base class to encapsulate common configuration settings when connecting to a database

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AssertMetrics.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BackgroundFlushingMetrics.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import java.util.Date;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BtreeIndexCounters.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ConnectionMetrics.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/GlobalLockMetrics.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/MemoryMetrics.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/OperationCounters.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.monitor;
+package org.springframework.data.mongodb.monitor;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

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

@@ -0,0 +1,5 @@
+/**
+ * MongoDB specific JMX monitoring support.
+ */
+package org.springframework.data.mongodb.monitor;
+

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * MongoDB core support.
+ */
+package org.springframework.data.mongodb;
+

spring-data-mongodb/src/main/java/org/springframework/data/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.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import com.mongodb.DBObject;
 import com.mongodb.util.JSON;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/BasicUpdate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import java.util.Collections;
 

spring-data-mongodb/src/main/java/org/springframework/data/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.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,10 +24,10 @@ import java.util.List;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
-import org.springframework.data.document.mongodb.InvalidMongoDbApiUsageException;
-import org.springframework.data.document.mongodb.geo.Box;
-import org.springframework.data.document.mongodb.geo.Circle;
-import org.springframework.data.document.mongodb.geo.Point;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.geo.Box;
+import org.springframework.data.mongodb.geo.Circle;
+import org.springframework.data.mongodb.geo.Point;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/CriteriaDefinition.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import com.mongodb.DBObject;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/Field.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import java.util.HashMap;
 import java.util.Map;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/GeospatialIndex.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
-import org.springframework.data.document.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.index.IndexDefinition;
 import org.springframework.util.Assert;
 
 import com.mongodb.BasicDBObject;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/Index.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.data.document.mongodb.index.IndexDefinition;
+import org.springframework.data.mongodb.index.IndexDefinition;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/query/NorCriteria.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.document.mongodb.query;
+package org.springframework.data.mongodb.query;
 
 public class NorCriteria extends OrCriteria {