Renamed packages etc.

spring-datastore-mongodb/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>spring-datastore-mongodb</name>
+	<name>spring-data-mongodb</name>
 	<comment></comment>
 	<projects>
 	</projects>

spring-datastore-mongodb/.settings/org.eclipse.wst.common.component

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-datastore-mongodb">
+    <wb-module deploy-name="spring-data-mongodb">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
     </wb-module>
 </project-modules>

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;
 

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;
 

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 {
 	

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;
 

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;

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;

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<Object>, MongoReader<Object> {

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;

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;
 

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 {
 

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;
 

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<T> extends MongoWriter<T>, MongoReader<T> {
 

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;

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;

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;
 

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;

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<Mongo>, InitializingBean, 
 		PersistenceExceptionTranslator {
 
+	
 	/**
 	 * Logger, available to subclasses.
 	 */
@@ -49,8 +50,6 @@ public class MongoFactoryBean implements FactoryBean<Mongo>, 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<Mongo>, InitializingBean,
 		this.mongoOptions = mongoOptions;
 	}
 
-	public void setDatabaseName(String databaseName) {
-		this.databaseName = databaseName;
-	}
-
 	public void setHost(String host) {
 		this.host = host;
 	}

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;

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;

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;
 

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 {

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;
 

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;
 

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;
 

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 {

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 {

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 {
 

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;

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;

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 {
 

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 {
 

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;