diff --git a/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java index 8c11cfd590..aa8eb6f9d2 100644 --- a/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/WCMDeleteLayeredFolderEvaluator.java @@ -24,7 +24,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.avm.AVMNodeType; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wcm.AVMUtil; diff --git a/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java index 4277bd2b75..b278400378 100644 --- a/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/WCMLayeredFolderEvaluator.java @@ -24,7 +24,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.avm.AVMNodeType; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; diff --git a/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java index fd106e1781..d2e462689c 100644 --- a/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/WCMUnlockEvaluator.java @@ -24,7 +24,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avm.locking.AVMLock; import org.alfresco.service.cmr.avm.locking.AVMLockingService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.servlet.FacesHelper; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; diff --git a/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java b/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java index 7f20045e0c..558803c591 100644 --- a/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/WCMWorkflowLayeredFolderEvaluator.java @@ -24,7 +24,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.avm.AVMNodeType; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; diff --git a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java index 55ff402029..8aeb116ffa 100644 --- a/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java +++ b/source/java/org/alfresco/web/bean/actions/handlers/CopyToWebProjectHandler.java @@ -28,7 +28,7 @@ import org.alfresco.repo.action.executer.CopyToWebProjectActionExecuter; import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wcm.AVMUtil; diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java index 593a468a39..ab1bc1433a 100644 --- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java +++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java @@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.usage.ContentUsageService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.app.servlet.FacesHelper; diff --git a/source/java/org/alfresco/web/bean/users/EditUserWizard.java b/source/java/org/alfresco/web/bean/users/EditUserWizard.java index 1b97a85d5b..a585d6d8eb 100644 --- a/source/java/org/alfresco/web/bean/users/EditUserWizard.java +++ b/source/java/org/alfresco/web/bean/users/EditUserWizard.java @@ -28,7 +28,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.ui.common.ReportedException; diff --git a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java index 66bbdf0d09..3da4b62c3b 100644 --- a/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java +++ b/source/java/org/alfresco/web/bean/wcm/FileDetailsBean.java @@ -36,7 +36,7 @@ import org.alfresco.repo.web.scripts.FileTypeImageUtils; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.app.servlet.DownloadContentServlet; import org.alfresco.web.bean.repository.Node; diff --git a/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java b/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java index 977db97060..33120f87a8 100644 --- a/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java +++ b/source/java/org/alfresco/web/bean/wcm/FilePickerBean.java @@ -58,7 +58,7 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.app.servlet.ajax.InvokeCommand; import org.alfresco.web.bean.FileUploadBean; diff --git a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java index 4c70906305..5f37b0831d 100644 --- a/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ManageChangeRequestTaskDialog.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.avm.locking.AVMLockingService; import org.alfresco.service.cmr.avmsync.AVMDifference; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.wcm.util.WCMUtil; import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; diff --git a/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java b/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java index ea83b14bd3..b555211deb 100644 --- a/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java +++ b/source/java/org/alfresco/web/bean/wcm/preview/StoreSpecificPreviewURIService.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; /** diff --git a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java index f2c0e48253..073d031bf1 100644 --- a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.wcm.webproject.WebProjectService; import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; diff --git a/source/java/org/alfresco/web/forms/RenditionImpl.java b/source/java/org/alfresco/web/forms/RenditionImpl.java index b0b810dbb9..8369fb5a27 100644 --- a/source/java/org/alfresco/web/forms/RenditionImpl.java +++ b/source/java/org/alfresco/web/forms/RenditionImpl.java @@ -33,7 +33,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.servlet.FacesHelper; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wcm.AVMUtil; diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java index 82c26897bf..4f3e0fe13d 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java @@ -37,7 +37,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; import org.alfresco.service.namespace.NamespaceService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.forms.XMLUtil; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java index d03eb8f6eb..2f3db3d389 100644 --- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java +++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java @@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.cmr.security.AuthenticationService; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.app.servlet.FacesHelper; import org.alfresco.web.bean.NavigationBean; diff --git a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java index a0b31aed0c..a1939f19a1 100644 --- a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.wcm.AVMUtil; diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java b/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java index 6e9b57d5eb..d16a81e554 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIPendingSubmissions.java @@ -54,7 +54,7 @@ import org.alfresco.web.ui.common.component.UIActionLink; import org.alfresco.web.ui.repo.component.UIActions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.Pair; +import org.alfresco.util.Pair; import org.springframework.extensions.webscripts.ui.common.ConstantMethodBinding; import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;