Moved stuff around to be more Alfresco standard.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/AVMAspectName.java

@@ -23,7 +23,7 @@ import org.alfresco.service.namespace.QName;
  * Interface to Aspect names on AVM nodes.
  * @author britt
  */
-interface AVMAspectName
+public interface AVMAspectName
 {
     /**
      * Set the node that has the Aspect. 

source/java/org/alfresco/repo/avm/AVMAspectNameDAO.java

@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * DAO for AVMAspectNames.
  * @author britt
  */
-interface AVMAspectNameDAO
+public interface AVMAspectNameDAO
 {
     /**
      * Persist an aspect name.

source/java/org/alfresco/repo/avm/AVMContext.java

@@ -5,11 +5,11 @@ package org.alfresco.repo.avm;
 
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 

source/java/org/alfresco/repo/avm/AVMCrawler.java

@@ -26,6 +26,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+
 
 /**
  * This is another tester designed to emulate more typical use patterns.

source/java/org/alfresco/repo/avm/AVMInterpreter.java

@@ -32,6 +32,10 @@ import java.util.Map;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.util.BulkLoader;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;

source/java/org/alfresco/repo/avm/AVMNode.java

@@ -20,13 +20,14 @@ import java.util.Map;
 
 import org.alfresco.repo.domain.DbAccessControlList;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.namespace.QName;
 
 /**
  * The Interface for versionable objects.
  * @author britt
  */
-interface AVMNode
+public interface AVMNode
 {
     /**
      * Set the ancestor of this node.

source/java/org/alfresco/repo/avm/AVMNodeConverter.java

@@ -17,6 +17,7 @@
 
 package org.alfresco.repo.avm;
 
+import org.alfresco.service.cmr.avm.AVMException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.apache.log4j.Logger;

source/java/org/alfresco/repo/avm/AVMNodeImpl.java

@@ -30,7 +30,7 @@ import org.alfresco.service.namespace.QName;
  * Base class for all repository file system like objects.
  * @author britt
  */
-abstract class AVMNodeImpl implements AVMNode, Serializable
+public abstract class AVMNodeImpl implements AVMNode, Serializable
 {
     /**
      * The Object ID.

source/java/org/alfresco/repo/avm/AVMNodeProperty.java

@@ -24,7 +24,7 @@ import org.alfresco.service.namespace.QName;
  * Alfresco Properties for AVM..
  * @author britt
  */
-interface AVMNodeProperty
+public interface AVMNodeProperty
 {
     /**
      * Set the node that owns this property.

source/java/org/alfresco/repo/avm/AVMNodePropertyDAO.java

@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * DAO for AVMNodeProperty.
  * @author britt
  */
-interface AVMNodePropertyDAO
+public interface AVMNodePropertyDAO
 {
     /**
      * Save the given AVMNodeProperty.

source/java/org/alfresco/repo/avm/AVMNodeService.java

@@ -31,6 +31,13 @@ import java.util.SortedMap;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.node.AbstractNodeServiceImpl;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.InvalidAspectException;

source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java

@@ -25,7 +25,7 @@ import org.hibernate.proxy.HibernateProxy;
  * types are fundamentally broken.
  * @author britt
  */
-class AVMNodeUnwrapper
+public class AVMNodeUnwrapper
 {
     public static AVMNode Unwrap(AVMNode node)
     {

source/java/org/alfresco/repo/avm/AVMRemote.java

@@ -23,6 +23,10 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.namespace.QName;
 
 /**

source/java/org/alfresco/repo/avm/AVMRemoteImpl.java

@@ -28,6 +28,12 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.GUID;
 

source/java/org/alfresco/repo/avm/AVMRepository.java

@@ -27,6 +27,15 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 

source/java/org/alfresco/repo/avm/AVMServiceImpl.java

@@ -29,6 +29,16 @@ import java.util.SortedMap;
 
 import org.alfresco.repo.avm.AVMRepository;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.TempFileProvider;

source/java/org/alfresco/repo/avm/AVMServiceTest.java

@@ -31,6 +31,11 @@ import java.util.TreeMap;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.util.BulkLoader;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.namespace.QName;
 
 /**

source/java/org/alfresco/repo/avm/AVMServiceTestBase.java

@@ -24,6 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import junit.framework.TestCase;

source/java/org/alfresco/repo/avm/AVMStore.java

@@ -25,6 +25,9 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 
@@ -33,7 +36,7 @@ import org.alfresco.service.namespace.QName;
  * and layering operations.
  * @author britt
  */
-interface AVMStore
+public interface AVMStore
 {
     /**
      * This returns the next version in this store that will be snapshotted.

source/java/org/alfresco/repo/avm/AVMStoreDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for Repositories.
  * @author britt
  */
-interface AVMStoreDAO
+public interface AVMStoreDAO
 {
     /**
      * Save an AVMStore, never before saved.

source/java/org/alfresco/repo/avm/AVMStoreImpl.java

@@ -31,6 +31,14 @@ import java.util.TreeMap;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -46,7 +54,7 @@ import org.alfresco.service.namespace.QName;
  * operation.
  * @author britt
  */
-class AVMStoreImpl implements AVMStore, Serializable
+public class AVMStoreImpl implements AVMStore, Serializable
 {
     static final long serialVersionUID = -1485972568675732904L;
 

source/java/org/alfresco/repo/avm/AVMStoreProperty.java

@@ -24,7 +24,7 @@ import org.alfresco.service.namespace.QName;
  * Arbitrary properties associated with AVMStores.
  * @author britt
  */
-interface AVMStoreProperty
+public interface AVMStoreProperty
 {
     /**
      * Set the AVMStore.

source/java/org/alfresco/repo/avm/AVMStorePropertyDAO.java

@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * The DAO interface for AVMStoreProperties.
  * @author britt
  */
-interface AVMStorePropertyDAO
+public interface AVMStorePropertyDAO
 {
     /**
      * Persist a property.

source/java/org/alfresco/repo/avm/AVMTestRemote.java

@@ -19,6 +19,8 @@ package org.alfresco.repo.avm;
 
 import java.util.List;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import junit.framework.TestCase;

source/java/org/alfresco/repo/avm/AVMTester.java

@@ -28,6 +28,14 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+
 /**
  * This is a Runnable which randomly performs operations on an AVM Repository.
  * It's purpose is to act as a single thread in a multithreaded stress tester.

source/java/org/alfresco/repo/avm/ChildEntry.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * This interface represents an entry in a directory.
  * @author britt
  */
-interface ChildEntry
+public interface ChildEntry
 {
     /**
      * Set the name of the child. 

source/java/org/alfresco/repo/avm/ChildEntryDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for ChildEntries.
  * @author britt
  */
-interface ChildEntryDAO
+public interface ChildEntryDAO
 {
     /**
      * Save an unsaved ChildEntry.

source/java/org/alfresco/repo/avm/DeletedChild.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Interface to a deleted directory entry in a layered directory.
  * @author britt
  */
-interface DeletedChild
+public interface DeletedChild
 {
     /**
      * Get the name of the deleted child.

source/java/org/alfresco/repo/avm/DeletedChildDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for DeletedChildren.
  * @author britt
  */
-interface DeletedChildDAO
+public interface DeletedChildDAO
 {
     /**
      * Save an unsaved DeletedChild.

source/java/org/alfresco/repo/avm/DirectoryNode.java

@@ -20,11 +20,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * The interface for Directory Nodes.
  * @author britt
  */
-interface DirectoryNode extends AVMNode
+public interface DirectoryNode extends AVMNode
 {
     /**
      * Does this directory directly contain the specified node.

source/java/org/alfresco/repo/avm/HistoryLink.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Interface for the ancestor-descendent relationship.
  * @author britt
  */
-interface HistoryLink
+public interface HistoryLink
 {
     /**
      * Set the ancestor part of this.

source/java/org/alfresco/repo/avm/HistoryLinkDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for history links.
  * @author britt
  */
-interface HistoryLinkDAO
+public interface HistoryLinkDAO
 {
     /**
      * Save and unsaved HistoryLink.

source/java/org/alfresco/repo/avm/IssuerDAO.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * DAO for Issuers.
  * @author britt
  */
-interface IssuerDAO
+public interface IssuerDAO
 {
     /**
      * Get the Issuer value.

source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java

@@ -6,7 +6,7 @@ import java.util.List;
  * Interface for Layered Directories.
  * @author britt
  */
-interface LayeredDirectoryNode extends DirectoryNode, Layered
+public interface LayeredDirectoryNode extends DirectoryNode, Layered
 {
     /**
      * Does this node have a primary indirection.

source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java

@@ -24,6 +24,11 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * A layered directory node.  A layered directory node points at
  * an underlying directory, which may or may not exist.  The visible

source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java

@@ -17,6 +17,8 @@
 
 package org.alfresco.repo.avm;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 
 /**

source/java/org/alfresco/repo/avm/MergeLink.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * This is the interface for the merged from - to relationship.
  * @author britt
  */
-interface MergeLink
+public interface MergeLink
 {
     /**
      * Set the from part.

source/java/org/alfresco/repo/avm/MergeLinkDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for MergeLinks.
  * @author britt
  */
-interface MergeLinkDAO
+public interface MergeLinkDAO
 {
     /**
      * Save an unsaved MergeLink.

source/java/org/alfresco/repo/avm/NewInAVMStore.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Eensy-weensy interface for tracking nodes that are new in a store. 
  * @author britt
  */
-interface NewInAVMStore
+public interface NewInAVMStore
 {
     /**
      * Get the AVMStore part.

source/java/org/alfresco/repo/avm/NewInAVMStoreDAO.java

@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for NewInAVMStore markers.
  * @author britt
  */
-interface NewInAVMStoreDAO
+public interface NewInAVMStoreDAO
 {
     /**
      * Save one.

source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java

@@ -24,6 +24,9 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * A plain directory.  No monkey tricks except for possiblyCopy.
  * @author britt

source/java/org/alfresco/repo/avm/PlainFileNodeImpl.java

@@ -20,6 +20,8 @@ package org.alfresco.repo.avm;
 import java.util.Map;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.namespace.QName;

source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java

@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Worker object for AVM Retrying Transactions.
  * @author britt
  */
-interface RetryingTransactionCallback
+public interface RetryingTransactionCallback
 {
     /**
      * Do our work.

source/java/org/alfresco/repo/avm/RetryingTransactionHelper.java

@@ -6,7 +6,7 @@ package org.alfresco.repo.avm;
  * when a transaction fails for synchronization reasons.
  * @author britt
  */
-interface RetryingTransactionHelper
+public interface RetryingTransactionHelper
 {
     /**
      * Perform a set of operations under a single transaction.

source/java/org/alfresco/repo/avm/VersionRoot.java

@@ -20,7 +20,7 @@ package org.alfresco.repo.avm;
  * Represents a single version root.
  * @author britt
  */
-interface VersionRoot
+public interface VersionRoot
 {
     /**
      * @return the createDate

source/java/org/alfresco/repo/avm/VersionRootDAO.java

@@ -24,7 +24,7 @@ import java.util.List;
  * DAO for VersionRoot objects.
  * @author britt
  */
-interface VersionRootDAO
+public interface VersionRootDAO
 {
     /**
      * Save an unsaved VersionRoot.

source/java/org/alfresco/repo/avm/hibernate/AVMAspectNameDAOHibernate.java

@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMAspectName;
+import org.alfresco.repo.avm.AVMAspectNameDAO;
+import org.alfresco.repo.avm.AVMNode;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java

@@ -15,10 +15,16 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMNodeDAO;
+import org.alfresco.repo.avm.AVMNodeImpl;
+import org.alfresco.repo.avm.AVMNodeUnwrapper;
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.DirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java

@@ -1,7 +1,10 @@
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMNodeProperty;
+import org.alfresco.repo.avm.AVMNodePropertyDAO;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java

@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.AVMStoreDAO;
+import org.alfresco.repo.avm.AVMStoreImpl;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java

@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.AVMStoreProperty;
+import org.alfresco.repo.avm.AVMStorePropertyDAO;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;

source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java

@@ -15,11 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
-import java.io.Serializable;
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.ChildEntry;
+import org.alfresco.repo.avm.ChildEntryDAO;
+import org.alfresco.repo.avm.DirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java

@@ -15,10 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.DeletedChild;
+import org.alfresco.repo.avm.DeletedChildDAO;
+import org.alfresco.repo.avm.LayeredDirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java

@@ -14,10 +14,11 @@
  * language governing permissions and limitations under the
  * License.
  */
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.sql.SQLException;
 
+import org.alfresco.repo.avm.RetryingTransactionCallback;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.springframework.orm.hibernate3.HibernateCallback;

source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransactionHelper.java

@@ -1,4 +1,4 @@
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 /*
  * Copyright (C) 2006 Alfresco, Inc.
@@ -19,6 +19,10 @@ package org.alfresco.repo.avm;
 
 import java.util.Random;
 
+import org.alfresco.repo.avm.RetryingTransactionCallback;
+import org.alfresco.repo.avm.RetryingTransactionHelper;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
 import org.apache.log4j.Logger;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.DeadlockLoserDataAccessException;

source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java

@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.HistoryLink;
+import org.alfresco.repo.avm.HistoryLinkDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java

@@ -15,9 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 
+import org.alfresco.repo.avm.IssuerDAO;
+import org.alfresco.service.cmr.avm.AVMException;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**

source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java

@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.MergeLink;
+import org.alfresco.repo.avm.MergeLinkDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java

@@ -15,10 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.NewInAVMStore;
+import org.alfresco.repo.avm.NewInAVMStoreDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java

@@ -15,11 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.Date;
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.VersionRoot;
+import org.alfresco.repo.avm.VersionRootDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 

source/java/org/alfresco/repo/avm/util/BulkLoader.java

@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.alfresco.repo.avm.AVMException;
-import org.alfresco.repo.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMService;
 
 /**
  * This takes a filesystem directory path and a repository path and name

source/java/org/alfresco/repo/content/RoutingContentService.java

@@ -25,7 +25,6 @@ import java.util.Set;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.avm.AVMService;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentReadPolicy;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
 import org.alfresco.repo.content.filestore.FileContentStore;
@@ -35,6 +34,7 @@ import org.alfresco.repo.content.transform.magick.ImageMagickContentTransformer;
 import org.alfresco.repo.policy.ClassPolicyDelegate;
 import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;

source/java/org/alfresco/service/cmr/avm/AVMBadArgumentException.java

@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when bad or illegal arguments are passed.

source/java/org/alfresco/service/cmr/avm/AVMCycleException.java

@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when a cycle is detected during lookup.

source/java/org/alfresco/service/cmr/avm/AVMException.java

@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 

source/java/org/alfresco/service/cmr/avm/AVMExistsException.java

@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when a node exists and shouldn't.

source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java

@@ -15,10 +15,12 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 
+import org.alfresco.repo.avm.AVMNodeType;
+
 /**
  * This class describes an AVM node object.  
  * It serves a similar purpose to the data structure

source/java/org/alfresco/service/cmr/avm/AVMNotFoundException.java

@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is the exception thrown when a node is not found.

source/java/org/alfresco/service/cmr/avm/AVMService.java

@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.InputStream;
 import java.io.OutputStream;

source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java

@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 import java.util.Date;

source/java/org/alfresco/service/cmr/avm/AVMWrongTypeException.java

@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * Thrown when an object of the wrong type is looked up.

source/java/org/alfresco/service/cmr/avm/LayeringDescriptor.java

@@ -15,10 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 
+
 /**
  * A value class containing information about the layering state of a looked up
  * node.

source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java

@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 import java.util.Date;