ALF-2031 - DR and VT can't start

- undeleted and reinstated use of org.alfresco.util.Pair
   - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
   - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/attributes/AttributeService.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.repo.attributes.Attribute;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * This provides services for reading, writing, and querying global attributes.

source/java/org/alfresco/service/cmr/audit/AuditQueryParameters.java

@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Parameters controlling audit queries.

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

@@ -32,7 +32,7 @@ import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Service interface for the Alfresco Versioning Model (AVM).<br>

source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java

@@ -21,7 +21,7 @@ package org.alfresco.service.cmr.avm.deploy;
 
 import java.io.Serializable;
 
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Interface for Deployment Events.

source/java/org/alfresco/service/cmr/remote/AVMRemote.java

@@ -36,7 +36,7 @@ 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.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Remote interface for Alfresco Versioning Model (AVM).<br>

source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java

@@ -32,7 +32,7 @@ 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.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * This is the actual remote interface that is wrapped by

source/java/org/alfresco/service/cmr/remote/AttributeServiceTransport.java

@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.alfresco.repo.attributes.Attribute;
 import org.alfresco.service.cmr.attributes.AttrQuery;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * The transport wrapper for remoted AttributeService.

source/java/org/alfresco/service/cmr/remote/RepoRemote.java

@@ -23,7 +23,7 @@ import java.io.OutputStream;
 import java.util.Map;
 
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * A highly simplified remote interface for the repo.

source/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java

@@ -21,7 +21,7 @@ package org.alfresco.service.cmr.remote;
 import java.util.Map;
 
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Over the wire, and authentication safe flavor of

source/java/org/alfresco/service/cmr/search/CategoryService.java

@@ -27,7 +27,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.Pair;
+import org.alfresco.util.Pair;
 
 /**
  * Category Service