diff --git a/README.md b/README.md
index fb8d21fd..ce0a14a9 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ Look at the folling bean configuration, which we'll break down afterwards:
-
+
@@ -163,7 +163,7 @@ You should be able to identify the `couchbaseClient` bean, which we'll defined p
That's all it takes to have Couchbase cache your objects. Now we can go through a quick example to show how it works. Assume the following class inside the `com.couchbase.example` package:
```java
-package com.couchbase.spring;
+package org.springframework.data.couchbase;
import org.springframework.cache.annotation.Cacheable;
diff --git a/src/main/java/com/couchbase/spring/cache/CouchbaseCache.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
similarity index 98%
rename from src/main/java/com/couchbase/spring/cache/CouchbaseCache.java
rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
index fd893c61..d155b83a 100644
--- a/src/main/java/com/couchbase/spring/cache/CouchbaseCache.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.cache;
+package org.springframework.data.couchbase.cache;
import com.couchbase.client.CouchbaseClient;
import net.spy.memcached.internal.OperationFuture;
diff --git a/src/main/java/com/couchbase/spring/cache/CouchbaseCacheManager.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
similarity index 98%
rename from src/main/java/com/couchbase/spring/cache/CouchbaseCacheManager.java
rename to src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
index 84ea176b..6bd42897 100644
--- a/src/main/java/com/couchbase/spring/cache/CouchbaseCacheManager.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.cache;
+package org.springframework.data.couchbase.cache;
import com.couchbase.client.CouchbaseClient;
import java.util.Collection;
diff --git a/src/main/java/com/couchbase/spring/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
similarity index 93%
rename from src/main/java/com/couchbase/spring/config/AbstractCouchbaseConfiguration.java
rename to src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
index fa1b21f7..ccfed8b0 100644
--- a/src/main/java/com/couchbase/spring/config/AbstractCouchbaseConfiguration.java
+++ b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
@@ -20,13 +20,9 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.config;
+package org.springframework.data.couchbase.config;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.core.CouchbaseMappingContext;
-import com.couchbase.spring.core.CouchbaseTemplate;
-import com.couchbase.spring.core.convert.MappingCouchbaseConverter;
-import com.couchbase.spring.core.mapping.Document;
import java.util.HashSet;
import java.util.Set;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -35,6 +31,10 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen
import org.springframework.context.annotation.Configuration;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.data.annotation.Persistent;
+import org.springframework.data.couchbase.core.CouchbaseMappingContext;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.mapping.Document;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
diff --git a/src/main/java/com/couchbase/spring/core/BucketCallback.java b/src/main/java/org/springframework/data/couchbase/core/BucketCallback.java
similarity index 54%
rename from src/main/java/com/couchbase/spring/core/BucketCallback.java
rename to src/main/java/org/springframework/data/couchbase/core/BucketCallback.java
index f00b6d34..d24a2ba0 100644
--- a/src/main/java/com/couchbase/spring/core/BucketCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/BucketCallback.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
public interface BucketCallback {
diff --git a/src/main/java/com/couchbase/spring/core/CouchbaseExceptionTranslator.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
similarity index 98%
rename from src/main/java/com/couchbase/spring/core/CouchbaseExceptionTranslator.java
rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
index 5f041beb..42fc17d1 100644
--- a/src/main/java/com/couchbase/spring/core/CouchbaseExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataAccessResourceFailureException;
diff --git a/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseMappingContext.java
similarity index 89%
rename from src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java
rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseMappingContext.java
index 14931167..1844f6c8 100644
--- a/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseMappingContext.java
@@ -20,16 +20,16 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
-import com.couchbase.spring.core.mapping.BasicCouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.BasicCouchbasePersistentProperty;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import org.springframework.data.couchbase.core.mapping.BasicCouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.BasicCouchbasePersistentProperty;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.mapping.context.AbstractMappingContext;
import org.springframework.data.mapping.model.SimpleTypeHolder;
import org.springframework.data.util.TypeInformation;
diff --git a/src/main/java/com/couchbase/spring/core/CouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
similarity index 97%
rename from src/main/java/com/couchbase/spring/core/CouchbaseOperations.java
rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
index 0067907d..4444ca19 100644
--- a/src/main/java/com/couchbase/spring/core/CouchbaseOperations.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
@@ -20,12 +20,13 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
-import com.couchbase.spring.core.convert.CouchbaseConverter;
import java.util.Collection;
+import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
+
public interface CouchbaseOperations {
/**
diff --git a/src/main/java/com/couchbase/spring/core/CouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
similarity index 94%
rename from src/main/java/com/couchbase/spring/core/CouchbaseTemplate.java
rename to src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
index 4cae39f0..66146409 100644
--- a/src/main/java/com/couchbase/spring/core/CouchbaseTemplate.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
import java.util.Collection;
import java.util.Collections;
@@ -30,14 +30,15 @@ import java.util.List;
import java.util.Set;
import net.spy.memcached.internal.OperationFuture;
+
+import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
+import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.mapping.ConvertedCouchbaseDocument;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.mapping.context.MappingContext;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.core.convert.CouchbaseConverter;
-import com.couchbase.spring.core.convert.MappingCouchbaseConverter;
-import com.couchbase.spring.core.mapping.ConvertedCouchbaseDocument;
-import com.couchbase.spring.core.mapping.CouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
public class CouchbaseTemplate implements CouchbaseOperations {
diff --git a/src/main/java/com/couchbase/spring/core/convert/AbstractCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
similarity index 97%
rename from src/main/java/com/couchbase/spring/core/convert/AbstractCouchbaseConverter.java
rename to src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
index ecc69ae8..f0ba375d 100644
--- a/src/main/java/com/couchbase/spring/core/convert/AbstractCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.convert;
+package org.springframework.data.couchbase.core.convert;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
diff --git a/src/main/java/com/couchbase/spring/core/convert/CouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
similarity index 83%
rename from src/main/java/com/couchbase/spring/core/convert/CouchbaseConverter.java
rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
index f0c06148..8f033c55 100644
--- a/src/main/java/com/couchbase/spring/core/convert/CouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
@@ -20,13 +20,13 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.convert;
+package org.springframework.data.couchbase.core.convert;
-import com.couchbase.spring.core.mapping.ConvertedCouchbaseDocument;
-import com.couchbase.spring.core.mapping.CouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.convert.EntityConverter;
import org.springframework.data.convert.EntityReader;
+import org.springframework.data.couchbase.core.mapping.ConvertedCouchbaseDocument;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
public interface CouchbaseConverter extends
EntityConverter,
diff --git a/src/main/java/com/couchbase/spring/core/convert/CouchbaseWriter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
similarity index 95%
rename from src/main/java/com/couchbase/spring/core/convert/CouchbaseWriter.java
rename to src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
index 99b4fd8e..4f18cef8 100644
--- a/src/main/java/com/couchbase/spring/core/convert/CouchbaseWriter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.convert;
+package org.springframework.data.couchbase.core.convert;
import org.springframework.data.convert.EntityWriter;
diff --git a/src/main/java/com/couchbase/spring/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
similarity index 96%
rename from src/main/java/com/couchbase/spring/core/convert/MappingCouchbaseConverter.java
rename to src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index 71ad8e74..ddf578df 100644
--- a/src/main/java/com/couchbase/spring/core/convert/MappingCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
@@ -20,11 +20,8 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.convert;
+package org.springframework.data.couchbase.core.convert;
-import com.couchbase.spring.core.mapping.ConvertedCouchbaseDocument;
-import com.couchbase.spring.core.mapping.CouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -38,6 +35,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.data.couchbase.core.mapping.ConvertedCouchbaseDocument;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.model.BeanWrapper;
import org.springframework.data.mapping.model.MappingException;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
similarity index 91%
rename from src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentEntity.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
index 941d7d84..819bfa04 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentEntity.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -52,8 +52,8 @@ public class BasicCouchbasePersistentEntity
}
public int getExpiry() {
- com.couchbase.spring.core.mapping.Document annotation =
- getType().getAnnotation(com.couchbase.spring.core.mapping.Document.class);
+ org.springframework.data.couchbase.core.mapping.Document annotation =
+ getType().getAnnotation(org.springframework.data.couchbase.core.mapping.Document.class);
if(annotation == null) {
return 0;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
similarity index 93%
rename from src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentProperty.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
index b2db7d6b..42834aa0 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentProperty.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
@@ -70,8 +70,8 @@ public class BasicCouchbasePersistentProperty
*/
@Override
public String getFieldName() {
- com.couchbase.spring.core.mapping.Field annotation = getField().
- getAnnotation(com.couchbase.spring.core.mapping.Field.class);
+ org.springframework.data.couchbase.core.mapping.Field annotation = getField().
+ getAnnotation(org.springframework.data.couchbase.core.mapping.Field.class);
return annotation != null && StringUtils.hasText(annotation.value())
? annotation.value() : field.getName();
diff --git a/src/main/java/com/couchbase/spring/core/mapping/ConvertedCouchbaseDocument.java b/src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
similarity index 98%
rename from src/main/java/com/couchbase/spring/core/mapping/ConvertedCouchbaseDocument.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
index 4ff45218..25534672 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/ConvertedCouchbaseDocument.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
similarity index 96%
rename from src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentEntity.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
index 1d42d104..019f0d7f 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentEntity.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
similarity index 96%
rename from src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentProperty.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
index cc26e5a2..6cbe0745 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/CouchbasePersistentProperty.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import org.springframework.data.mapping.PersistentProperty;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/Document.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
similarity index 96%
rename from src/main/java/com/couchbase/spring/core/mapping/Document.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
index 69792ba9..69c55634 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/Document.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/src/main/java/com/couchbase/spring/core/mapping/Field.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
similarity index 89%
rename from src/main/java/com/couchbase/spring/core/mapping/Field.java
rename to src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
index 8fe39a49..ca9ed366 100644
--- a/src/main/java/com/couchbase/spring/core/mapping/Field.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
diff --git a/src/main/java/com/couchbase/spring/monitor/AbstractMonitor.java b/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
similarity index 96%
rename from src/main/java/com/couchbase/spring/monitor/AbstractMonitor.java
rename to src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
index afc47c1d..fcd63450 100644
--- a/src/main/java/com/couchbase/spring/monitor/AbstractMonitor.java
+++ b/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.monitor;
+package org.springframework.data.couchbase.monitor;
import com.couchbase.client.CouchbaseClient;
import org.springframework.web.client.RestTemplate;
diff --git a/src/main/java/com/couchbase/spring/monitor/ClientInfo.java b/src/main/java/org/springframework/data/couchbase/monitor/ClientInfo.java
similarity index 97%
rename from src/main/java/com/couchbase/spring/monitor/ClientInfo.java
rename to src/main/java/org/springframework/data/couchbase/monitor/ClientInfo.java
index 85f29aef..6b356d59 100644
--- a/src/main/java/com/couchbase/spring/monitor/ClientInfo.java
+++ b/src/main/java/org/springframework/data/couchbase/monitor/ClientInfo.java
@@ -19,7 +19,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALING
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.monitor;
+package org.springframework.data.couchbase.monitor;
import com.couchbase.client.CouchbaseClient;
import org.springframework.jmx.export.annotation.ManagedAttribute;
diff --git a/src/main/java/com/couchbase/spring/monitor/ClusterInfo.java b/src/main/java/org/springframework/data/couchbase/monitor/ClusterInfo.java
similarity index 97%
rename from src/main/java/com/couchbase/spring/monitor/ClusterInfo.java
rename to src/main/java/org/springframework/data/couchbase/monitor/ClusterInfo.java
index 0c0a4f3d..2d224168 100644
--- a/src/main/java/com/couchbase/spring/monitor/ClusterInfo.java
+++ b/src/main/java/org/springframework/data/couchbase/monitor/ClusterInfo.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.monitor;
+package org.springframework.data.couchbase.monitor;
import com.couchbase.client.CouchbaseClient;
import org.springframework.http.converter.HttpMessageConverter;
diff --git a/src/main/java/com/couchbase/spring/repository/CouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
similarity index 84%
rename from src/main/java/com/couchbase/spring/repository/CouchbaseRepository.java
rename to src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
index 5c1d5595..8f942e64 100644
--- a/src/main/java/com/couchbase/spring/repository/CouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.repository;
+package org.springframework.data.couchbase.repository;
import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoriesRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
similarity index 90%
rename from src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoriesRegistrar.java
rename to src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
index c98f55e2..ccfe2068 100644
--- a/src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.repository.config;
+package org.springframework.data.couchbase.repository.config;
import org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport;
import org.springframework.data.repository.config.RepositoryConfigurationExtension;
diff --git a/src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
similarity index 90%
rename from src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoryConfigurationExtension.java
rename to src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
index 1e0f9e2f..6be346c1 100644
--- a/src/main/java/com/couchbase/spring/repository/config/CouchbaseRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
@@ -1,10 +1,10 @@
-package com.couchbase.spring.repository.config;
+package org.springframework.data.couchbase.repository.config;
-import com.couchbase.spring.repository.support.CouchbaseRepositoryFactoryBean;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.couchbase.repository.support.CouchbaseRepositoryFactoryBean;
import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
diff --git a/src/main/java/com/couchbase/spring/repository/config/EnableCouchbaseRepositories.java b/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
similarity index 95%
rename from src/main/java/com/couchbase/spring/repository/config/EnableCouchbaseRepositories.java
rename to src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
index 49467cdf..62c65093 100644
--- a/src/main/java/com/couchbase/spring/repository/config/EnableCouchbaseRepositories.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
@@ -1,9 +1,9 @@
-package com.couchbase.spring.repository.config;
+package org.springframework.data.couchbase.repository.config;
-import com.couchbase.spring.repository.support.CouchbaseRepositoryFactoryBean;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.data.couchbase.repository.support.CouchbaseRepositoryFactoryBean;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/src/main/java/com/couchbase/spring/repository/query/CouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
similarity index 77%
rename from src/main/java/com/couchbase/spring/repository/query/CouchbaseEntityInformation.java
rename to src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
index 12f42573..06928153 100644
--- a/src/main/java/com/couchbase/spring/repository/query/CouchbaseEntityInformation.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.repository.query;
+package org.springframework.data.couchbase.repository.query;
import org.springframework.data.repository.core.EntityInformation;
diff --git a/src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactory.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
similarity index 82%
rename from src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactory.java
rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
index 13ee8ec0..0d7abdfa 100644
--- a/src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
@@ -1,10 +1,10 @@
-package com.couchbase.spring.repository.support;
+package org.springframework.data.couchbase.repository.support;
-import com.couchbase.spring.core.CouchbaseOperations;
-import com.couchbase.spring.core.mapping.CouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
-import com.couchbase.spring.repository.query.CouchbaseEntityInformation;
+import org.springframework.data.couchbase.core.CouchbaseOperations;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
+import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.model.MappingException;
import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
similarity index 89%
rename from src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactoryBean.java
rename to src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
index d85e4254..6293cf2a 100644
--- a/src/main/java/com/couchbase/spring/repository/support/CouchbaseRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
@@ -1,7 +1,7 @@
-package com.couchbase.spring.repository.support;
+package org.springframework.data.couchbase.repository.support;
-import com.couchbase.spring.core.CouchbaseOperations;
+import org.springframework.data.couchbase.core.CouchbaseOperations;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
import org.springframework.data.repository.core.support.RepositoryFactorySupport;
diff --git a/src/main/java/com/couchbase/spring/repository/support/MappingCouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
similarity index 76%
rename from src/main/java/com/couchbase/spring/repository/support/MappingCouchbaseEntityInformation.java
rename to src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
index 0cd524b1..9c76bc74 100644
--- a/src/main/java/com/couchbase/spring/repository/support/MappingCouchbaseEntityInformation.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
@@ -1,8 +1,8 @@
-package com.couchbase.spring.repository.support;
+package org.springframework.data.couchbase.repository.support;
-import com.couchbase.spring.core.mapping.CouchbasePersistentEntity;
-import com.couchbase.spring.core.mapping.CouchbasePersistentProperty;
-import com.couchbase.spring.repository.query.CouchbaseEntityInformation;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
+import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;
import org.springframework.data.mapping.model.BeanWrapper;
import org.springframework.data.repository.core.support.AbstractEntityInformation;
diff --git a/src/main/java/com/couchbase/spring/repository/support/SimpleCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
similarity index 90%
rename from src/main/java/com/couchbase/spring/repository/support/SimpleCouchbaseRepository.java
rename to src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
index 7ca9155b..a89302e5 100644
--- a/src/main/java/com/couchbase/spring/repository/support/SimpleCouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
@@ -1,8 +1,8 @@
-package com.couchbase.spring.repository.support;
+package org.springframework.data.couchbase.repository.support;
-import com.couchbase.spring.core.CouchbaseOperations;
-import com.couchbase.spring.repository.CouchbaseRepository;
-import com.couchbase.spring.repository.query.CouchbaseEntityInformation;
+import org.springframework.data.couchbase.core.CouchbaseOperations;
+import org.springframework.data.couchbase.repository.CouchbaseRepository;
+import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;
import org.springframework.util.Assert;
import java.io.Serializable;
diff --git a/src/test/java/com/couchbase/spring/repository/UserRepository.java b/src/test/java/com/couchbase/spring/repository/UserRepository.java
deleted file mode 100644
index 655a7090..00000000
--- a/src/test/java/com/couchbase/spring/repository/UserRepository.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.couchbase.spring.repository;
-
-
-public interface UserRepository extends CouchbaseRepository{
-
-}
diff --git a/src/test/java/com/couchbase/spring/TestApplicationConfig.java b/src/test/java/org/springframework/data/couchbase/TestApplicationConfig.java
similarity index 94%
rename from src/test/java/com/couchbase/spring/TestApplicationConfig.java
rename to src/test/java/org/springframework/data/couchbase/TestApplicationConfig.java
index 4aba2b8c..ec88b213 100644
--- a/src/test/java/com/couchbase/spring/TestApplicationConfig.java
+++ b/src/test/java/org/springframework/data/couchbase/TestApplicationConfig.java
@@ -20,10 +20,9 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring;
+package org.springframework.data.couchbase;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.config.AbstractCouchbaseConfiguration;
import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
@@ -31,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
+import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
@Configuration
public class TestApplicationConfig extends AbstractCouchbaseConfiguration {
diff --git a/src/test/java/com/couchbase/spring/cache/CouchbaseCacheManagerTest.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java
similarity index 92%
rename from src/test/java/com/couchbase/spring/cache/CouchbaseCacheManagerTest.java
rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java
index da538f87..7c59a246 100644
--- a/src/test/java/com/couchbase/spring/cache/CouchbaseCacheManagerTest.java
+++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheManagerTest.java
@@ -20,15 +20,16 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.cache;
+package org.springframework.data.couchbase.cache;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
import java.util.HashMap;
import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.cache.CouchbaseCacheManager;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/cache/CouchbaseCacheTest.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java
similarity index 94%
rename from src/test/java/com/couchbase/spring/cache/CouchbaseCacheTest.java
rename to src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java
index 1e149c8f..064d3017 100644
--- a/src/test/java/com/couchbase/spring/cache/CouchbaseCacheTest.java
+++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheTest.java
@@ -20,15 +20,16 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.cache;
+package org.springframework.data.couchbase.cache;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache.ValueWrapper;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.cache.CouchbaseCache;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/config/AbstractCouchbaseConfigurationTest.java b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java
similarity index 90%
rename from src/test/java/com/couchbase/spring/config/AbstractCouchbaseConfigurationTest.java
rename to src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java
index 2604755b..26e22554 100644
--- a/src/test/java/com/couchbase/spring/config/AbstractCouchbaseConfigurationTest.java
+++ b/src/test/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfigurationTest.java
@@ -20,16 +20,17 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.config;
+package org.springframework.data.couchbase.config;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
-import com.couchbase.spring.core.mapping.Document;
import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
+import org.springframework.data.couchbase.core.mapping.Document;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/core/Beer.java b/src/test/java/org/springframework/data/couchbase/core/Beer.java
similarity index 91%
rename from src/test/java/com/couchbase/spring/core/Beer.java
rename to src/test/java/org/springframework/data/couchbase/core/Beer.java
index 44a9d5ad..42c38179 100644
--- a/src/test/java/com/couchbase/spring/core/Beer.java
+++ b/src/test/java/org/springframework/data/couchbase/core/Beer.java
@@ -20,11 +20,12 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.core.mapping.Field;
-import com.couchbase.spring.core.mapping.Field;
/**
* Test class for persisting and loading from {@link CouchbaseTemplate}.
diff --git a/src/test/java/com/couchbase/spring/core/CouchbaseTemplateTest.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
similarity index 95%
rename from src/test/java/com/couchbase/spring/core/CouchbaseTemplateTest.java
rename to src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
index db6cec9f..750abf5c 100644
--- a/src/test/java/com/couchbase/spring/core/CouchbaseTemplateTest.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
@@ -20,18 +20,19 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core;
+package org.springframework.data.couchbase.core;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
-import com.couchbase.spring.core.mapping.Document;
-import com.couchbase.spring.core.mapping.Field;
import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.core.mapping.Field;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentPropertyTest.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java
similarity index 86%
rename from src/test/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentPropertyTest.java
rename to src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java
index 6766b9f2..c2d9bd2e 100644
--- a/src/test/java/com/couchbase/spring/core/mapping/BasicCouchbasePersistentPropertyTest.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTest.java
@@ -20,13 +20,17 @@
* IN THE SOFTWARE.
*/
-package com.couchbase.spring.core.mapping;
+package org.springframework.data.couchbase.core.mapping;
import java.lang.reflect.Field;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.core.mapping.BasicCouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.BasicCouchbasePersistentProperty;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
import org.springframework.data.mapping.model.SimpleTypeHolder;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.util.ReflectionUtils;
@@ -87,7 +91,7 @@ public class BasicCouchbasePersistentPropertyTest {
@Id
private String id;
- @com.couchbase.spring.core.mapping.Field("foobar")
+ @org.springframework.data.couchbase.core.mapping.Field("foobar")
String name;
String description;
diff --git a/src/test/java/com/couchbase/spring/monitor/ClientInfoTest.java b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java
similarity index 82%
rename from src/test/java/com/couchbase/spring/monitor/ClientInfoTest.java
rename to src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java
index fbd98f11..e4149bb2 100644
--- a/src/test/java/com/couchbase/spring/monitor/ClientInfoTest.java
+++ b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTest.java
@@ -1,11 +1,12 @@
-package com.couchbase.spring.monitor;
+package org.springframework.data.couchbase.monitor;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.monitor.ClientInfo;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/monitor/ClusterInfoTest.java b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java
similarity index 83%
rename from src/test/java/com/couchbase/spring/monitor/ClusterInfoTest.java
rename to src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java
index 3fc41317..3c24011b 100644
--- a/src/test/java/com/couchbase/spring/monitor/ClusterInfoTest.java
+++ b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTest.java
@@ -1,11 +1,12 @@
-package com.couchbase.spring.monitor;
+package org.springframework.data.couchbase.monitor;
import com.couchbase.client.CouchbaseClient;
-import com.couchbase.spring.TestApplicationConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.monitor.ClusterInfo;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/repository/SimpleCouchbaseRepositoryTest.java b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java
similarity index 83%
rename from src/test/java/com/couchbase/spring/repository/SimpleCouchbaseRepositoryTest.java
rename to src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java
index a6ae5999..a847aa93 100644
--- a/src/test/java/com/couchbase/spring/repository/SimpleCouchbaseRepositoryTest.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/SimpleCouchbaseRepositoryTest.java
@@ -1,11 +1,11 @@
-package com.couchbase.spring.repository;
+package org.springframework.data.couchbase.repository;
-import com.couchbase.spring.TestApplicationConfig;
-import com.couchbase.spring.core.CouchbaseTemplate;
-import com.couchbase.spring.repository.support.CouchbaseRepositoryFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.TestApplicationConfig;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.repository.support.CouchbaseRepositoryFactory;
import org.springframework.data.repository.core.support.RepositoryFactorySupport;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/couchbase/spring/repository/User.java b/src/test/java/org/springframework/data/couchbase/repository/User.java
similarity index 90%
rename from src/test/java/com/couchbase/spring/repository/User.java
rename to src/test/java/org/springframework/data/couchbase/repository/User.java
index f17a5c54..3feef4a5 100644
--- a/src/test/java/com/couchbase/spring/repository/User.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/User.java
@@ -1,4 +1,4 @@
-package com.couchbase.spring.repository;
+package org.springframework.data.couchbase.repository;
import org.springframework.data.annotation.Id;
diff --git a/src/test/java/org/springframework/data/couchbase/repository/UserRepository.java b/src/test/java/org/springframework/data/couchbase/repository/UserRepository.java
new file mode 100644
index 00000000..0e68c85f
--- /dev/null
+++ b/src/test/java/org/springframework/data/couchbase/repository/UserRepository.java
@@ -0,0 +1,8 @@
+package org.springframework.data.couchbase.repository;
+
+import org.springframework.data.couchbase.repository.CouchbaseRepository;
+
+
+public interface UserRepository extends CouchbaseRepository{
+
+}