mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -23,7 +23,7 @@ import java.util.List;
|
||||
|
||||
import org.alfresco.repo.domain.hibernate.DirtySessionAnnotation;
|
||||
import org.alfresco.service.cmr.attributes.AttrQuery;
|
||||
import org.springframework.extensions.surf.util.Pair;
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
/**
|
||||
* Interface for persistence operations on attributes.
|
||||
|
@@ -29,7 +29,7 @@ import org.alfresco.service.cmr.attributes.AttributeService;
|
||||
import org.alfresco.service.cmr.avm.AVMBadArgumentException;
|
||||
import org.alfresco.service.cmr.avm.AVMNotFoundException;
|
||||
import org.alfresco.service.cmr.avm.AVMWrongTypeException;
|
||||
import org.springframework.extensions.surf.util.Pair;
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
/**
|
||||
* Implementation of the AttributeService interface.
|
||||
|
@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.attributes.AttrQueryLTE;
|
||||
import org.alfresco.service.cmr.attributes.AttrQueryLike;
|
||||
import org.alfresco.service.cmr.attributes.AttrQueryNE;
|
||||
import org.alfresco.service.cmr.attributes.AttributeService;
|
||||
import org.springframework.extensions.surf.util.Pair;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.springframework.context.support.FileSystemXmlApplicationContext;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
@@ -26,7 +26,7 @@ import org.alfresco.service.cmr.attributes.AttrQuery;
|
||||
import org.alfresco.service.cmr.attributes.AttributeService;
|
||||
import org.alfresco.service.cmr.remote.AttributeServiceTransport;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.springframework.extensions.surf.util.Pair;
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
/**
|
||||
* Server side implementation of transport for AttributeService.
|
||||
|
@@ -36,7 +36,7 @@ import org.alfresco.repo.attributes.Attribute.Type;
|
||||
import org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor;
|
||||
import org.alfresco.service.cmr.attributes.AttrQuery;
|
||||
import org.alfresco.service.cmr.attributes.AttrQueryHelper;
|
||||
import org.springframework.extensions.surf.util.Pair;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.hibernate.Query;
|
||||
|
Reference in New Issue
Block a user