DATACOUCH-3 - Renamed base package to org.springframework.data.couchbase.

README.md

@@ -146,7 +146,7 @@ Look at the folling bean configuration, which we'll break down afterwards:
       <constructor-arg name="pwd" value="" />
     </bean>
 
-   <bean id="cacheManager" class="com.couchbase.spring.cache.CouchbaseCacheManager">
+   <bean id="cacheManager" class="org.springframework.data.couchbase.cache.CouchbaseCacheManager">
     <constructor-arg>
         <util:map>
             <entry key="default" value-ref="couchbaseClient" />
@@ -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;
 

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;

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;

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;
 

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<T> {

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;

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;

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 {
 
   /**

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 {
 

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;

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<CouchbasePersistentEntity<?>,

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;
 

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;

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<T>
   }
   
   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;

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();

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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;
 

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;

src/test/java/com/couchbase/spring/repository/UserRepository.java

@@ -1,6 +0,0 @@
-package com.couchbase.spring.repository;
-
-
-public interface UserRepository extends CouchbaseRepository<User, String>{
-
-}

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 {

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;
 

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;
 

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;
 

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}.

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;
 

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;

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;
 

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;
 

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;

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;
 

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<User, String>{
+
+}