entityClass, Field f) throws DataAccessException;
-
-}
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/GeneratedFieldForeignStoreKeyManager.java b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/GeneratedFieldForeignStoreKeyManager.java
deleted file mode 100644
index 8a8209bb2..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/GeneratedFieldForeignStoreKeyManager.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.springframework.persistence;
-
-import java.lang.reflect.Field;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-
-/**
- * Stores keys in generated additional persistent fields
- * that Roo will add. e.g.
- *
- *
- * atForeignStore
- * Person Person;
- *
- * long person_id;
- *
- *
- * @author
- *
- */
-public class GeneratedFieldForeignStoreKeyManager extends
- OrderedForeignStoreKeyManager {
-
- private final Log log = LogFactory.getLog(getClass());
-
-
- @Override
- public Object findForeignStoreKey(Roo_GeneratedForeignStoreKeys entity, Field foreignStore, Class requiredClass)
- throws DataAccessException {
- String methodName = "get" + propertyName(foreignStore);
- Object key = RooConventionEntityOperations.invokeNoArgMethod(entity.getClass(), methodName, entity);
- log.info("FIND foreign store property " + foreignStore + " <- Entity generated String property [" + methodName + "] returned [" + key + "]");
- return key;
- }
-
- @Override
- public void storeForeignStoreKey(Roo_GeneratedForeignStoreKeys entity, Field foreignStore,
- Object key) throws DataAccessException {
- String methodName = "set" + propertyName(foreignStore);
- RooConventionEntityOperations.invoke(entity.getClass(), methodName, entity, new Class[] { key.getClass()}, key);
- log.info("STORE foreign store property " + foreignStore + " -> Entity generated String property [" + methodName + "] with key value [" + key + "]");
- }
-
- @Override
- public void clearForeignStoreKey(Roo_GeneratedForeignStoreKeys entity, Field foreignStore, Class keyClass) throws DataAccessException {
- String methodName = "set" + propertyName(foreignStore);
- RooConventionEntityOperations.invoke(entity.getClass(), methodName, entity, new Class[] { keyClass }, null);
- log.info("CKEAR foreign store property " + foreignStore + " -> Entity generated String property [" + methodName + "]");
- }
-
-
- @Override
- public boolean isSupportedField(Class clazz, Field f) {
- // Check for marker interface
- return Roo_GeneratedForeignStoreKeys.class.isAssignableFrom(clazz);
- }
-
-
- private String propertyName(Field f) {
- return "_" + f.getName() + "_Id";
- }
-
-}
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/InvalidFieldAnnotationException.java b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/InvalidFieldAnnotationException.java
deleted file mode 100644
index 3741b96c2..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/InvalidFieldAnnotationException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.springframework.persistence;
-
-import java.lang.reflect.Field;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-
-/**
- * Exception thrown on an attempt to use a field with an invalid
- * RelatedEntity annotation.
- *
- * @author Rod Johnson
- */
-public class InvalidFieldAnnotationException extends
- InvalidDataAccessApiUsageException {
-
- public InvalidFieldAnnotationException(Class entityClass, Field f, String reason) {
- super("Field [" + f.getName() + "] has invalid RelatedEntity annotation: reason='" + reason + "'", null);
- }
-
-}
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/JpaEntityForeignStoreFieldTransience.aj b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/JpaEntityForeignStoreFieldTransience.aj
deleted file mode 100644
index 05b6f47d2..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/JpaEntityForeignStoreFieldTransience.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.springframework.persistence;
-
-import javax.persistence.Transient;
-import javax.persistence.Entity;
-
-/**
- * Aspect to annotate @ForeignStore fields as JPA @Transient to stop
- * JPA trying to manage them itself
- * @author Rod Johnson
- *
- */
-public privileged aspect JpaEntityForeignStoreFieldTransience {
-
- declare @field : @RelatedEntity * (@Entity *).* : @Transient;
-
-
-}
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/MappingValidator.java b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/MappingValidator.java
deleted file mode 100644
index 8143d0543..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/MappingValidator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.springframework.persistence;
-
-import java.lang.reflect.Field;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-
-/**
- * Interface to validate RelatedAnnotation annotation usage
- * and other mapping constructs.
- *
- * @author Rod Johnson
- *
- */
-public interface MappingValidator {
-
- void validateGet(Class entityClass, Field f, RelatedEntity re) throws InvalidDataAccessApiUsageException;
-
- void validateSetTo(Class entityClass, Field f, RelatedEntity re, Object newVal) throws InvalidDataAccessApiUsageException, IllegalArgumentException;
-
-}
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedEntityOperations.java b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedEntityOperations.java
deleted file mode 100644
index e1cf11a83..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedEntityOperations.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.springframework.persistence;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.core.Ordered;
-import org.springframework.dao.DataAccessException;
-
-/**
- * Convenient base class for EntityOperations implementations
- * that adds ordering support.
- * @author Rod Johnson
- *
- * @param
- * @param
- */
-public abstract class OrderedEntityOperations implements EntityOperations, Ordered {
-
- protected final Log log = LogFactory.getLog(getClass());
-
- private int order = Integer.MAX_VALUE;
-
- @Override
- public int getOrder() {
- return this.order;
- }
-
- public void setOrder(int order) {
- this.order = order;
- }
-
- /**
- * Convenient default. Subclasses with non-Long key types can override this if they wish.
- */
- @Override
- public Class uniqueKeyType(Class entityClass) throws DataAccessException {
- return Long.class;
- }
-}
\ No newline at end of file
diff --git a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedForeignStoreKeyManager.java b/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedForeignStoreKeyManager.java
deleted file mode 100644
index c4211a01a..000000000
--- a/spring-data-commons-aspects/src/main/java/org/springframework/persistence/OrderedForeignStoreKeyManager.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.springframework.persistence;
-
-import java.lang.reflect.Field;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.core.Ordered;
-import org.springframework.dao.DataAccessException;
-
-/**
- * Convenient base class for ForeignStoreKeyManager implementations that adds
- * ordering support.
- *
- * @author Rod Johnson
- */
-public abstract class OrderedForeignStoreKeyManager implements ForeignStoreKeyManager, Ordered {
-
- protected final Log log = LogFactory.getLog(getClass());
-
- private int order = Integer.MAX_VALUE;
-
- @Override
- public int getOrder() {
- return this.order;
- }
-
- public void setOrder(int order) {
- this.order = order;
- }
-
- /**
- * Subclasses can override if they support collection management.
- */
- @Override
- public Set findForeignStoreKeySet(T entity, Field foreignStore, Class keyClass) throws DataAccessException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void storeForeignStoreKeySet(T entity, Field foreignStore, Set