From b726c4d6dbfb5d1510babb646b2363d98851ee90 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 14 Dec 2009 13:41:05 +0000 Subject: [PATCH] Merged DEV/TEMPORARY to HEAD 17667: Branch for SpringSurf integration - from HEAD r17665 17668: Fix to ensure included scripts files are not loaded from a cached classpath loader. 17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar 17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/action-services-context.xml | 2 +- config/alfresco/content-services-context.xml | 8 ++++---- config/alfresco/core-services-context.xml | 2 +- .../alfresco/emailserver/email-service-context.xml | 2 +- config/alfresco/form-services-context.xml | 2 +- config/alfresco/invitation-service-context.xml | 2 +- config/alfresco/repo-admin-context.xml | 2 +- config/alfresco/rule-services-context.xml | 2 +- config/alfresco/site-services-context.xml | 2 +- .../imap/default/imap-server-context.xml | 2 +- config/alfresco/wcm-services-context.xml | 2 +- config/alfresco/workflow-context.xml | 2 +- .../java/org/alfresco/cmis/CMISQueryOptions.java | 2 +- .../dictionary/CMISAbstractDictionaryService.java | 6 +++--- .../alfresco/cmis/mapping/CMISServicesImpl.java | 2 +- .../org/alfresco/cmis/search/CMISQueryParser.java | 2 +- .../java/org/alfresco/cmis/search/QueryTest.java | 2 +- .../org/alfresco/email/server/EmailServer.java | 4 ++-- .../alfresco/email/server/EmailServiceImpl.java | 2 +- .../email/server/EmailServiceRemotable.java | 2 +- .../server/handler/FolderEmailMessageHandler.java | 2 +- .../impl/subetha/SubethaEmailMessagePart.java | 2 +- .../java/org/alfresco/filesys/CIFSServerBean.java | 2 +- .../java/org/alfresco/filesys/FTPServerBean.java | 2 +- .../java/org/alfresco/filesys/NFSServerBean.java | 2 +- .../alfresco/filesys/ServerConfigurationBean.java | 10 +++++----- .../alfresco/filesys/alfresco/DesktopAction.java | 2 +- .../alfresco/filesys/alfresco/HomeShareMapper.java | 2 +- .../filesys/alfresco/MultiTenantShareMapper.java | 2 +- .../filesys/auth/cifs/CifsAuthenticatorBase.java | 2 +- .../auth/cifs/EnterpriseCifsAuthenticator.java | 2 +- .../auth/cifs/PassthruCifsAuthenticator.java | 2 +- .../filesys/auth/ftp/FTPAuthenticatorBase.java | 2 +- .../filesys/auth/ftp/PassthruFtpAuthenticator.java | 2 +- .../filesys/auth/nfs/AlfrescoRpcAuthenticator.java | 2 +- .../org/alfresco/filesys/avm/AVMDiskDriver.java | 2 +- .../org/alfresco/filesys/avm/AVMShareMapper.java | 2 +- .../filesys/config/ServerConfigurationBean.java | 2 +- .../filesys/debug/FileServerDebugInterface.java | 2 +- .../alfresco/filesys/repo/ContentDiskDriver.java | 2 +- .../alfresco/filesys/repo/ContentNetworkFile.java | 2 +- .../org/alfresco/filesys/repo/HomeShareMapper.java | 2 +- .../filesys/repo/desk/JavaScriptDesktopAction.java | 2 +- source/java/org/alfresco/jcr/api/JCRNodeRef.java | 2 +- .../jcr/exporter/JCRDocumentXMLExporter.java | 2 +- .../jcr/exporter/JCRSystemXMLExporter.java | 2 +- .../alfresco/jcr/importer/JCRDocXMLHandler.java | 2 +- .../alfresco/jcr/importer/JCRSystemXMLHandler.java | 2 +- source/java/org/alfresco/jcr/item/NodeImpl.java | 2 +- .../java/org/alfresco/jcr/session/SessionImpl.java | 2 +- .../org/alfresco/jcr/session/WorkspaceImpl.java | 2 +- .../org/alfresco/linkvalidation/HrefStatusMap.java | 2 +- .../linkvalidation/LinkValidationAction.java | 4 ++-- .../linkvalidation/LinkValidationReport.java | 2 +- .../LinkValidationServiceBootstrap.java | 2 +- .../alfresco/repo/action/ActionServiceImpl.java | 2 +- .../org/alfresco/repo/action/ActionsAspect.java | 2 +- .../repo/action/ParameterizedItemAbstractBase.java | 2 +- .../action/ParameterizedItemDefinitionImpl.java | 2 +- .../action/executer/ExporterActionExecuter.java | 2 +- .../FreeMarkerModelLuceneFunctionTest.java | 2 +- ...FreeMarkerWithLuceneExtensionsModelFactory.java | 2 +- .../repo/activities/ActivityPostServiceImpl.java | 2 +- .../repo/activities/ActivityServiceImpl.java | 2 +- .../activities/feed/AbstractFeedGenerator.java | 2 +- .../repo/activities/feed/FeedTaskProcessor.java | 2 +- .../repo/activities/feed/cleanup/FeedCleaner.java | 2 +- .../repo/activities/post/cleanup/PostCleaner.java | 2 +- .../repo/activities/post/lookup/PostLookup.java | 4 ++-- .../org/alfresco/repo/admin/BaseInterpreter.java | 6 +++--- .../alfresco/repo/admin/ConfigurationChecker.java | 4 ++-- .../alfresco/repo/admin/RepoAdminInterpreter.java | 2 +- .../alfresco/repo/admin/RepoAdminServiceImpl.java | 2 +- .../alfresco/repo/admin/patch/AbstractPatch.java | 2 +- .../alfresco/repo/admin/patch/PatchExecuter.java | 4 ++-- .../repo/admin/patch/PatchServiceImpl.java | 2 +- .../impl/AVMFormsPropertyTokenisationPatch.java | 2 +- .../repo/admin/patch/impl/AVMGuidPatch.java | 2 +- .../admin/patch/impl/AVMLayeredSnapshotPatch.java | 2 +- .../repo/admin/patch/impl/AVMLockingPatch.java | 2 +- .../admin/patch/impl/AVMPermissionDataPatch.java | 2 +- .../impl/AVMStorePropertyTokenisationPatch.java | 2 +- .../impl/AVMWebProjectInheritPermissionsPatch.java | 2 +- .../patch/impl/ActionRuleDecouplingPatch.java | 2 +- .../patch/impl/AuthorityDefaultZonesPatch.java | 2 +- .../admin/patch/impl/AuthorityMigrationPatch.java | 2 +- .../admin/patch/impl/CalendarModelUriPatch.java | 2 +- .../patch/impl/CategoryRootPermissionPatch.java | 2 +- .../admin/patch/impl/ContentFormTypePatch.java | 2 +- .../admin/patch/impl/ContentPermissionPatch.java | 2 +- .../admin/patch/impl/DeploymentMigrationPatch.java | 2 +- .../admin/patch/impl/DescriptorUpdatePatch.java | 2 +- .../repo/admin/patch/impl/DmPermissionsPatch.java | 2 +- .../patch/impl/EmailTemplatesContentPatch.java | 2 +- .../patch/impl/EmailTemplatesFolderPatch.java | 2 +- .../admin/patch/impl/FixNameCrcValuesPatch.java | 2 +- .../repo/admin/patch/impl/ForumsIconsPatch.java | 2 +- .../admin/patch/impl/GenericBootstrapPatch.java | 2 +- .../admin/patch/impl/GenericWorkflowPatch.java | 2 +- .../admin/patch/impl/GroupTokenisationPatch.java | 2 +- .../patch/impl/GuestPersonPermissionPatch.java | 2 +- .../patch/impl/GuestPersonPermissionPatch2.java | 2 +- .../repo/admin/patch/impl/GuestUserPatch.java | 2 +- .../repo/admin/patch/impl/ImapFoldersPatch.java | 2 +- .../admin/patch/impl/InvalidNameEndingPatch.java | 2 +- .../patch/impl/InvalidUserPersonAndGroupPatch.java | 2 +- .../admin/patch/impl/InvitationMigrationPatch.java | 2 +- .../patch/impl/LinkNodeFileExtensionPatch.java | 2 +- .../admin/patch/impl/MigrateVersionStorePatch.java | 2 +- .../MigrateVersionStoreUpdateCounterPatch.java | 2 +- .../impl/MoveWCMToGroupBasedPermissionsPatch.java | 2 +- .../impl/MultiTShareExistingTenantsPatch.java | 2 +- .../alfresco/repo/admin/patch/impl/NoOpPatch.java | 2 +- .../patch/impl/NodePropertySerializablePatch.java | 2 +- .../repo/admin/patch/impl/PermissionDataPatch.java | 2 +- .../repo/admin/patch/impl/PersonUsagePatch.java | 2 +- .../admin/patch/impl/RSSTemplatesFolderPatch.java | 2 +- .../impl/ResetWCMToGroupBasedPermissionsPatch.java | 4 ++-- .../admin/patch/impl/SavedSearchFolderPatch.java | 2 +- .../patch/impl/SavedSearchPermissionPatch.java | 2 +- .../repo/admin/patch/impl/ScriptsFolderPatch.java | 2 +- .../patch/impl/SitePermissionRefactorPatch.java | 2 +- .../repo/admin/patch/impl/SiteStorePatch.java | 2 +- .../patch/impl/SpacesRootPermissionPatch.java | 2 +- .../impl/SpacesStoreGuestPermissionPatch.java | 2 +- .../patch/impl/SystemDescriptorContentPatch.java | 2 +- .../patch/impl/SystemWorkflowFolderPatch.java | 2 +- ...pLevelGroupParentChildAssociationTypePatch.java | 2 +- .../patch/impl/UIFacetsAspectRemovalPatch.java | 2 +- .../patch/impl/UpdateGuestPermissionPatch.java | 2 +- .../patch/impl/UserAndPersonTokenisationPatch.java | 2 +- .../patch/impl/VersionHistoryPerformancePatch.java | 2 +- .../repo/admin/patch/impl/WCMFoldersPatch.java | 2 +- .../patch/impl/WCMPostPermissionSnapshotPatch.java | 2 +- .../admin/patch/impl/WebSiteAddModeratedPatch.java | 2 +- .../repo/admin/registry/RegistryServiceImpl.java | 4 ++-- .../org/alfresco/repo/attributes/AttributeDAO.java | 2 +- .../repo/attributes/AttributeServiceImpl.java | 2 +- .../repo/attributes/AttributeServiceTest.java | 2 +- .../AttributeServiceTransportService.java | 2 +- .../hibernate/AttributeDAOHibernate.java | 2 +- .../org/alfresco/repo/audit/AuditBootstrap.java | 2 +- .../alfresco/repo/audit/AuditComponentImpl.java | 2 +- .../org/alfresco/repo/audit/AuditServiceImpl.java | 2 +- .../audit/extractor/AbstractDataExtractor.java | 2 +- .../audit/extractor/NodeNameDataExtractor.java | 2 +- .../audit/extractor/NodeTypeDataExtractor.java | 2 +- .../audit/generator/AbstractDataGenerator.java | 2 +- .../AuthenticatedPersonDataGenerator.java | 2 +- .../repo/audit/hibernate/HibernateAuditDAO.java | 2 +- .../repo/audit/model/AuditModelReader.java | 2 +- .../repo/audit/model/AuditModelRegistry.java | 2 +- .../repo/avm/AVMExpiredContentProcessor.java | 4 ++-- .../java/org/alfresco/repo/avm/AVMInterpreter.java | 2 +- .../alfresco/repo/avm/AVMLockingAwareService.java | 2 +- .../org/alfresco/repo/avm/AVMNodeConverter.java | 2 +- .../alfresco/repo/avm/AVMNodeConverterTest.java | 2 +- .../java/org/alfresco/repo/avm/AVMNodeService.java | 2 +- .../java/org/alfresco/repo/avm/AVMRemoteLocal.java | 2 +- .../repo/avm/AVMRemoteTransportService.java | 2 +- .../java/org/alfresco/repo/avm/AVMRepository.java | 2 +- .../java/org/alfresco/repo/avm/AVMServiceImpl.java | 2 +- .../org/alfresco/repo/avm/AVMServiceLocalTest.java | 2 +- .../java/org/alfresco/repo/avm/AVMServiceTest.java | 2 +- .../java/org/alfresco/repo/avm/AVMStoreImpl.java | 2 +- .../java/org/alfresco/repo/avm/AvmBootstrap.java | 2 +- .../repo/avm/CreateVersionTxnListener.java | 2 +- .../java/org/alfresco/repo/avm/DirectoryNode.java | 2 +- .../repo/avm/LayeredDirectoryNodeImpl.java | 2 +- source/java/org/alfresco/repo/avm/Lookup.java | 2 +- .../org/alfresco/repo/avm/MultiTAVMService.java | 2 +- .../org/alfresco/repo/avm/NOOPLookupCache.java | 2 +- .../alfresco/repo/avm/PlainDirectoryNodeImpl.java | 2 +- .../alfresco/repo/avm/PurgeVersionTxnListener.java | 2 +- .../repo/avm/TransactionalLookupCache.java | 2 +- .../repo/avm/VersionLayeredNodeEntryImpl.java | 2 +- .../repo/avm/actions/AVMDeployWebsiteAction.java | 2 +- .../repo/avm/actions/AVMRevertStoreAction.java | 2 +- .../repo/avm/actions/AVMRevertToVersionAction.java | 2 +- .../repo/avm/actions/AVMUndoSandboxListAction.java | 2 +- .../repo/avm/actions/SimpleAVMPromoteAction.java | 2 +- .../repo/avm/actions/SimpleAVMSubmitAction.java | 2 +- .../repo/avm/ibatis/AVMStorePropertyDAOIbatis.java | 2 +- .../repo/avm/locking/AVMLockingBootstrap.java | 2 +- .../repo/avm/locking/AVMLockingServiceImpl.java | 4 ++-- .../org/alfresco/repo/avm/util/BulkLoader.java | 2 +- .../alfresco/repo/avm/util/VersionPathStuffer.java | 2 +- .../alfresco/repo/avm/util/VersionPathTest.java | 2 +- .../repo/avm/util/VersionPathUnstuffer.java | 2 +- .../org/alfresco/repo/avm/wf/AVMDeployHandler.java | 2 +- .../repo/avm/wf/AVMReleaseTestServerHandler.java | 2 +- .../repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java | 2 +- .../repo/avm/wf/AVMRemoveWFStoreHandler.java | 2 +- .../repo/avm/wf/AVMSubmitPackageHandler.java | 2 +- .../repo/cache/EhCacheManagerFactoryBean.java | 2 +- .../repo/cache/lookup/EntityLookupCache.java | 4 ++-- .../repo/cache/lookup/EntityLookupCacheTest.java | 2 +- source/java/org/alfresco/repo/clt/AVMCopyOut.java | 2 +- source/java/org/alfresco/repo/clt/AVMLs.java | 2 +- source/java/org/alfresco/repo/clt/CltBase.java | 2 +- source/java/org/alfresco/repo/clt/RepoCopyIn.java | 2 +- source/java/org/alfresco/repo/clt/RepoCopyOut.java | 2 +- source/java/org/alfresco/repo/clt/RepoLs.java | 2 +- .../repo/coci/CheckOutCheckInServiceImpl.java | 2 +- .../repo/config/source/RepoUrlConfigSource.java | 4 ++-- .../repo/config/xml/RepoXMLConfigService.java | 14 +++++++------- .../repo/content/AbstractContentAccessor.java | 2 +- .../repo/content/AbstractContentStore.java | 2 +- .../org/alfresco/repo/content/ContentDataTest.java | 2 +- .../alfresco/repo/content/ContentServiceImpl.java | 4 ++-- .../org/alfresco/repo/content/MimetypeMap.java | 10 +++++----- .../alfresco/repo/content/NodeContentContext.java | 2 +- .../repo/content/cleanup/ContentStoreCleaner.java | 2 +- .../content/cleanup/EagerContentStoreCleaner.java | 2 +- .../repo/content/filestore/FileContentStore.java | 2 +- .../content/http/HttpAlfrescoContentReader.java | 2 +- .../metadata/AbstractMappingMetadataExtracter.java | 2 +- .../metadata/OpenOfficeMetadataExtracter.java | 2 +- .../metadata/xml/XPathMetadataExtracter.java | 4 ++-- .../content/metadata/xml/XmlMetadataExtracter.java | 2 +- .../RootElementNameContentWorkerSelector.java | 2 +- .../selector/XPathContentWorkerSelector.java | 2 +- .../transform/AbstractContentTransformer.java | 2 +- .../OpenOfficeContentTransformerWorker.java | 2 +- .../RemoteOpenOfficeContentTransformer.java | 2 +- .../transform/swf/SWFTransformationOptions.java | 2 +- .../org/alfresco/repo/copy/CopyServiceImpl.java | 4 ++-- .../repo/copy/CrossRepositoryCopyServiceImpl.java | 2 +- .../repo/deploy/DeploymentServiceImpl.java | 4 ++-- .../repo/descriptor/DescriptorServiceImpl.java | 6 +++--- .../repo/descriptor/DescriptorStartupLog.java | 2 +- .../repo/dictionary/DictionaryBootstrap.java | 2 +- .../repo/dictionary/DictionaryComponent.java | 2 +- .../repo/dictionary/DictionaryDAOImpl.java | 2 +- .../repo/dictionary/DictionaryDAOTest.java | 2 +- .../dictionary/DictionaryRepositoryBootstrap.java | 2 +- .../repo/dictionary/M2DataTypeDefinition.java | 2 +- .../java/org/alfresco/repo/dictionary/M2Label.java | 2 +- .../org/alfresco/repo/dictionary/M2ModelDiff.java | 2 +- .../java/org/alfresco/repo/dictionary/M2XML.java | 2 +- .../dictionary/constraint/ConstraintsTest.java | 2 +- .../dictionary/constraint/RegexConstraint.java | 2 +- .../types/period/AbstractPeriodProvider.java | 2 +- .../repo/dictionary/types/period/PeriodTest.java | 2 +- .../java/org/alfresco/repo/domain/CrcHelper.java | 2 +- .../java/org/alfresco/repo/domain/LocaleDAO.java | 2 +- .../org/alfresco/repo/domain/LocaleDAOTest.java | 4 ++-- .../alfresco/repo/domain/NodePropertyValue.java | 2 +- source/java/org/alfresco/repo/domain/QNameDAO.java | 2 +- .../org/alfresco/repo/domain/QNameDAOTest.java | 2 +- .../repo/domain/activities/ActivityFeedEntity.java | 2 +- .../repo/domain/audit/AbstractAuditDAOImpl.java | 2 +- .../org/alfresco/repo/domain/audit/AuditDAO.java | 2 +- .../alfresco/repo/domain/audit/AuditDAOTest.java | 2 +- .../repo/domain/audit/ibatis/AuditDAOImpl.java | 2 +- .../alfresco/repo/domain/avm/AVMStoreDAOTest.java | 2 +- .../repo/domain/avm/AbstractAVMNodeDAOImpl.java | 4 ++-- .../domain/avm/AbstractAVMNodeLinksDAOImpl.java | 4 ++-- .../repo/domain/avm/AbstractAVMStoreDAOImpl.java | 4 ++-- .../domain/avm/AbstractAVMVersionRootDAOImpl.java | 4 ++-- .../contentdata/AbstractContentDataDAOImpl.java | 2 +- .../repo/domain/contentdata/ContentDataDAO.java | 2 +- .../domain/contentdata/ContentDataDAOTest.java | 2 +- .../repo/domain/contentdata/ContentUrlEntity.java | 2 +- .../domain/encoding/AbstractEncodingDAOImpl.java | 4 ++-- .../alfresco/repo/domain/encoding/EncodingDAO.java | 2 +- .../repo/domain/encoding/EncodingDAOTest.java | 2 +- .../domain/hibernate/AVMAccessControlListDAO.java | 2 +- .../repo/domain/hibernate/AclDaoComponentImpl.java | 2 +- .../domain/hibernate/DMAccessControlListDAO.java | 2 +- .../hibernate/DirtySessionMethodInterceptor.java | 2 +- .../domain/hibernate/HibernateLocaleDAOImpl.java | 6 +++--- .../domain/hibernate/HibernateQNameDAOImpl.java | 2 +- .../domain/hibernate/HibernateUsageDeltaDAO.java | 4 ++-- .../repo/domain/hibernate/LocaleEntityImpl.java | 2 +- .../domain/hibernate/NodeAccessControlListDAO.java | 2 +- .../repo/domain/hibernate/TransactionImpl.java | 2 +- .../domain/mimetype/AbstractMimetypeDAOImpl.java | 4 ++-- .../alfresco/repo/domain/mimetype/MimetypeDAO.java | 2 +- .../repo/domain/mimetype/MimetypeDAOTest.java | 2 +- .../propval/AbstractPropertyValueDAOImpl.java | 2 +- .../propval/DefaultPropertyTypeConverter.java | 2 +- .../repo/domain/propval/PropertyClassEntity.java | 2 +- .../domain/propval/PropertyDateValueEntity.java | 4 ++-- .../domain/propval/PropertyDoubleValueEntity.java | 2 +- .../propval/PropertySerializableValueEntity.java | 2 +- .../domain/propval/PropertyStringQueryEntity.java | 2 +- .../domain/propval/PropertyStringValueEntity.java | 2 +- .../repo/domain/propval/PropertyValueDAO.java | 2 +- .../repo/domain/propval/PropertyValueDAOTest.java | 4 ++-- .../repo/domain/propval/PropertyValueEntity.java | 2 +- .../propval/ibatis/PropertyValueDAOImpl.java | 2 +- .../repo/domain/schema/SchemaBootstrap.java | 6 +++--- .../alfresco/repo/exporter/ExporterComponent.java | 2 +- .../repo/exporter/ExporterComponentTest.java | 2 +- .../repo/exporter/RepositoryExporterComponent.java | 4 ++-- .../org/alfresco/repo/exporter/URLExporter.java | 2 +- source/java/org/alfresco/repo/forms/Item.java | 2 +- .../processor/node/ContentModelFormProcessor.java | 2 +- .../forms/processor/task/TaskFormProcessor.java | 2 +- .../org/alfresco/repo/forum/DiscussableAspect.java | 2 +- .../org/alfresco/repo/i18n/MessageServiceImpl.java | 2 +- .../alfresco/repo/imap/AbstractMimeMessage.java | 2 +- .../org/alfresco/repo/imap/AlfrescoImapServer.java | 2 +- .../org/alfresco/repo/imap/ImapContentPolicy.java | 2 +- .../org/alfresco/repo/imap/ImapServiceImpl.java | 6 +++--- .../repo/importer/DefaultContentHandler.java | 2 +- .../alfresco/repo/importer/ImporterBootstrap.java | 6 +++--- .../alfresco/repo/importer/ImporterComponent.java | 2 +- .../repo/importer/system/SystemInfoBootstrap.java | 2 +- .../repo/invitation/InvitationServiceImpl.java | 2 +- .../script/ScriptNominatedInvitation.java | 2 +- .../jgroups/AlfrescoJGroupsChannelFactory.java | 4 ++-- source/java/org/alfresco/repo/jscript/AVM.java | 2 +- source/java/org/alfresco/repo/jscript/AVMNode.java | 4 ++-- .../org/alfresco/repo/jscript/Association.java | 2 +- .../alfresco/repo/jscript/ChildAssociation.java | 2 +- .../org/alfresco/repo/jscript/Classification.java | 2 +- .../repo/jscript/ClasspathScriptLocation.java | 2 +- .../alfresco/repo/jscript/CrossRepositoryCopy.java | 4 ++-- source/java/org/alfresco/repo/jscript/Imap.java | 2 +- source/java/org/alfresco/repo/jscript/People.java | 2 +- .../java/org/alfresco/repo/jscript/Presence.java | 2 +- .../repo/jscript/RhinoScriptProcessor.java | 10 +--------- .../org/alfresco/repo/jscript/ScriptBehaviour.java | 2 +- .../java/org/alfresco/repo/jscript/ScriptNode.java | 10 +++++----- .../org/alfresco/repo/jscript/ScriptUtils.java | 4 ++-- source/java/org/alfresco/repo/jscript/Search.java | 2 +- .../repo/management/SafeEventPublisher.java | 6 +++--- .../java/org/alfresco/repo/model/Repository.java | 2 +- .../filefolder/FileFolderServiceImplTest.java | 2 +- .../model/filefolder/MLTranslationInterceptor.java | 2 +- .../repo/model/ml/ContentFilterLanguagesMap.java | 10 +++++----- .../model/ml/MultilingualContentServiceImpl.java | 2 +- .../tools/MultilingualContentServiceImplTest.java | 2 +- .../repo/module/AbstractModuleComponent.java | 4 ++-- .../repo/module/ImporterModuleComponent.java | 2 +- .../repo/module/LoggerModuleComponent.java | 2 +- .../repo/module/ModuleComponentHelper.java | 4 ++-- .../alfresco/repo/module/ModuleDetailsImpl.java | 4 ++-- .../org/alfresco/repo/module/ModuleStarter.java | 4 ++-- .../alfresco/repo/node/FullNodeServiceTest.java | 2 +- .../alfresco/repo/node/MLPropertyInterceptor.java | 2 +- .../node/NodeRefPropertyMethodInterceptor.java | 2 +- .../node/cleanup/AbstractNodeCleanupWorker.java | 2 +- .../alfresco/repo/node/db/DbNodeServiceImpl.java | 4 ++-- .../repo/node/db/DbNodeServiceImplTest.java | 4 ++-- .../repo/node/db/DeletedNodeCleanupWorker.java | 2 +- .../node/db/IndexChildrenWhereRequiredWorker.java | 2 +- .../org/alfresco/repo/node/db/NodeDaoService.java | 2 +- .../db/hibernate/HibernateNodeDaoServiceImpl.java | 2 +- .../repo/node/index/AbstractReindexComponent.java | 4 ++-- .../node/index/FullIndexRecoveryComponent.java | 2 +- .../node/index/IndexRecoveryBootstrapBean.java | 2 +- .../alfresco/repo/node/index/IndexRecoveryJob.java | 2 +- .../repo/node/index/IndexTransactionTracker.java | 2 +- .../repo/node/integrity/IncompleteNodeTagger.java | 2 +- .../repo/node/integrity/IntegrityChecker.java | 2 +- .../org/alfresco/repo/policy/BaseBehaviour.java | 2 +- .../org/alfresco/repo/policy/JavaBehaviour.java | 2 +- .../alfresco/repo/policy/PolicyComponentImpl.java | 2 +- .../alfresco/repo/processor/ScriptServiceImpl.java | 2 +- .../repo/props/PropertyValueComponentImpl.java | 4 ++-- .../org/alfresco/repo/remote/AVMRemoteImpl.java | 2 +- .../repo/remote/AttributeServiceRemote.java | 2 +- .../org/alfresco/repo/remote/RepoRemoteImpl.java | 2 +- .../alfresco/repo/remote/RepoRemoteService.java | 2 +- .../repo/remote/RepoRemoteTransportService.java | 2 +- .../org/alfresco/repo/rule/RuleServiceImpl.java | 2 +- .../java/org/alfresco/repo/rule/RuleTypeImpl.java | 2 +- .../java/org/alfresco/repo/rule/RulesAspect.java | 2 +- .../org/alfresco/repo/search/IndexerComponent.java | 2 +- .../search/impl/lucene/ADMLuceneCategoryTest.java | 2 +- .../search/impl/lucene/ADMLuceneIndexerImpl.java | 4 ++-- .../search/impl/lucene/ADMLuceneSearcherImpl.java | 4 ++-- .../repo/search/impl/lucene/ADMLuceneTest.java | 4 ++-- .../search/impl/lucene/AVMLuceneIndexerImpl.java | 6 +++--- .../impl/lucene/LuceneCategoryServiceImpl.java | 2 +- .../repo/search/impl/lucene/LuceneQueryParser.java | 4 ++-- .../repo/search/impl/lucene/LuceneSearcher.java | 2 +- .../impl/lucene/analysis/DateTimeTokenFilter.java | 2 +- .../impl/lucene/analysis/DateTokenFilter.java | 2 +- .../search/impl/lucene/analysis/MLAnalayser.java | 2 +- .../parsers/AlfrescoFunctionEvaluationContext.java | 2 +- .../repo/search/impl/querymodel/QueryEngine.java | 2 +- .../repo/search/impl/querymodel/QueryOptions.java | 2 +- .../TenantAwareUserNameGenerator.java | 2 +- .../jaas/JAASAuthenticationComponent.java | 2 +- .../permissions/impl/PermissionServiceImpl.java | 2 +- .../person/AbstractHomeFolderProvider.java | 2 +- .../CheckAndFixPersonPermissionsBootstrapBean.java | 2 +- .../repo/security/person/PersonServiceImpl.java | 2 +- .../person/SplitPersonCleanupBootstrapBean.java | 2 +- .../repo/security/person/UserNameMatcherImpl.java | 2 +- .../sync/ChainingUserRegistrySynchronizer.java | 6 +++--- .../repo/service/StoreRedirectorProxyFactory.java | 2 +- .../alfresco/repo/shutdown/ShutdownBackstop.java | 2 +- .../org/alfresco/repo/site/SiteAVMBootstrap.java | 4 ++-- .../org/alfresco/repo/site/SiteServiceImpl.java | 4 ++-- .../repo/site/script/ScriptSiteService.java | 2 +- .../java/org/alfresco/repo/site/script/Site.java | 2 +- source/java/org/alfresco/repo/template/AVM.java | 2 +- .../alfresco/repo/template/AVMTemplateNode.java | 4 ++-- .../alfresco/repo/template/BaseContentNode.java | 2 +- .../alfresco/repo/template/I18NMessageMethod.java | 2 +- .../repo/template/ISO8601DateFormatMethod.java | 2 +- source/java/org/alfresco/repo/template/People.java | 2 +- source/java/org/alfresco/repo/template/Site.java | 2 +- .../alfresco/repo/template/VersionHistoryNode.java | 2 +- .../java/org/alfresco/repo/template/Workflow.java | 2 +- .../repo/tenant/MultiTAdminServiceImpl.java | 6 +++--- .../alfresco/repo/tenant/MultiTServiceImpl.java | 2 +- .../alfresco/repo/tenant/MultiTenantBootstrap.java | 4 ++-- .../alfresco/repo/tenant/TenantInterpreter.java | 4 ++-- .../repo/thumbnail/ThumbnailServiceImpl.java | 2 +- .../transaction/AlfrescoTransactionSupport.java | 2 +- .../alfresco/repo/transaction/TransactionUtil.java | 2 +- .../org/alfresco/repo/usage/ContentUsageImpl.java | 2 +- .../repo/usage/UserUsageTrackingComponent.java | 4 ++-- .../alfresco/repo/version/Version2ServiceImpl.java | 2 +- .../org/alfresco/repo/version/VersionMigrator.java | 2 +- .../alfresco/repo/version/VersionServiceImpl.java | 2 +- .../alfresco/repo/version/VersionableAspect.java | 2 +- .../alfresco/repo/workflow/WorkflowDeployer.java | 2 +- .../repo/workflow/WorkflowInterpreter.java | 6 +++--- .../repo/workflow/WorkflowPackageImpl.java | 2 +- .../repo/workflow/jbpm/JBPMEngineTest.java | 2 +- .../alfresco/repo/workflow/jbpm/JBPMScheduler.java | 2 +- .../repo/workflow/jscript/JscriptWorkflowTask.java | 2 +- .../service/cmr/attributes/AttributeService.java | 2 +- .../org/alfresco/service/cmr/avm/AVMService.java | 2 +- .../service/cmr/avm/AVMStoreDescriptor.java | 2 +- .../service/cmr/avm/VersionDescriptor.java | 2 +- .../service/cmr/avm/deploy/DeploymentEvent.java | 2 +- .../service/cmr/email/EmailMessageException.java | 2 +- .../service/cmr/lock/NodeLockedException.java | 2 +- .../cmr/lock/UnableToAquireLockException.java | 2 +- .../cmr/lock/UnableToReleaseLockException.java | 2 +- .../service/cmr/ml/MultilingualContentService.java | 4 ++-- .../org/alfresco/service/cmr/remote/AVMRemote.java | 2 +- .../service/cmr/remote/AVMRemoteTransport.java | 2 +- .../cmr/remote/AttributeServiceTransport.java | 2 +- .../alfresco/service/cmr/remote/RepoRemote.java | 2 +- .../service/cmr/remote/RepoRemoteTransport.java | 2 +- .../service/cmr/repository/ContentData.java | 2 +- .../DuplicateChildNodeNameException.java | 2 +- .../alfresco/service/cmr/repository/MLText.java | 2 +- .../repository/datatype/DefaultTypeConverter.java | 4 ++-- .../datatype/DefaultTypeConverterTest.java | 2 +- .../service/cmr/repository/datatype/Duration.java | 2 +- .../cmr/repository/datatype/TypeConverter.java | 2 +- .../service/cmr/search/CategoryService.java | 2 +- .../ThumbnailParentAssociationDetails.java | 2 +- .../org/alfresco/service/cmr/view/Location.java | 2 +- source/java/org/alfresco/util/JSONtoFmModel.java | 1 + .../alfresco/util/OpenOfficeConnectionTester.java | 3 ++- source/java/org/alfresco/util/PropertyMap.java | 1 + .../util/config/RepositoryFolderConfigBean.java | 2 +- .../util/config/RepositoryPathConfigBean.java | 4 ++-- .../actions/WCMSandboxRevertSnapshotAction.java | 2 +- .../org/alfresco/wcm/asset/AssetServiceImpl.java | 2 +- .../wcm/preview/PreviewURIServiceImpl.java | 2 +- .../wcm/preview/PreviewURIServiceRegistryImpl.java | 2 +- .../VirtualisationServerPreviewURIService.java | 2 +- .../alfresco/wcm/sandbox/SandboxServiceImpl.java | 4 ++-- .../org/alfresco/wcm/sandbox/script/Asset.java | 2 +- .../org/alfresco/wcm/sandbox/script/Sandbox.java | 2 +- source/java/org/alfresco/wcm/util/WCMUtil.java | 2 +- .../wcm/webproject/WebProjectServiceImpl.java | 2 +- source/test-resources/tenant/mt-admin-context.xml | 2 +- 470 files changed, 572 insertions(+), 577 deletions(-) diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml index 73a133d9b2..ffc0a4efbd 100644 --- a/config/alfresco/action-services-context.xml +++ b/config/alfresco/action-services-context.xml @@ -121,7 +121,7 @@ - + alfresco.messages.action-service diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml index 16488c8b75..b79021e03d 100644 --- a/config/alfresco/content-services-context.xml +++ b/config/alfresco/content-services-context.xml @@ -128,9 +128,9 @@ - + - + classpath:alfresco/mimetype/mimetype-map.xml @@ -150,9 +150,9 @@ - + - + classpath:alfresco/ml/content-filter-lang.xml diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index c46ce19805..59bf3d585a 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -391,7 +391,7 @@ - + alfresco.messages.system-messages diff --git a/config/alfresco/emailserver/email-service-context.xml b/config/alfresco/emailserver/email-service-context.xml index d09f885219..9c5ccf1242 100644 --- a/config/alfresco/emailserver/email-service-context.xml +++ b/config/alfresco/emailserver/email-service-context.xml @@ -5,7 +5,7 @@ - + alfresco.messages.email-service diff --git a/config/alfresco/form-services-context.xml b/config/alfresco/form-services-context.xml index e84ce429cc..bca4af3a23 100644 --- a/config/alfresco/form-services-context.xml +++ b/config/alfresco/form-services-context.xml @@ -3,7 +3,7 @@ - + alfresco.messages.form-service diff --git a/config/alfresco/invitation-service-context.xml b/config/alfresco/invitation-service-context.xml index b3b898859d..06c760027f 100644 --- a/config/alfresco/invitation-service-context.xml +++ b/config/alfresco/invitation-service-context.xml @@ -53,7 +53,7 @@ - + alfresco.messages.invitation-service diff --git a/config/alfresco/repo-admin-context.xml b/config/alfresco/repo-admin-context.xml index c0a654aeda..ea436c6d26 100755 --- a/config/alfresco/repo-admin-context.xml +++ b/config/alfresco/repo-admin-context.xml @@ -30,7 +30,7 @@ - + diff --git a/config/alfresco/rule-services-context.xml b/config/alfresco/rule-services-context.xml index 6718f04ceb..284223ac59 100644 --- a/config/alfresco/rule-services-context.xml +++ b/config/alfresco/rule-services-context.xml @@ -48,7 +48,7 @@ - + alfresco.messages.rule-config diff --git a/config/alfresco/site-services-context.xml b/config/alfresco/site-services-context.xml index f87be402b8..fa0190196f 100644 --- a/config/alfresco/site-services-context.xml +++ b/config/alfresco/site-services-context.xml @@ -51,7 +51,7 @@ - + alfresco.messages.site-service diff --git a/config/alfresco/subsystems/imap/default/imap-server-context.xml b/config/alfresco/subsystems/imap/default/imap-server-context.xml index 3e5353cddf..f08f69ac4d 100755 --- a/config/alfresco/subsystems/imap/default/imap-server-context.xml +++ b/config/alfresco/subsystems/imap/default/imap-server-context.xml @@ -31,7 +31,7 @@ - + alfresco.messages.imap-service diff --git a/config/alfresco/wcm-services-context.xml b/config/alfresco/wcm-services-context.xml index b75e49c37e..2f40546bdf 100644 --- a/config/alfresco/wcm-services-context.xml +++ b/config/alfresco/wcm-services-context.xml @@ -335,7 +335,7 @@ - + alfresco.messages.wcm-services diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml index 1ffcd3ef18..ddfc1b9752 100644 --- a/config/alfresco/workflow-context.xml +++ b/config/alfresco/workflow-context.xml @@ -54,7 +54,7 @@ - + alfresco.messages.workflow-interpreter-help diff --git a/source/java/org/alfresco/cmis/CMISQueryOptions.java b/source/java/org/alfresco/cmis/CMISQueryOptions.java index 72eb9041ba..3812c8770a 100644 --- a/source/java/org/alfresco/cmis/CMISQueryOptions.java +++ b/source/java/org/alfresco/cmis/CMISQueryOptions.java @@ -26,7 +26,7 @@ package org.alfresco.cmis; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.search.impl.querymodel.QueryOptions; import org.alfresco.service.cmr.repository.StoreRef; diff --git a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java index 66e150c278..4fe493a5d4 100644 --- a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java +++ b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java @@ -47,7 +47,7 @@ import org.alfresco.repo.dictionary.DictionaryListener; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; @@ -513,7 +513,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ protected void onBootstrap(ApplicationEvent event) { @@ -523,7 +523,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ protected void onShutdown(ApplicationEvent event) { diff --git a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java index 666517876c..576881cb0c 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java +++ b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java @@ -62,7 +62,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.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java index e2a3196d94..0be0e2f87d 100644 --- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java +++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java @@ -85,7 +85,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.functions.Score; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; diff --git a/source/java/org/alfresco/cmis/search/QueryTest.java b/source/java/org/alfresco/cmis/search/QueryTest.java index babe39674b..45df162885 100644 --- a/source/java/org/alfresco/cmis/search/QueryTest.java +++ b/source/java/org/alfresco/cmis/search/QueryTest.java @@ -58,7 +58,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; diff --git a/source/java/org/alfresco/email/server/EmailServer.java b/source/java/org/alfresco/email/server/EmailServer.java index 40331c155d..6078f5d8fb 100644 --- a/source/java/org/alfresco/email/server/EmailServer.java +++ b/source/java/org/alfresco/email/server/EmailServer.java @@ -32,8 +32,8 @@ import java.util.StringTokenizer; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.email.EmailMessageException; import org.alfresco.service.cmr.email.EmailService; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationEvent; import org.springframework.context.support.AbstractApplicationContext; diff --git a/source/java/org/alfresco/email/server/EmailServiceImpl.java b/source/java/org/alfresco/email/server/EmailServiceImpl.java index 30de32bd89..881878d8e2 100644 --- a/source/java/org/alfresco/email/server/EmailServiceImpl.java +++ b/source/java/org/alfresco/email/server/EmailServiceImpl.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Concrete email service implementation. This is responsible for routing the diff --git a/source/java/org/alfresco/email/server/EmailServiceRemotable.java b/source/java/org/alfresco/email/server/EmailServiceRemotable.java index 1320450445..2551414c56 100644 --- a/source/java/org/alfresco/email/server/EmailServiceRemotable.java +++ b/source/java/org/alfresco/email/server/EmailServiceRemotable.java @@ -29,7 +29,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.email.EmailMessage; import org.alfresco.service.cmr.email.EmailService; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.ApplicationEvent; import org.springframework.remoting.rmi.RmiClientInterceptor; diff --git a/source/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java b/source/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java index 152d302634..71217ae52d 100644 --- a/source/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java +++ b/source/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java @@ -35,7 +35,7 @@ import java.util.Map; import javax.mail.MessagingException; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.email.EmailMessage; diff --git a/source/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java b/source/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java index 4572ea2698..6fb8887903 100644 --- a/source/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java +++ b/source/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java @@ -37,7 +37,7 @@ import javax.mail.Part; import org.alfresco.service.cmr.email.EmailMessageException; import org.alfresco.service.cmr.email.EmailMessagePart; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.remote.RemotableInputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/filesys/CIFSServerBean.java b/source/java/org/alfresco/filesys/CIFSServerBean.java index 5fdf747c50..48010848da 100644 --- a/source/java/org/alfresco/filesys/CIFSServerBean.java +++ b/source/java/org/alfresco/filesys/CIFSServerBean.java @@ -37,7 +37,7 @@ import org.alfresco.jlan.server.SessionListener; import org.alfresco.jlan.server.config.ServerConfiguration; import org.alfresco.jlan.smb.server.CIFSConfigSection; import org.alfresco.jlan.smb.server.SMBServer; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/filesys/FTPServerBean.java b/source/java/org/alfresco/filesys/FTPServerBean.java index 734fc3b24d..1a8c399db0 100644 --- a/source/java/org/alfresco/filesys/FTPServerBean.java +++ b/source/java/org/alfresco/filesys/FTPServerBean.java @@ -33,7 +33,7 @@ import org.alfresco.jlan.ftp.FTPConfigSection; import org.alfresco.jlan.ftp.FTPServer; import org.alfresco.jlan.server.NetworkServer; import org.alfresco.jlan.server.config.ServerConfiguration; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/filesys/NFSServerBean.java b/source/java/org/alfresco/filesys/NFSServerBean.java index 8835218004..8a6b039c07 100644 --- a/source/java/org/alfresco/filesys/NFSServerBean.java +++ b/source/java/org/alfresco/filesys/NFSServerBean.java @@ -35,7 +35,7 @@ import org.alfresco.jlan.oncrpc.nfs.NFSServer; import org.alfresco.jlan.oncrpc.portmap.PortMapperServer; import org.alfresco.jlan.server.NetworkServer; import org.alfresco.jlan.server.config.ServerConfiguration; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/filesys/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/ServerConfigurationBean.java index faa14f2e6f..d90d37b6fc 100644 --- a/source/java/org/alfresco/filesys/ServerConfigurationBean.java +++ b/source/java/org/alfresco/filesys/ServerConfigurationBean.java @@ -40,11 +40,11 @@ import java.util.Enumeration; import java.util.List; import java.util.StringTokenizer; -import org.alfresco.config.Config; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigLookupContext; -import org.alfresco.config.ConfigService; -import org.alfresco.config.element.GenericConfigElement; +import org.springframework.extensions.config.Config; +import org.springframework.extensions.config.ConfigElement; +import org.springframework.extensions.config.ConfigLookupContext; +import org.springframework.extensions.config.ConfigService; +import org.springframework.extensions.config.element.GenericConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.alfresco.DesktopAction; import org.alfresco.filesys.alfresco.DesktopActionException; diff --git a/source/java/org/alfresco/filesys/alfresco/DesktopAction.java b/source/java/org/alfresco/filesys/alfresco/DesktopAction.java index 906d8065bd..3519c75bac 100644 --- a/source/java/org/alfresco/filesys/alfresco/DesktopAction.java +++ b/source/java/org/alfresco/filesys/alfresco/DesktopAction.java @@ -28,7 +28,7 @@ import java.io.File; import java.io.IOException; import java.net.InetAddress; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.jlan.server.filesys.DiskSharedDevice; import org.alfresco.jlan.server.filesys.pseudo.LocalPseudoFile; import org.alfresco.jlan.server.filesys.pseudo.PseudoFile; diff --git a/source/java/org/alfresco/filesys/alfresco/HomeShareMapper.java b/source/java/org/alfresco/filesys/alfresco/HomeShareMapper.java index 23db652734..b22abe21f2 100644 --- a/source/java/org/alfresco/filesys/alfresco/HomeShareMapper.java +++ b/source/java/org/alfresco/filesys/alfresco/HomeShareMapper.java @@ -27,7 +27,7 @@ package org.alfresco.filesys.alfresco; import java.util.Enumeration; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.AlfrescoConfigSection; import org.alfresco.filesys.repo.ContentContext; import org.alfresco.filesys.repo.ContentDiskDriver; diff --git a/source/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java b/source/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java index 895cef7f6d..310bbfe41b 100644 --- a/source/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java +++ b/source/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java @@ -19,7 +19,7 @@ package org.alfresco.filesys.alfresco; import java.util.Enumeration; import java.util.Hashtable; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.AlfrescoConfigSection; import org.alfresco.filesys.repo.ContentContext; import org.alfresco.filesys.repo.ContentDiskDriver; diff --git a/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java b/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java index a6a4e60f72..a6d7a0f2a9 100644 --- a/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java +++ b/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java @@ -26,7 +26,7 @@ package org.alfresco.filesys.auth.cifs; import net.sf.acegisecurity.Authentication; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.AlfrescoConfigSection; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; import org.alfresco.filesys.repo.ContentContext; diff --git a/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java b/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java index 60ea1bc532..1e915d9ebd 100644 --- a/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/cifs/EnterpriseCifsAuthenticator.java @@ -42,7 +42,7 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import javax.security.sasl.RealmCallback; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; import org.alfresco.jlan.debug.Debug; diff --git a/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java b/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java index 32c7e6a7d7..3bdb83fcde 100644 --- a/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; import org.alfresco.filesys.auth.PassthruServerFactory; diff --git a/source/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java b/source/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java index c884c1592a..4db64089b8 100644 --- a/source/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java +++ b/source/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java @@ -27,7 +27,7 @@ package org.alfresco.filesys.auth.ftp; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.AlfrescoConfigSection; import org.alfresco.jlan.ftp.FTPAuthenticator; import org.alfresco.jlan.ftp.FTPSrvSession; diff --git a/source/java/org/alfresco/filesys/auth/ftp/PassthruFtpAuthenticator.java b/source/java/org/alfresco/filesys/auth/ftp/PassthruFtpAuthenticator.java index 194972a8eb..84bf8839ab 100644 --- a/source/java/org/alfresco/filesys/auth/ftp/PassthruFtpAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/ftp/PassthruFtpAuthenticator.java @@ -32,7 +32,7 @@ import javax.transaction.UserTransaction; import net.sf.acegisecurity.Authentication; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.ExtendedServerConfigurationAccessor; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; diff --git a/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java b/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java index 362a7d607e..a0d280467c 100644 --- a/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java +++ b/source/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java @@ -31,7 +31,7 @@ import java.util.List; import javax.transaction.Status; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.AlfrescoConfigSection; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; import org.alfresco.jlan.oncrpc.AuthType; diff --git a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java index dcf68d4ba6..39abc26155 100644 --- a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java +++ b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java @@ -32,7 +32,7 @@ import java.util.StringTokenizer; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.alfresco.AlfrescoDiskDriver; import org.alfresco.filesys.state.FileState; import org.alfresco.jlan.server.SrvSession; diff --git a/source/java/org/alfresco/filesys/avm/AVMShareMapper.java b/source/java/org/alfresco/filesys/avm/AVMShareMapper.java index 9b5a2e2b52..abd62b1201 100644 --- a/source/java/org/alfresco/filesys/avm/AVMShareMapper.java +++ b/source/java/org/alfresco/filesys/avm/AVMShareMapper.java @@ -25,7 +25,7 @@ package org.alfresco.filesys.avm; import java.util.Enumeration; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.jlan.server.SrvSession; import org.alfresco.jlan.server.config.InvalidConfigurationException; import org.alfresco.jlan.server.config.ServerConfiguration; diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java index c1607f17d5..d9b0f7c08d 100644 --- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java +++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java @@ -39,7 +39,7 @@ import java.util.Enumeration; import java.util.List; import java.util.StringTokenizer; -import org.alfresco.config.element.GenericConfigElement; +import org.springframework.extensions.config.element.GenericConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.AbstractServerConfigurationBean; import org.alfresco.filesys.alfresco.ExtendedDiskInterface; diff --git a/source/java/org/alfresco/filesys/debug/FileServerDebugInterface.java b/source/java/org/alfresco/filesys/debug/FileServerDebugInterface.java index e44844e017..98a160885d 100644 --- a/source/java/org/alfresco/filesys/debug/FileServerDebugInterface.java +++ b/source/java/org/alfresco/filesys/debug/FileServerDebugInterface.java @@ -6,7 +6,7 @@ package org.alfresco.filesys.debug; * Copyright (c) 2007 Starlasoft. All rights reserved. */ -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.jlan.debug.Debug; import org.alfresco.jlan.debug.DebugInterfaceBase; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java index 737f3ef224..26d72446f3 100644 --- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java +++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java @@ -32,7 +32,7 @@ import java.util.List; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.filesys.alfresco.AlfrescoContext; import org.alfresco.filesys.alfresco.AlfrescoDiskDriver; diff --git a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java index 97bfa7d2a1..d4e08e3db5 100644 --- a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java +++ b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java @@ -34,7 +34,7 @@ import java.nio.channels.FileChannel; import java.nio.charset.Charset; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.jlan.server.filesys.AccessDeniedException; import org.alfresco.jlan.server.filesys.DiskFullException; import org.alfresco.jlan.server.filesys.FileAttribute; diff --git a/source/java/org/alfresco/filesys/repo/HomeShareMapper.java b/source/java/org/alfresco/filesys/repo/HomeShareMapper.java index 59dee1e784..68c41404c3 100644 --- a/source/java/org/alfresco/filesys/repo/HomeShareMapper.java +++ b/source/java/org/alfresco/filesys/repo/HomeShareMapper.java @@ -39,7 +39,7 @@ import org.alfresco.jlan.server.core.SharedDevice; import org.alfresco.jlan.server.core.SharedDeviceList; import org.alfresco.jlan.server.filesys.DiskSharedDevice; import org.alfresco.jlan.server.filesys.FilesystemsConfigSection; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.alfresco.AlfrescoClientInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/filesys/repo/desk/JavaScriptDesktopAction.java b/source/java/org/alfresco/filesys/repo/desk/JavaScriptDesktopAction.java index eb7bc02f75..2a132d6a4e 100644 --- a/source/java/org/alfresco/filesys/repo/desk/JavaScriptDesktopAction.java +++ b/source/java/org/alfresco/filesys/repo/desk/JavaScriptDesktopAction.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import org.alfresco.config.ConfigElement; +import org.springframework.extensions.config.ConfigElement; import org.alfresco.filesys.alfresco.AlfrescoContext; import org.alfresco.filesys.alfresco.AlfrescoDiskDriver; import org.alfresco.filesys.alfresco.DesktopAction; diff --git a/source/java/org/alfresco/jcr/api/JCRNodeRef.java b/source/java/org/alfresco/jcr/api/JCRNodeRef.java index 7527060da3..0b1c4688e2 100644 --- a/source/java/org/alfresco/jcr/api/JCRNodeRef.java +++ b/source/java/org/alfresco/jcr/api/JCRNodeRef.java @@ -32,7 +32,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/jcr/exporter/JCRDocumentXMLExporter.java b/source/java/org/alfresco/jcr/exporter/JCRDocumentXMLExporter.java index b97f51765e..4f0c10e9a4 100644 --- a/source/java/org/alfresco/jcr/exporter/JCRDocumentXMLExporter.java +++ b/source/java/org/alfresco/jcr/exporter/JCRDocumentXMLExporter.java @@ -51,7 +51,7 @@ import org.alfresco.service.cmr.view.Exporter; import org.alfresco.service.cmr.view.ExporterContext; import org.alfresco.service.cmr.view.ExporterException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.alfresco.util.ISO9075; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; diff --git a/source/java/org/alfresco/jcr/exporter/JCRSystemXMLExporter.java b/source/java/org/alfresco/jcr/exporter/JCRSystemXMLExporter.java index 67b7292c46..47a6c80aa6 100644 --- a/source/java/org/alfresco/jcr/exporter/JCRSystemXMLExporter.java +++ b/source/java/org/alfresco/jcr/exporter/JCRSystemXMLExporter.java @@ -51,7 +51,7 @@ import org.alfresco.service.cmr.view.Exporter; import org.alfresco.service.cmr.view.ExporterContext; import org.alfresco.service.cmr.view.ExporterException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/source/java/org/alfresco/jcr/importer/JCRDocXMLHandler.java b/source/java/org/alfresco/jcr/importer/JCRDocXMLHandler.java index fbfcb874c0..6435d9ccb6 100644 --- a/source/java/org/alfresco/jcr/importer/JCRDocXMLHandler.java +++ b/source/java/org/alfresco/jcr/importer/JCRDocXMLHandler.java @@ -55,7 +55,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.alfresco.util.ISO9075; import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/source/java/org/alfresco/jcr/importer/JCRSystemXMLHandler.java b/source/java/org/alfresco/jcr/importer/JCRSystemXMLHandler.java index 9a8856cf46..4f8bdccd34 100644 --- a/source/java/org/alfresco/jcr/importer/JCRSystemXMLHandler.java +++ b/source/java/org/alfresco/jcr/importer/JCRSystemXMLHandler.java @@ -57,7 +57,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/source/java/org/alfresco/jcr/item/NodeImpl.java b/source/java/org/alfresco/jcr/item/NodeImpl.java index 8d241fc438..ee4527b29c 100644 --- a/source/java/org/alfresco/jcr/item/NodeImpl.java +++ b/source/java/org/alfresco/jcr/item/NodeImpl.java @@ -86,7 +86,7 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/jcr/session/SessionImpl.java b/source/java/org/alfresco/jcr/session/SessionImpl.java index 2746ccfaae..4b1d628da4 100644 --- a/source/java/org/alfresco/jcr/session/SessionImpl.java +++ b/source/java/org/alfresco/jcr/session/SessionImpl.java @@ -96,7 +96,7 @@ import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.cmr.view.Location; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; import org.xml.sax.ContentHandler; diff --git a/source/java/org/alfresco/jcr/session/WorkspaceImpl.java b/source/java/org/alfresco/jcr/session/WorkspaceImpl.java index cd9c571130..eed83b26d3 100644 --- a/source/java/org/alfresco/jcr/session/WorkspaceImpl.java +++ b/source/java/org/alfresco/jcr/session/WorkspaceImpl.java @@ -59,7 +59,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.xml.sax.ContentHandler; /** diff --git a/source/java/org/alfresco/linkvalidation/HrefStatusMap.java b/source/java/org/alfresco/linkvalidation/HrefStatusMap.java index 0f7556e234..a88a1911db 100644 --- a/source/java/org/alfresco/linkvalidation/HrefStatusMap.java +++ b/source/java/org/alfresco/linkvalidation/HrefStatusMap.java @@ -30,7 +30,7 @@ package org.alfresco.linkvalidation; import java.util.HashMap; import java.util.Map; import java.util.List; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A synchronized wrapper for the ephemeral cache of href status results. diff --git a/source/java/org/alfresco/linkvalidation/LinkValidationAction.java b/source/java/org/alfresco/linkvalidation/LinkValidationAction.java index e1e15f2064..49317329a3 100644 --- a/source/java/org/alfresco/linkvalidation/LinkValidationAction.java +++ b/source/java/org/alfresco/linkvalidation/LinkValidationAction.java @@ -29,7 +29,7 @@ import java.util.List; import org.alfresco.config.JNDIConstants; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.action.executer.ActionExecuterAbstractBase; import org.alfresco.repo.avm.AVMNodeConverter; @@ -41,7 +41,7 @@ import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avmsync.AVMSyncException; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/linkvalidation/LinkValidationReport.java b/source/java/org/alfresco/linkvalidation/LinkValidationReport.java index 05bc16a0a4..0a8694aaeb 100755 --- a/source/java/org/alfresco/linkvalidation/LinkValidationReport.java +++ b/source/java/org/alfresco/linkvalidation/LinkValidationReport.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/linkvalidation/LinkValidationServiceBootstrap.java b/source/java/org/alfresco/linkvalidation/LinkValidationServiceBootstrap.java index 54d95903ef..d78d3f107b 100644 --- a/source/java/org/alfresco/linkvalidation/LinkValidationServiceBootstrap.java +++ b/source/java/org/alfresco/linkvalidation/LinkValidationServiceBootstrap.java @@ -27,7 +27,7 @@ package org.alfresco.linkvalidation; import org.alfresco.repo.avm.util.RawServices; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/action/ActionServiceImpl.java b/source/java/org/alfresco/repo/action/ActionServiceImpl.java index c3a98bdb23..cfb8166acc 100644 --- a/source/java/org/alfresco/repo/action/ActionServiceImpl.java +++ b/source/java/org/alfresco/repo/action/ActionServiceImpl.java @@ -63,7 +63,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.GUID; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; diff --git a/source/java/org/alfresco/repo/action/ActionsAspect.java b/source/java/org/alfresco/repo/action/ActionsAspect.java index a8e03b4e43..50bac4e503 100644 --- a/source/java/org/alfresco/repo/action/ActionsAspect.java +++ b/source/java/org/alfresco/repo/action/ActionsAspect.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Class containing behaviour for the actions aspect diff --git a/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java b/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java index 8bb7d88589..32d2c199ca 100644 --- a/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java +++ b/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java @@ -28,7 +28,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.action.ParameterizedItem; import org.alfresco.service.cmr.action.ParameterizedItemDefinition; diff --git a/source/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java b/source/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java index d5a114aa20..5345b93551 100644 --- a/source/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java +++ b/source/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.action.ParameterizedItemDefinition; import org.alfresco.service.cmr.rule.RuleServiceException; diff --git a/source/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java b/source/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java index 6c68a52559..d14e78c95c 100644 --- a/source/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.content.MimetypeMap; diff --git a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java index 21cc221101..0f6884721b 100644 --- a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java +++ b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java @@ -37,7 +37,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java index e8494efe9c..390002806e 100644 --- a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java +++ b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchParameters; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import freemarker.template.TemplateDateModel; import freemarker.template.TemplateMethodModelEx; diff --git a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java index 12004cedeb..1a8df8647d 100644 --- a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java +++ b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java @@ -35,7 +35,7 @@ import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.activities.ActivityPostService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java index c8eaa420a6..36e6c078bd 100644 --- a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java +++ b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java @@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; diff --git a/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java b/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java index 18b25b0ffe..15afa4677d 100644 --- a/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java +++ b/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java @@ -27,7 +27,7 @@ package org.alfresco.repo.activities.feed; import org.alfresco.repo.activities.ActivityPostServiceImpl; import org.alfresco.repo.domain.activities.ActivityPostDAO; import org.alfresco.service.cmr.security.AuthenticationService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java index 6d9e7bbf35..da1d286ab8 100644 --- a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java +++ b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java @@ -49,7 +49,7 @@ import org.alfresco.repo.domain.activities.ActivityFeedEntity; import org.alfresco.repo.domain.activities.ActivityPostEntity; import org.alfresco.repo.domain.activities.FeedControlEntity; import org.alfresco.repo.template.ISO8601DateFormatMethod; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.alfresco.util.JSONtoFmModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java b/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java index d21f8c2a8b..015d427d2e 100644 --- a/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java +++ b/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java @@ -30,7 +30,7 @@ import java.util.List; import org.alfresco.repo.domain.activities.ActivityFeedDAO; import org.alfresco.repo.domain.activities.ActivityFeedEntity; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java b/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java index 733babcab9..6e78e22ca0 100644 --- a/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java +++ b/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java @@ -30,7 +30,7 @@ import java.util.Date; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.domain.activities.ActivityPostDAO; import org.alfresco.repo.domain.activities.ActivityPostEntity; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java b/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java index 03ad8dfc55..9a2d8ed804 100644 --- a/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java +++ b/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java @@ -42,8 +42,8 @@ import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.Pair; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/admin/BaseInterpreter.java b/source/java/org/alfresco/repo/admin/BaseInterpreter.java index 09e80689ae..5a59e76569 100755 --- a/source/java/org/alfresco/repo/admin/BaseInterpreter.java +++ b/source/java/org/alfresco/repo/admin/BaseInterpreter.java @@ -33,7 +33,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.ApplicationContextHelper; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; @@ -212,7 +212,7 @@ public abstract class BaseInterpreter extends AbstractLifecycleBean } /* (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ @Override protected void onBootstrap(ApplicationEvent event) @@ -221,7 +221,7 @@ public abstract class BaseInterpreter extends AbstractLifecycleBean } /* (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ @Override protected void onShutdown(ApplicationEvent event) diff --git a/source/java/org/alfresco/repo/admin/ConfigurationChecker.java b/source/java/org/alfresco/repo/admin/ConfigurationChecker.java index 0b945663b4..ba7daf8a8f 100644 --- a/source/java/org/alfresco/repo/admin/ConfigurationChecker.java +++ b/source/java/org/alfresco/repo/admin/ConfigurationChecker.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.node.index.FullIndexRecoveryComponent.RecoveryMode; @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java b/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java index 47758194bb..556255875a 100755 --- a/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java +++ b/source/java/org/alfresco/repo/admin/RepoAdminInterpreter.java @@ -31,7 +31,7 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.admin.RepoAdminService; import org.alfresco.service.namespace.QName; import org.springframework.core.io.ClassPathResource; diff --git a/source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java b/source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java index fef9977a42..b958e7dba2 100755 --- a/source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java +++ b/source/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; diff --git a/source/java/org/alfresco/repo/admin/patch/AbstractPatch.java b/source/java/org/alfresco/repo/admin/patch/AbstractPatch.java index cc07b4831f..051a0c2a6a 100644 --- a/source/java/org/alfresco/repo/admin/patch/AbstractPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/AbstractPatch.java @@ -31,7 +31,7 @@ import java.util.Date; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.node.integrity.IntegrityChecker; import org.alfresco.repo.security.authentication.AuthenticationContext; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java b/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java index 7b016eeac5..d402c1d753 100644 --- a/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java +++ b/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java @@ -28,9 +28,9 @@ import java.util.Date; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java index ed719e4879..69a1615312 100644 --- a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java +++ b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.domain.AppliedPatch; import org.alfresco.repo.transaction.TransactionServiceImpl; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMFormsPropertyTokenisationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMFormsPropertyTokenisationPatch.java index 8722b70332..45dce641ff 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMFormsPropertyTokenisationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMFormsPropertyTokenisationPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMGuidPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMGuidPatch.java index 778d7bfd98..af58043471 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMGuidPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMGuidPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.avm.AVMNodeDAO; import org.alfresco.repo.domain.avm.AVMNodeEntity; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java index a063102d32..909a272f16 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.avm.AVMNodeDAO; import org.alfresco.repo.domain.avm.AVMNodeEntity; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMLockingPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMLockingPatch.java index 56f5369420..9972a01769 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMLockingPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMLockingPatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.service.cmr.avm.locking.AVMLockingService; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMPermissionDataPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMPermissionDataPatch.java index 922970fe01..dae4cff389 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMPermissionDataPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMPermissionDataPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMStorePropertyTokenisationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMStorePropertyTokenisationPatch.java index b0a2ded9f4..cf05c74337 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMStorePropertyTokenisationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMStorePropertyTokenisationPatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.importer.ImporterBootstrap; /** diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMWebProjectInheritPermissionsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMWebProjectInheritPermissionsPatch.java index 3a0ea3d8a9..b2deafe58e 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AVMWebProjectInheritPermissionsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMWebProjectInheritPermissionsPatch.java @@ -26,7 +26,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ActionRuleDecouplingPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ActionRuleDecouplingPatch.java index 9a0546c45c..2b105b091e 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ActionRuleDecouplingPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ActionRuleDecouplingPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.io.Serializable; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ActionModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java index 2ff9fb427b..559556eba6 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.PatchExecuter; import org.alfresco.repo.domain.hibernate.HibernateSessionHelper; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityMigrationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityMigrationPatch.java index ea1ba9def6..559113e3ac 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityMigrationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityMigrationPatch.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.PatchExecuter; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java index 2adde39647..7eb9242645 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.QNameDAO; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/CategoryRootPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/CategoryRootPermissionPatch.java index 70f7b27809..5325cfe20e 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/CategoryRootPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/CategoryRootPermissionPatch.java @@ -26,7 +26,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ContentFormTypePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ContentFormTypePatch.java index 33232ca3f5..27a9c14246 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ContentFormTypePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ContentFormTypePatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.ArrayList; import java.util.Collection; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ContentPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ContentPermissionPatch.java index 5869bc734e..7d71a455a0 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ContentPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ContentPermissionPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/DeploymentMigrationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/DeploymentMigrationPatch.java index 9e3e70ec52..c9f6a9b6c6 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/DeploymentMigrationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/DeploymentMigrationPatch.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/DescriptorUpdatePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/DescriptorUpdatePatch.java index 419ed738c3..2d742255dd 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/DescriptorUpdatePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/DescriptorUpdatePatch.java @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java index d1729a3587..d389c747ab 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java @@ -26,7 +26,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.AccessControlListDAO; import org.alfresco.repo.domain.hibernate.AclDaoComponentImpl; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesContentPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesContentPatch.java index 66dded9214..dded589904 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesContentPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesContentPatch.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java index 67fca9814d..c4620eedef 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/EmailTemplatesFolderPatch.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java index 5e92ebdc42..6477da82b6 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import java.util.zip.CRC32; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.ChildAssoc; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java index 5d650a6dc6..c80838b2a0 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ForumsIconsPatch.java @@ -2,7 +2,7 @@ package org.alfresco.repo.admin.patch.impl; import java.io.Serializable; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ForumModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java index 567ab98368..52fe469e47 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.service.cmr.admin.PatchException; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java index 57cb01f7aa..9eabc6c5be 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.workflow.WorkflowDeployer; import org.springframework.beans.BeansException; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GroupTokenisationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GroupTokenisationPatch.java index 27499851a1..d46b150028 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GroupTokenisationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GroupTokenisationPatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.search.Indexer; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch.java index 6b231ea1b3..2fe209e6b4 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch2.java b/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch2.java index 3ed1924667..2eb1ae4f93 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch2.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GuestPersonPermissionPatch2.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java index 6222b75a29..00358386b2 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/GuestUserPatch.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java index 787d4c7a7f..3b55eef885 100755 --- a/source/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java index 03d32829af..bf9f941a13 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java @@ -32,7 +32,7 @@ import java.nio.channels.FileChannel; import java.util.Date; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.Node; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/InvalidUserPersonAndGroupPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/InvalidUserPersonAndGroupPatch.java index caf3c3a95c..27a5497fb7 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/InvalidUserPersonAndGroupPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/InvalidUserPersonAndGroupPatch.java @@ -28,7 +28,7 @@ package org.alfresco.repo.admin.patch.impl; import java.io.Serializable; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/InvitationMigrationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/InvitationMigrationPatch.java index a7fd84b950..0ea16b9bfe 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/InvitationMigrationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/InvitationMigrationPatch.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.invitation.InvitationServiceImpl; import org.alfresco.service.cmr.workflow.WorkflowDefinition; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java index af7c746b08..f6f54fb873 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java @@ -30,7 +30,7 @@ import java.nio.channels.FileChannel; import java.util.Date; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.hibernate.NodeImpl; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java index 34c6a1b82c..dc6311783a 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStoreUpdateCounterPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStoreUpdateCounterPatch.java index e8ff181e64..526386c81b 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStoreUpdateCounterPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStoreUpdateCounterPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.version.Version2Model; import org.alfresco.repo.version.VersionModel; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MoveWCMToGroupBasedPermissionsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MoveWCMToGroupBasedPermissionsPatch.java index 3ab8620008..ada9709fcd 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/MoveWCMToGroupBasedPermissionsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/MoveWCMToGroupBasedPermissionsPatch.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.avm.AVMNodeConverter; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java index af6bd64862..4ebfbe9ced 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/MultiTShareExistingTenantsPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.site.SiteAVMBootstrap; import org.alfresco.repo.tenant.TenantService; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java index a4f9417543..c82da4fa0d 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; /** diff --git a/source/java/org/alfresco/repo/admin/patch/impl/NodePropertySerializablePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/NodePropertySerializablePatch.java index ce8874187f..b1534a6209 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/NodePropertySerializablePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/NodePropertySerializablePatch.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.domain.Node; import org.alfresco.repo.domain.NodePropertyValue; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/PermissionDataPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/PermissionDataPatch.java index 036d67f9bf..a8877729c7 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/PermissionDataPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/PermissionDataPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/PersonUsagePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/PersonUsagePatch.java index 720f824763..3934808966 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/PersonUsagePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/PersonUsagePatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.node.db.NodeDaoService; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java index e694b9d90f..cc7bc998a9 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/RSSTemplatesFolderPatch.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ResetWCMToGroupBasedPermissionsPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ResetWCMToGroupBasedPermissionsPatch.java index 4b8bfc937e..2a9b7aa771 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ResetWCMToGroupBasedPermissionsPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ResetWCMToGroupBasedPermissionsPatch.java @@ -35,7 +35,7 @@ import java.util.zip.CRC32; import org.alfresco.config.JNDIConstants; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.domain.DbAccessControlEntry; import org.alfresco.repo.domain.DbAccessControlList; @@ -65,7 +65,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java index 1b68793c71..8c019e5440 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchPermissionPatch.java index f8466b504b..117a84cf38 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchPermissionPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.admin.PatchException; import org.alfresco.service.cmr.security.PermissionService; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java index 758b4f8fe8..28bdae20c0 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ScriptsFolderPatch.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SitePermissionRefactorPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SitePermissionRefactorPatch.java index 74fa1124d8..ce13beb02e 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SitePermissionRefactorPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SitePermissionRefactorPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.site.SiteModel; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SiteStorePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SiteStorePatch.java index 2c09de36a6..3679a08d03 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SiteStorePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SiteStorePatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.site.SiteAVMBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SpacesRootPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SpacesRootPermissionPatch.java index 23061e29e7..307ff66fbe 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SpacesRootPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SpacesRootPermissionPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SpacesStoreGuestPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SpacesStoreGuestPermissionPatch.java index b6bfb15885..9d47502f45 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SpacesStoreGuestPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SpacesStoreGuestPermissionPatch.java @@ -26,7 +26,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java index 775b1da496..5e30ae462e 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SystemDescriptorContentPatch.java @@ -26,7 +26,7 @@ package org.alfresco.repo.admin.patch.impl; import java.io.InputStream; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.ConfigurationChecker; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SystemWorkflowFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SystemWorkflowFolderPatch.java index db0a2c730b..c491cc9e36 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SystemWorkflowFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SystemWorkflowFolderPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.workflow.WorkflowPackageImpl; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/TopLevelGroupParentChildAssociationTypePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/TopLevelGroupParentChildAssociationTypePatch.java index 8a8794a821..a9a99970e7 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/TopLevelGroupParentChildAssociationTypePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/TopLevelGroupParentChildAssociationTypePatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.service.cmr.repository.ChildAssociationRef; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java index 82b933816e..4a4cf1c1d9 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/UIFacetsAspectRemovalPatch.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ACPImportPackageHandler; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UpdateGuestPermissionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UpdateGuestPermissionPatch.java index 2de4f34fde..ee498edc94 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/UpdateGuestPermissionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/UpdateGuestPermissionPatch.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; /** diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UserAndPersonTokenisationPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UserAndPersonTokenisationPatch.java index 491fff98a5..cdc485e80c 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/UserAndPersonTokenisationPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/UserAndPersonTokenisationPatch.java @@ -25,7 +25,7 @@ package org.alfresco.repo.admin.patch.impl; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.search.Indexer; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/VersionHistoryPerformancePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/VersionHistoryPerformancePatch.java index b323b22514..1f9364e214 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/VersionHistoryPerformancePatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/VersionHistoryPerformancePatch.java @@ -2,7 +2,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.version.VersionModel; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java index 89cfb0b9ec..56b6e71f6d 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/WCMPostPermissionSnapshotPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/WCMPostPermissionSnapshotPatch.java index bd88e6c371..3dc2512d6c 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/WCMPostPermissionSnapshotPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/WCMPostPermissionSnapshotPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.ArrayList; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptor; import org.alfresco.repo.search.impl.lucene.AVMLuceneIndexer; diff --git a/source/java/org/alfresco/repo/admin/patch/impl/WebSiteAddModeratedPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/WebSiteAddModeratedPatch.java index 02cddf4a6f..f92348b725 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/WebSiteAddModeratedPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/WebSiteAddModeratedPatch.java @@ -27,7 +27,7 @@ package org.alfresco.repo.admin.patch.impl; import java.util.List; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.site.SiteModel; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java b/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java index dfbe821349..0f1ff2c0cb 100644 --- a/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java +++ b/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java @@ -46,8 +46,8 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/attributes/AttributeDAO.java b/source/java/org/alfresco/repo/attributes/AttributeDAO.java index a3fae0bcf2..c638992d64 100644 --- a/source/java/org/alfresco/repo/attributes/AttributeDAO.java +++ b/source/java/org/alfresco/repo/attributes/AttributeDAO.java @@ -29,7 +29,7 @@ import java.util.List; import org.alfresco.repo.domain.hibernate.DirtySessionAnnotation; import org.alfresco.service.cmr.attributes.AttrQuery; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Interface for persistence operations on attributes. diff --git a/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java b/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java index 919de4046e..aabeb2171d 100644 --- a/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java +++ b/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java @@ -35,7 +35,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Implementation of the AttributeService interface. diff --git a/source/java/org/alfresco/repo/attributes/AttributeServiceTest.java b/source/java/org/alfresco/repo/attributes/AttributeServiceTest.java index fff7912087..f63bb80b62 100644 --- a/source/java/org/alfresco/repo/attributes/AttributeServiceTest.java +++ b/source/java/org/alfresco/repo/attributes/AttributeServiceTest.java @@ -42,7 +42,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.support.FileSystemXmlApplicationContext; import junit.framework.TestCase; diff --git a/source/java/org/alfresco/repo/attributes/AttributeServiceTransportService.java b/source/java/org/alfresco/repo/attributes/AttributeServiceTransportService.java index 2efbdfceef..dd7b9d9d60 100644 --- a/source/java/org/alfresco/repo/attributes/AttributeServiceTransportService.java +++ b/source/java/org/alfresco/repo/attributes/AttributeServiceTransportService.java @@ -32,7 +32,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Server side implementation of transport for AttributeService. diff --git a/source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java b/source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java index e25b286047..08f8f77e92 100644 --- a/source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java +++ b/source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java @@ -42,7 +42,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; diff --git a/source/java/org/alfresco/repo/audit/AuditBootstrap.java b/source/java/org/alfresco/repo/audit/AuditBootstrap.java index 4bf75c2b18..6740a482cc 100644 --- a/source/java/org/alfresco/repo/audit/AuditBootstrap.java +++ b/source/java/org/alfresco/repo/audit/AuditBootstrap.java @@ -27,7 +27,7 @@ package org.alfresco.repo.audit; import org.alfresco.repo.audit.model.AuditModelRegistry; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java index f7b2db7fcb..b10e6aab39 100644 --- a/source/java/org/alfresco/repo/audit/AuditComponentImpl.java +++ b/source/java/org/alfresco/repo/audit/AuditComponentImpl.java @@ -64,7 +64,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.PathMapper; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/audit/AuditServiceImpl.java b/source/java/org/alfresco/repo/audit/AuditServiceImpl.java index 9fc16ccb27..3ead92403b 100644 --- a/source/java/org/alfresco/repo/audit/AuditServiceImpl.java +++ b/source/java/org/alfresco/repo/audit/AuditServiceImpl.java @@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java index b6695ad64e..a9e005e89b 100644 --- a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.audit.extractor; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.registry.NamedObjectRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java index e6eb057616..490d1b9879 100644 --- a/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java @@ -29,7 +29,7 @@ import java.io.Serializable; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * An extractor that pulls out the {@link ContentModel#PROP_NAME cm:name} property from a node. diff --git a/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java index edb8adf9a0..0be9a9f3fa 100644 --- a/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java @@ -29,7 +29,7 @@ import java.io.Serializable; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * An extractor that pulls out the type of a node. diff --git a/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java b/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java index ab847d6c41..69d0bf80eb 100644 --- a/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java +++ b/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.audit.generator; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.registry.NamedObjectRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java b/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java index 4fec0766fa..aa97a73c47 100644 --- a/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java +++ b/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java @@ -31,7 +31,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Gives back the full name (person details) of the currently-authenticated user. diff --git a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java index 7cd37c09f8..28ecf3c619 100644 --- a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java +++ b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java @@ -56,7 +56,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; diff --git a/source/java/org/alfresco/repo/audit/model/AuditModelReader.java b/source/java/org/alfresco/repo/audit/model/AuditModelReader.java index 7b78d54e88..693104ab5b 100644 --- a/source/java/org/alfresco/repo/audit/model/AuditModelReader.java +++ b/source/java/org/alfresco/repo/audit/model/AuditModelReader.java @@ -26,7 +26,7 @@ package org.alfresco.repo.audit.model; import java.net.URL; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.ResourceUtils; diff --git a/source/java/org/alfresco/repo/audit/model/AuditModelRegistry.java b/source/java/org/alfresco/repo/audit/model/AuditModelRegistry.java index 25939cb6cf..1f307855ac 100644 --- a/source/java/org/alfresco/repo/audit/model/AuditModelRegistry.java +++ b/source/java/org/alfresco/repo/audit/model/AuditModelRegistry.java @@ -62,7 +62,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.PathMapper; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.registry.NamedObjectRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java index 625f874a95..41fb6f4088 100644 --- a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java +++ b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java @@ -36,7 +36,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.alfresco.config.JNDIConstants; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.mbeans.VirtServerRegistry; import org.alfresco.model.ContentModel; import org.alfresco.model.WCMAppModel; @@ -66,7 +66,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.wcm.sandbox.SandboxFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMInterpreter.java b/source/java/org/alfresco/repo/avm/AVMInterpreter.java index 62b55248e7..069bad188c 100644 --- a/source/java/org/alfresco/repo/avm/AVMInterpreter.java +++ b/source/java/org/alfresco/repo/avm/AVMInterpreter.java @@ -56,7 +56,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.wcm.util.WCMUtil; import org.springframework.context.support.FileSystemXmlApplicationContext; diff --git a/source/java/org/alfresco/repo/avm/AVMLockingAwareService.java b/source/java/org/alfresco/repo/avm/AVMLockingAwareService.java index ff59e94f55..48542b8ad4 100644 --- a/source/java/org/alfresco/repo/avm/AVMLockingAwareService.java +++ b/source/java/org/alfresco/repo/avm/AVMLockingAwareService.java @@ -49,7 +49,7 @@ import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.wcm.util.WCMUtil; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java index 1ca02da6bb..011312e53e 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java +++ b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java @@ -27,7 +27,7 @@ import org.alfresco.repo.avm.util.AVMUtil; import org.alfresco.service.cmr.avm.AVMException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverterTest.java b/source/java/org/alfresco/repo/avm/AVMNodeConverterTest.java index 04529b8fee..ec05f91794 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeConverterTest.java +++ b/source/java/org/alfresco/repo/avm/AVMNodeConverterTest.java @@ -24,7 +24,7 @@ package org.alfresco.repo.avm; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import junit.framework.TestCase; diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java index 580ac16aec..479f3127e4 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeService.java +++ b/source/java/org/alfresco/repo/avm/AVMNodeService.java @@ -70,7 +70,7 @@ import org.alfresco.service.cmr.repository.datatype.TypeConversionException; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QNamePattern; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java index 24fc477320..b61efd83ce 100644 --- a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java +++ b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java @@ -19,7 +19,7 @@ import org.alfresco.service.cmr.avm.LayeringDescriptor; import org.alfresco.service.cmr.avm.VersionDescriptor; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A loopback implementation of the AVMRemote interface? diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java index a571d65316..d59e281d94 100644 --- a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java +++ b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java @@ -25,7 +25,7 @@ import org.alfresco.service.cmr.remote.AVMRemoteTransport; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Implementation of AVMRemoteTransport for the server side. It's diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java index 091b1f5ed3..f6c72b31e8 100644 --- a/source/java/org/alfresco/repo/avm/AVMRepository.java +++ b/source/java/org/alfresco/repo/avm/AVMRepository.java @@ -63,7 +63,7 @@ import org.alfresco.service.cmr.security.PermissionContext; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.util.FileNameValidator; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java index 6a0ad9be92..dc8e1e31dd 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.namespace.QName; import org.alfresco.util.FileNameValidator; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java index a3c0a13975..b7a3d36056 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java @@ -53,7 +53,7 @@ import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.QName; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.NameMatcher; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java index e51adde7be..58bfbdccf9 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java @@ -84,7 +84,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.wcm.sandbox.SandboxConstants; /** diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java index 9b5ded38fb..f477bfdf6f 100644 --- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java +++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java @@ -63,7 +63,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/AvmBootstrap.java b/source/java/org/alfresco/repo/avm/AvmBootstrap.java index 96928f39e7..472faaedde 100644 --- a/source/java/org/alfresco/repo/avm/AvmBootstrap.java +++ b/source/java/org/alfresco/repo/avm/AvmBootstrap.java @@ -27,7 +27,7 @@ package org.alfresco.repo.avm; import java.util.List; import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/avm/CreateVersionTxnListener.java b/source/java/org/alfresco/repo/avm/CreateVersionTxnListener.java index 4247000e46..44c2b986b8 100644 --- a/source/java/org/alfresco/repo/avm/CreateVersionTxnListener.java +++ b/source/java/org/alfresco/repo/avm/CreateVersionTxnListener.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.repo.transaction.TransactionListenerAdapter; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Transaction listener that fires create version events. diff --git a/source/java/org/alfresco/repo/avm/DirectoryNode.java b/source/java/org/alfresco/repo/avm/DirectoryNode.java index d2fc266bd7..a21e5f78a9 100644 --- a/source/java/org/alfresco/repo/avm/DirectoryNode.java +++ b/source/java/org/alfresco/repo/avm/DirectoryNode.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.SortedMap; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * The interface for Directory Nodes. diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java index baaebb26e6..1f68a181ab 100644 --- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java +++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java @@ -40,7 +40,7 @@ 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.security.PermissionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A layered directory node. A layered directory node points at an underlying directory, which may or may not exist. The diff --git a/source/java/org/alfresco/repo/avm/Lookup.java b/source/java/org/alfresco/repo/avm/Lookup.java index 810d509d63..bb4a86f4d0 100644 --- a/source/java/org/alfresco/repo/avm/Lookup.java +++ b/source/java/org/alfresco/repo/avm/Lookup.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.repo.avm.util.AVMUtil; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * This holds all the information necessary to perform operations diff --git a/source/java/org/alfresco/repo/avm/MultiTAVMService.java b/source/java/org/alfresco/repo/avm/MultiTAVMService.java index f23f30c5fc..b361088823 100644 --- a/source/java/org/alfresco/repo/avm/MultiTAVMService.java +++ b/source/java/org/alfresco/repo/avm/MultiTAVMService.java @@ -48,7 +48,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * An MT-aware wrapper of AVMService diff --git a/source/java/org/alfresco/repo/avm/NOOPLookupCache.java b/source/java/org/alfresco/repo/avm/NOOPLookupCache.java index c6cef06926..e5e6b381a4 100644 --- a/source/java/org/alfresco/repo/avm/NOOPLookupCache.java +++ b/source/java/org/alfresco/repo/avm/NOOPLookupCache.java @@ -27,7 +27,7 @@ package org.alfresco.repo.avm; import org.alfresco.repo.avm.util.SimplePath; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A NO-OP implementation of AVM path lookup cache diff --git a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java index cbaaa67d72..ec1110f805 100644 --- a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java +++ b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java @@ -36,7 +36,7 @@ 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.security.PermissionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A plain directory. No monkey tricks except for possiblyCopy. diff --git a/source/java/org/alfresco/repo/avm/PurgeVersionTxnListener.java b/source/java/org/alfresco/repo/avm/PurgeVersionTxnListener.java index 44ec282aaf..18388a136b 100644 --- a/source/java/org/alfresco/repo/avm/PurgeVersionTxnListener.java +++ b/source/java/org/alfresco/repo/avm/PurgeVersionTxnListener.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.repo.transaction.TransactionListenerAdapter; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Transaction listener that fires purge version events. diff --git a/source/java/org/alfresco/repo/avm/TransactionalLookupCache.java b/source/java/org/alfresco/repo/avm/TransactionalLookupCache.java index e3365bc0b1..e82c92303c 100644 --- a/source/java/org/alfresco/repo/avm/TransactionalLookupCache.java +++ b/source/java/org/alfresco/repo/avm/TransactionalLookupCache.java @@ -31,7 +31,7 @@ import org.alfresco.repo.avm.util.SimplePath; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java b/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java index 8c1ab8304c..8ffcba1a6c 100644 --- a/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java +++ b/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java @@ -27,7 +27,7 @@ package org.alfresco.repo.avm; import java.io.Serializable; -import org.alfresco.util.MD5; +import org.springframework.extensions.surf.util.MD5; /** * Implementation of entry for tracking layered nodes which were diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java index 6f9d666453..c123aaef3c 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.RegexNameMatcher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java b/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java index 2b56f5e39b..d3316c6702 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMRevertStoreAction.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.avmsync.AVMDifference; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java b/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java index 18941a171b..257cf9f23c 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMRevertToVersionAction.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java index 47e9eb1e2d..4898d25c51 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.avm.locking.AVMLockingService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMPromoteAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMPromoteAction.java index 5337801f0f..8322440403 100644 --- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMPromoteAction.java +++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMPromoteAction.java @@ -37,7 +37,7 @@ import org.alfresco.service.cmr.avmsync.AVMSyncException; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * An ActionExecuter that promotes content from one store to another. diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java index a22a33532c..7212f0a4f1 100644 --- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java +++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.avmsync.AVMSyncException; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.util.NameMatcher; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/ibatis/AVMStorePropertyDAOIbatis.java b/source/java/org/alfresco/repo/avm/ibatis/AVMStorePropertyDAOIbatis.java index 921cabde3b..77e25b183a 100644 --- a/source/java/org/alfresco/repo/avm/ibatis/AVMStorePropertyDAOIbatis.java +++ b/source/java/org/alfresco/repo/avm/ibatis/AVMStorePropertyDAOIbatis.java @@ -37,7 +37,7 @@ import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.QNameDAO; import org.alfresco.repo.domain.avm.AVMStorePropertyEntity; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingBootstrap.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingBootstrap.java index 512978b075..11e8600327 100644 --- a/source/java/org/alfresco/repo/avm/locking/AVMLockingBootstrap.java +++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingBootstrap.java @@ -27,7 +27,7 @@ package org.alfresco.repo.avm.locking; import org.alfresco.service.cmr.avm.locking.AVMLockingService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java index fa9d17854e..49d464a9b5 100644 --- a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java +++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java @@ -50,8 +50,8 @@ import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.MD5; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.MD5; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/avm/util/BulkLoader.java b/source/java/org/alfresco/repo/avm/util/BulkLoader.java index bf5184b05f..c4fb7d5d07 100644 --- a/source/java/org/alfresco/repo/avm/util/BulkLoader.java +++ b/source/java/org/alfresco/repo/avm/util/BulkLoader.java @@ -38,7 +38,7 @@ import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * This takes a filesystem directory path and a repository path and name diff --git a/source/java/org/alfresco/repo/avm/util/VersionPathStuffer.java b/source/java/org/alfresco/repo/avm/util/VersionPathStuffer.java index fe4b57797d..a190371a33 100644 --- a/source/java/org/alfresco/repo/avm/util/VersionPathStuffer.java +++ b/source/java/org/alfresco/repo/avm/util/VersionPathStuffer.java @@ -5,7 +5,7 @@ package org.alfresco.repo.avm.util; import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A utility to build a (possibly long) String representation of diff --git a/source/java/org/alfresco/repo/avm/util/VersionPathTest.java b/source/java/org/alfresco/repo/avm/util/VersionPathTest.java index 43c363e440..6c5628d936 100644 --- a/source/java/org/alfresco/repo/avm/util/VersionPathTest.java +++ b/source/java/org/alfresco/repo/avm/util/VersionPathTest.java @@ -6,7 +6,7 @@ package org.alfresco.repo.avm.util; import java.util.List; import org.alfresco.repo.avm.AVMNodeConverter; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import junit.framework.TestCase; diff --git a/source/java/org/alfresco/repo/avm/util/VersionPathUnstuffer.java b/source/java/org/alfresco/repo/avm/util/VersionPathUnstuffer.java index 81f43402f8..cd0b849955 100644 --- a/source/java/org/alfresco/repo/avm/util/VersionPathUnstuffer.java +++ b/source/java/org/alfresco/repo/avm/util/VersionPathUnstuffer.java @@ -8,7 +8,7 @@ import java.util.List; import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Takes a String representation of a list of Version/Paths (created diff --git a/source/java/org/alfresco/repo/avm/wf/AVMDeployHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMDeployHandler.java index dc3fdfc62c..4ab84ea2ba 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMDeployHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMDeployHandler.java @@ -55,7 +55,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; import org.alfresco.util.ISO9075; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jbpm.graph.exe.ExecutionContext; diff --git a/source/java/org/alfresco/repo/avm/wf/AVMReleaseTestServerHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMReleaseTestServerHandler.java index a1fa001f1f..cdd0ef0d84 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMReleaseTestServerHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMReleaseTestServerHandler.java @@ -33,7 +33,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jbpm.graph.exe.ExecutionContext; diff --git a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java index a8c093e5e9..19e7fe39a2 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java @@ -38,7 +38,7 @@ import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jbpm.graph.exe.ExecutionContext; diff --git a/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java index f31f034326..7d159520c1 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java @@ -33,7 +33,7 @@ import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.jbpm.graph.exe.ExecutionContext; import org.springframework.beans.factory.BeanFactory; diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java index f719441a83..e44148fcb7 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java @@ -41,7 +41,7 @@ import org.alfresco.service.cmr.avmsync.AVMDifference; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.wcm.util.WCMUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java index da3e0313c8..843e5aa9a0 100644 --- a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java +++ b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java @@ -31,7 +31,7 @@ import net.sf.ehcache.CacheException; import net.sf.ehcache.CacheManager; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java index 11a5627bbf..eda52bfe2d 100644 --- a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java +++ b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java @@ -28,8 +28,8 @@ import java.io.Serializable; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.transaction.RetryingTransactionHelper; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.dao.ConcurrencyFailureException; /** diff --git a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java index 527380ebf2..c735b45bed 100644 --- a/source/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java +++ b/source/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java @@ -34,7 +34,7 @@ import org.alfresco.repo.cache.MemoryCache; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAO; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A cache for two-way lookups of database entities. These are characterized by having a unique diff --git a/source/java/org/alfresco/repo/clt/AVMCopyOut.java b/source/java/org/alfresco/repo/clt/AVMCopyOut.java index ac5087d6e4..5a73c4d02c 100644 --- a/source/java/org/alfresco/repo/clt/AVMCopyOut.java +++ b/source/java/org/alfresco/repo/clt/AVMCopyOut.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Copy out a file or a directory recursively from the repository diff --git a/source/java/org/alfresco/repo/clt/AVMLs.java b/source/java/org/alfresco/repo/clt/AVMLs.java index 6ec130a53d..ce74348ea8 100644 --- a/source/java/org/alfresco/repo/clt/AVMLs.java +++ b/source/java/org/alfresco/repo/clt/AVMLs.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Get a listing of a node. diff --git a/source/java/org/alfresco/repo/clt/CltBase.java b/source/java/org/alfresco/repo/clt/CltBase.java index 769de0a0c1..87292886af 100644 --- a/source/java/org/alfresco/repo/clt/CltBase.java +++ b/source/java/org/alfresco/repo/clt/CltBase.java @@ -16,7 +16,7 @@ import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.cmr.remote.RepoRemote; import org.alfresco.service.cmr.security.AuthenticationService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/source/java/org/alfresco/repo/clt/RepoCopyIn.java b/source/java/org/alfresco/repo/clt/RepoCopyIn.java index 51e38f9284..d6804bf963 100644 --- a/source/java/org/alfresco/repo/clt/RepoCopyIn.java +++ b/source/java/org/alfresco/repo/clt/RepoCopyIn.java @@ -13,7 +13,7 @@ import java.util.Map; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Simplified cp from a local filesystem to the repo. diff --git a/source/java/org/alfresco/repo/clt/RepoCopyOut.java b/source/java/org/alfresco/repo/clt/RepoCopyOut.java index 05cb565149..2e1acd82ea 100644 --- a/source/java/org/alfresco/repo/clt/RepoCopyOut.java +++ b/source/java/org/alfresco/repo/clt/RepoCopyOut.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Like cp from Repo to a local filesystem. diff --git a/source/java/org/alfresco/repo/clt/RepoLs.java b/source/java/org/alfresco/repo/clt/RepoLs.java index fe32a4ef87..f8e84a38d2 100644 --- a/source/java/org/alfresco/repo/clt/RepoLs.java +++ b/source/java/org/alfresco/repo/clt/RepoLs.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * List the contents of a directory in a repo. diff --git a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java index 691b121ff9..f508193af2 100644 --- a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java +++ b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.version.VersionableAspect; diff --git a/source/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java b/source/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java index c99605408c..71241759f9 100644 --- a/source/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java +++ b/source/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java @@ -27,8 +27,8 @@ package org.alfresco.repo.config.source; import java.io.InputStream; import java.util.List; -import org.alfresco.config.ConfigException; -import org.alfresco.config.source.UrlConfigSource; +import org.springframework.extensions.config.ConfigException; +import org.springframework.extensions.config.source.UrlConfigSource; import org.alfresco.model.ContentModel; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.repository.ContentReader; diff --git a/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java b/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java index 8249c0d9d0..c5bb4c4307 100644 --- a/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java +++ b/source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java @@ -32,13 +32,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigDeployment; -import org.alfresco.config.ConfigImpl; -import org.alfresco.config.ConfigSection; -import org.alfresco.config.ConfigSource; -import org.alfresco.config.evaluator.Evaluator; -import org.alfresco.config.xml.XMLConfigService; -import org.alfresco.config.xml.elementreader.ConfigElementReader; +import org.springframework.extensions.config.ConfigDeployment; +import org.springframework.extensions.config.ConfigImpl; +import org.springframework.extensions.config.ConfigSection; +import org.springframework.extensions.config.ConfigSource; +import org.springframework.extensions.config.evaluator.Evaluator; +import org.springframework.extensions.config.xml.XMLConfigService; +import org.springframework.extensions.config.xml.elementreader.ConfigElementReader; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.security.authentication.AuthenticationContext; diff --git a/source/java/org/alfresco/repo/content/AbstractContentAccessor.java b/source/java/org/alfresco/repo/content/AbstractContentAccessor.java index 746fcd7c0d..c651489c71 100644 --- a/source/java/org/alfresco/repo/content/AbstractContentAccessor.java +++ b/source/java/org/alfresco/repo/content/AbstractContentAccessor.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Locale; import org.alfresco.error.StackTraceUtil; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.repository.ContentAccessor; diff --git a/source/java/org/alfresco/repo/content/AbstractContentStore.java b/source/java/org/alfresco/repo/content/AbstractContentStore.java index a58bc7081a..e99cdc2817 100644 --- a/source/java/org/alfresco/repo/content/AbstractContentStore.java +++ b/source/java/org/alfresco/repo/content/AbstractContentStore.java @@ -29,7 +29,7 @@ import java.util.Date; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/ContentDataTest.java b/source/java/org/alfresco/repo/content/ContentDataTest.java index f473f9f1a5..f5007c2a38 100644 --- a/source/java/org/alfresco/repo/content/ContentDataTest.java +++ b/source/java/org/alfresco/repo/content/ContentDataTest.java @@ -28,7 +28,7 @@ import java.util.Locale; import junit.framework.TestCase; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java index 6e75c2e2bb..c3185eda34 100644 --- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java +++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy; @@ -65,7 +65,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/MimetypeMap.java b/source/java/org/alfresco/repo/content/MimetypeMap.java index 777a8b3df4..d0c1324896 100644 --- a/source/java/org/alfresco/repo/content/MimetypeMap.java +++ b/source/java/org/alfresco/repo/content/MimetypeMap.java @@ -32,14 +32,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.config.Config; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigLookupContext; -import org.alfresco.config.ConfigService; +import org.springframework.extensions.config.Config; +import org.springframework.extensions.config.ConfigElement; +import org.springframework.extensions.config.ConfigLookupContext; +import org.springframework.extensions.config.ConfigService; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.service.cmr.repository.MimetypeService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/NodeContentContext.java b/source/java/org/alfresco/repo/content/NodeContentContext.java index d537160182..a1591677f3 100644 --- a/source/java/org/alfresco/repo/content/NodeContentContext.java +++ b/source/java/org/alfresco/repo/content/NodeContentContext.java @@ -27,7 +27,7 @@ package org.alfresco.repo.content; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Context information for node-related content. diff --git a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java index 1a7ec9c63e..b50f828b8a 100644 --- a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java +++ b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java @@ -49,7 +49,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java index 978c5269ab..d35dea6308 100644 --- a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java +++ b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java @@ -35,7 +35,7 @@ import org.alfresco.repo.transaction.TransactionalResourceHelper; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java index 8876f55cf4..08f4854ad3 100644 --- a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java +++ b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java @@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEventPublisher; diff --git a/source/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java b/source/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java index ded3b99138..44f05842af 100644 --- a/source/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java +++ b/source/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java @@ -36,7 +36,7 @@ import java.util.Locale; import javax.servlet.http.HttpServletResponse; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.content.AbstractContentReader; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java index a59cc3afe5..e5092ba3bf 100644 --- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java @@ -52,7 +52,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConversionException; import org.alfresco.service.namespace.InvalidQNameException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java index 90491ee82c..3bd70b27e7 100644 --- a/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java @@ -29,7 +29,7 @@ import java.util.Map; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Extracts values from Star Office documents into the following: diff --git a/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java index 4d36485020..8e288bad11 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java @@ -52,8 +52,8 @@ import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java index 5d04f69b34..f1332b971e 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java @@ -38,7 +38,7 @@ import org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter; import org.alfresco.repo.content.metadata.MetadataExtracter; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java b/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java index b55fafe6e0..43f84a753a 100644 --- a/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java +++ b/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java @@ -37,7 +37,7 @@ import org.alfresco.repo.content.ContentWorker; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.xml.sax.Attributes; diff --git a/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java b/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java index 3a7eb15273..ba91836dca 100644 --- a/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java +++ b/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java @@ -41,7 +41,7 @@ import org.alfresco.repo.content.ContentWorker; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java b/source/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java index c41ee4c543..e5a35870be 100644 --- a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java @@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.TransformationOptions; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java index 5b9a19d0e1..c582e6eb28 100644 --- a/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java +++ b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java @@ -44,7 +44,7 @@ import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.TransformationOptions; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.TempFileProvider; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.DefaultResourceLoader; diff --git a/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java b/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java index 46619ac81b..77b2f923f3 100644 --- a/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java @@ -44,7 +44,7 @@ import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.MimetypeService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.TempFileProvider; import org.springframework.core.io.DefaultResourceLoader; diff --git a/source/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java b/source/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java index 4565dc69a2..037d6bb783 100644 --- a/source/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java +++ b/source/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import org.alfresco.service.cmr.repository.TransformationOptions; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * SFW transformation options diff --git a/source/java/org/alfresco/repo/copy/CopyServiceImpl.java b/source/java/org/alfresco/repo/copy/CopyServiceImpl.java index 82991dfedd..9248d25f75 100644 --- a/source/java/org/alfresco/repo/copy/CopyServiceImpl.java +++ b/source/java/org/alfresco/repo/copy/CopyServiceImpl.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ActionServiceImpl; import org.alfresco.repo.copy.CopyBehaviourCallback.ChildAssocCopyAction; @@ -68,7 +68,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/copy/CrossRepositoryCopyServiceImpl.java b/source/java/org/alfresco/repo/copy/CrossRepositoryCopyServiceImpl.java index 4542011b02..181d206e8f 100644 --- a/source/java/org/alfresco/repo/copy/CrossRepositoryCopyServiceImpl.java +++ b/source/java/org/alfresco/repo/copy/CrossRepositoryCopyServiceImpl.java @@ -52,7 +52,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Cross Repository Copying. diff --git a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java index 0fc7d8d7de..7c979ed2c1 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java @@ -88,8 +88,8 @@ import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.NameMatcher; -import org.alfresco.util.Pair; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.remoting.rmi.RmiProxyFactoryBean; diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java index 448a629d3d..280319a8ad 100644 --- a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java +++ b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java @@ -36,7 +36,7 @@ import org.alfresco.service.license.LicenseDescriptor; import org.alfresco.service.license.LicenseException; import org.alfresco.service.license.LicenseService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.VersionNumber; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; @@ -160,7 +160,7 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean implements Desc /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ @Override protected void onBootstrap(ApplicationEvent event) @@ -243,7 +243,7 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean implements Desc /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ @Override protected void onShutdown(ApplicationEvent event) diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java b/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java index 0f4f2f8093..a362113ef8 100644 --- a/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java +++ b/source/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java @@ -32,7 +32,7 @@ import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.descriptor.Descriptor; import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.license.LicenseDescriptor; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java b/source/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java index 441490b6ef..bb07795082 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java @@ -28,7 +28,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryException; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryComponent.java b/source/java/org/alfresco/repo/dictionary/DictionaryComponent.java index a29c2ecb53..ec0b762319 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryComponent.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryComponent.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.dictionary.ModelDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java index b7218cfd11..a2451749a5 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java @@ -52,7 +52,7 @@ import org.alfresco.service.cmr.dictionary.NamespaceDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java b/source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java index 39a18f415a..1a0a24be65 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java @@ -37,7 +37,7 @@ import junit.framework.TestCase; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.cache.EhCacheAdapter; import org.alfresco.repo.dictionary.DictionaryDAOImpl.DictionaryRegistry; diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java index 96f0cf8d8f..7db85d470c 100644 --- a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java +++ b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java @@ -46,7 +46,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java b/source/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java index bcdb45d1d4..a845308965 100644 --- a/source/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java +++ b/source/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java @@ -26,7 +26,7 @@ package org.alfresco.repo.dictionary; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.dictionary.DictionaryException; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.ModelDefinition; diff --git a/source/java/org/alfresco/repo/dictionary/M2Label.java b/source/java/org/alfresco/repo/dictionary/M2Label.java index 53500640fa..186b9337d4 100644 --- a/source/java/org/alfresco/repo/dictionary/M2Label.java +++ b/source/java/org/alfresco/repo/dictionary/M2Label.java @@ -26,7 +26,7 @@ package org.alfresco.repo.dictionary; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.dictionary.ModelDefinition; import org.alfresco.service.namespace.QName; import org.springframework.util.StringUtils; diff --git a/source/java/org/alfresco/repo/dictionary/M2ModelDiff.java b/source/java/org/alfresco/repo/dictionary/M2ModelDiff.java index ce976b7b86..a30e3b8374 100755 --- a/source/java/org/alfresco/repo/dictionary/M2ModelDiff.java +++ b/source/java/org/alfresco/repo/dictionary/M2ModelDiff.java @@ -26,7 +26,7 @@ package org.alfresco.repo.dictionary; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Compiled Model Difference diff --git a/source/java/org/alfresco/repo/dictionary/M2XML.java b/source/java/org/alfresco/repo/dictionary/M2XML.java index 0ef92275d5..6be294cc3a 100644 --- a/source/java/org/alfresco/repo/dictionary/M2XML.java +++ b/source/java/org/alfresco/repo/dictionary/M2XML.java @@ -28,7 +28,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; /** diff --git a/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java b/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java index 9790fa27a2..5e07c8da67 100644 --- a/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java +++ b/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java @@ -32,7 +32,7 @@ import java.util.Map; import junit.framework.TestCase; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.dictionary.DictionaryDAOTest; import org.alfresco.service.cmr.dictionary.Constraint; import org.alfresco.service.cmr.dictionary.ConstraintException; diff --git a/source/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java b/source/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java index 3a0ad4a2f3..a0ebb6a6ff 100644 --- a/source/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java +++ b/source/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.dictionary.ConstraintException; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; diff --git a/source/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java b/source/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java index 3497be3cce..e7b9363dd6 100644 --- a/source/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java +++ b/source/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.dictionary.types.period; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.PeriodProvider; import org.springframework.beans.factory.InitializingBean; diff --git a/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java b/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java index f77b4edc74..62d9f35433 100644 --- a/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java +++ b/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.PeriodProvider; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; /** * Tests for period implementations - persistence and search is tested elsewhere diff --git a/source/java/org/alfresco/repo/domain/CrcHelper.java b/source/java/org/alfresco/repo/domain/CrcHelper.java index 276478fa91..042e4b7965 100644 --- a/source/java/org/alfresco/repo/domain/CrcHelper.java +++ b/source/java/org/alfresco/repo/domain/CrcHelper.java @@ -26,7 +26,7 @@ package org.alfresco.repo.domain; import java.io.UnsupportedEncodingException; import java.util.zip.CRC32; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Helper class to calculate CRC values for string persistence. diff --git a/source/java/org/alfresco/repo/domain/LocaleDAO.java b/source/java/org/alfresco/repo/domain/LocaleDAO.java index b225348c3c..935b17af71 100644 --- a/source/java/org/alfresco/repo/domain/LocaleDAO.java +++ b/source/java/org/alfresco/repo/domain/LocaleDAO.java @@ -28,7 +28,7 @@ import java.util.Locale; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.domain.hibernate.DirtySessionAnnotation; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Data abstraction layer for Locale entities. diff --git a/source/java/org/alfresco/repo/domain/LocaleDAOTest.java b/source/java/org/alfresco/repo/domain/LocaleDAOTest.java index eedbabcb7f..8ccb464fb6 100644 --- a/source/java/org/alfresco/repo/domain/LocaleDAOTest.java +++ b/source/java/org/alfresco/repo/domain/LocaleDAOTest.java @@ -33,12 +33,12 @@ import java.util.concurrent.TimeUnit; import junit.framework.TestCase; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/domain/NodePropertyValue.java b/source/java/org/alfresco/repo/domain/NodePropertyValue.java index b69ffbf8f0..75b5ddd532 100644 --- a/source/java/org/alfresco/repo/domain/NodePropertyValue.java +++ b/source/java/org/alfresco/repo/domain/NodePropertyValue.java @@ -49,7 +49,7 @@ import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.VersionNumber; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/domain/QNameDAO.java b/source/java/org/alfresco/repo/domain/QNameDAO.java index ce433f084e..66c5d9d0d7 100644 --- a/source/java/org/alfresco/repo/domain/QNameDAO.java +++ b/source/java/org/alfresco/repo/domain/QNameDAO.java @@ -29,7 +29,7 @@ import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Data abstraction layer for QName and Namespace entities. diff --git a/source/java/org/alfresco/repo/domain/QNameDAOTest.java b/source/java/org/alfresco/repo/domain/QNameDAOTest.java index af716b3631..784c9e9e89 100644 --- a/source/java/org/alfresco/repo/domain/QNameDAOTest.java +++ b/source/java/org/alfresco/repo/domain/QNameDAOTest.java @@ -39,7 +39,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.namespace.QName; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java b/source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java index e0aac12cba..1f2be14967 100644 --- a/source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java +++ b/source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java @@ -26,7 +26,7 @@ package org.alfresco.repo.domain.activities; import java.util.Date; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.json.JSONException; import org.json.JSONObject; diff --git a/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java b/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java index bd52bbbebc..4ec7d3fa60 100644 --- a/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.DataIntegrityViolationException; diff --git a/source/java/org/alfresco/repo/domain/audit/AuditDAO.java b/source/java/org/alfresco/repo/domain/audit/AuditDAO.java index 497e3152ef..2ad46b0277 100644 --- a/source/java/org/alfresco/repo/domain/audit/AuditDAO.java +++ b/source/java/org/alfresco/repo/domain/audit/AuditDAO.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.audit.AuditInfo; import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * DAO services for alf_audit_XXX tables. diff --git a/source/java/org/alfresco/repo/domain/audit/AuditDAOTest.java b/source/java/org/alfresco/repo/domain/audit/AuditDAOTest.java index e82b5414d8..3eaaa783b3 100644 --- a/source/java/org/alfresco/repo/domain/audit/AuditDAOTest.java +++ b/source/java/org/alfresco/repo/domain/audit/AuditDAOTest.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.lang.mutable.MutableInt; import org.springframework.context.ConfigurableApplicationContext; diff --git a/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java b/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java index 42e9326f94..3be6a7c995 100644 --- a/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java @@ -39,7 +39,7 @@ import org.alfresco.repo.domain.audit.AuditModelEntity; import org.alfresco.repo.domain.audit.AuditQueryParameters; import org.alfresco.repo.domain.audit.AuditQueryResult; import org.alfresco.repo.domain.propval.PropertyValueDAO.PropertyFinderCallback; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.orm.ibatis.SqlMapClientTemplate; import com.ibatis.sqlmap.client.event.RowHandler; diff --git a/source/java/org/alfresco/repo/domain/avm/AVMStoreDAOTest.java b/source/java/org/alfresco/repo/domain/avm/AVMStoreDAOTest.java index dcdc7de6ca..13879b991c 100644 --- a/source/java/org/alfresco/repo/domain/avm/AVMStoreDAOTest.java +++ b/source/java/org/alfresco/repo/domain/avm/AVMStoreDAOTest.java @@ -32,7 +32,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java index f79adf531b..87bd62d6f5 100644 --- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java @@ -38,8 +38,8 @@ import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAO; import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.QNameDAO; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.dao.ConcurrencyFailureException; /** diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeLinksDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeLinksDAOImpl.java index 626560eda2..990857b787 100644 --- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeLinksDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeLinksDAOImpl.java @@ -31,8 +31,8 @@ import java.util.List; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.lookup.EntityLookupCache; import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAO; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.SearchLanguageConversion; import org.springframework.dao.ConcurrencyFailureException; diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMStoreDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMStoreDAOImpl.java index 332462681f..e899bfe86e 100644 --- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMStoreDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMStoreDAOImpl.java @@ -36,8 +36,8 @@ import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAO; import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.QNameDAO; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.dao.ConcurrencyFailureException; /** diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMVersionRootDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMVersionRootDAOImpl.java index 4cfb266945..aa5ac3817e 100644 --- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMVersionRootDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMVersionRootDAOImpl.java @@ -31,8 +31,8 @@ import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.cache.NullCache; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.dao.ConcurrencyFailureException; /** diff --git a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java index 6e3112182c..91169acb4d 100644 --- a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java @@ -37,7 +37,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.repo.transaction.TransactionListenerAdapter; import org.alfresco.repo.transaction.TransactionalResourceHelper; import org.alfresco.service.cmr.repository.ContentData; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.ConcurrencyFailureException; diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java index f9ee71b818..13fb34747d 100644 --- a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java +++ b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java @@ -28,7 +28,7 @@ import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.repository.ContentData; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.dao.ConcurrencyFailureException; /** diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java index 3e67165ec5..6ecd2058b6 100644 --- a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java +++ b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java @@ -40,7 +40,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.TempFileProvider; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ConfigurableApplicationContext; diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java index b4827e8f8c..9d01029365 100644 --- a/source/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java +++ b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java @@ -26,7 +26,7 @@ package org.alfresco.repo.domain.contentdata; import org.alfresco.repo.domain.CrcHelper; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_content_url table. diff --git a/source/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java b/source/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java index 24cdb12474..360a70d4ad 100644 --- a/source/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java @@ -28,8 +28,8 @@ import java.io.Serializable; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Abstract implementation for Encoding DAO. diff --git a/source/java/org/alfresco/repo/domain/encoding/EncodingDAO.java b/source/java/org/alfresco/repo/domain/encoding/EncodingDAO.java index 86453ed563..93b9ce9a04 100644 --- a/source/java/org/alfresco/repo/domain/encoding/EncodingDAO.java +++ b/source/java/org/alfresco/repo/domain/encoding/EncodingDAO.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.domain.encoding; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * DAO services for alf_encoding and related tables diff --git a/source/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java b/source/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java index 04ec30cd36..b285477966 100644 --- a/source/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java +++ b/source/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java @@ -32,7 +32,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/domain/hibernate/AVMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/AVMAccessControlListDAO.java index 507dcc2b9c..c293a42e2a 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/AVMAccessControlListDAO.java +++ b/source/java/org/alfresco/repo/domain/hibernate/AVMAccessControlListDAO.java @@ -59,7 +59,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java index 558eb191a2..57003d9507 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java +++ b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java @@ -66,7 +66,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.CacheMode; diff --git a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java index 0c847683f9..b596c60b84 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java +++ b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * DAO layer for the improved ACL implemtentation. This layer is responsible for setting ACLs and any cascade behaviour diff --git a/source/java/org/alfresco/repo/domain/hibernate/DirtySessionMethodInterceptor.java b/source/java/org/alfresco/repo/domain/hibernate/DirtySessionMethodInterceptor.java index e3d6841863..eda096f85c 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/DirtySessionMethodInterceptor.java +++ b/source/java/org/alfresco/repo/domain/hibernate/DirtySessionMethodInterceptor.java @@ -34,7 +34,7 @@ import java.util.Stack; import org.alfresco.error.StackTraceUtil; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/domain/hibernate/HibernateLocaleDAOImpl.java b/source/java/org/alfresco/repo/domain/hibernate/HibernateLocaleDAOImpl.java index 6c8e51e07b..970bc366fd 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/HibernateLocaleDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/hibernate/HibernateLocaleDAOImpl.java @@ -27,13 +27,13 @@ package org.alfresco.repo.domain.hibernate; import java.io.Serializable; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.domain.LocaleDAO; import org.alfresco.repo.domain.LocaleEntity; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; diff --git a/source/java/org/alfresco/repo/domain/hibernate/HibernateQNameDAOImpl.java b/source/java/org/alfresco/repo/domain/hibernate/HibernateQNameDAOImpl.java index 0c482f274c..4c76fdd472 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/HibernateQNameDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/hibernate/HibernateQNameDAOImpl.java @@ -36,7 +36,7 @@ import org.alfresco.repo.domain.NamespaceEntity; import org.alfresco.repo.domain.QNameDAO; import org.alfresco.repo.domain.QNameEntity; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; diff --git a/source/java/org/alfresco/repo/domain/hibernate/HibernateUsageDeltaDAO.java b/source/java/org/alfresco/repo/domain/hibernate/HibernateUsageDeltaDAO.java index f5973fbbbb..ac204e88c5 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/HibernateUsageDeltaDAO.java +++ b/source/java/org/alfresco/repo/domain/hibernate/HibernateUsageDeltaDAO.java @@ -36,8 +36,8 @@ import org.alfresco.repo.transaction.TransactionalDao; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.hibernate.Query; import org.hibernate.Session; import org.springframework.orm.hibernate3.HibernateCallback; diff --git a/source/java/org/alfresco/repo/domain/hibernate/LocaleEntityImpl.java b/source/java/org/alfresco/repo/domain/hibernate/LocaleEntityImpl.java index d95eef557c..c1310cc10b 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/LocaleEntityImpl.java +++ b/source/java/org/alfresco/repo/domain/hibernate/LocaleEntityImpl.java @@ -30,7 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.domain.LocaleEntity; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; diff --git a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java index e85bcff6ee..694102f893 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java +++ b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java @@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** diff --git a/source/java/org/alfresco/repo/domain/hibernate/TransactionImpl.java b/source/java/org/alfresco/repo/domain/hibernate/TransactionImpl.java index 4a1a78d570..2935cff001 100644 --- a/source/java/org/alfresco/repo/domain/hibernate/TransactionImpl.java +++ b/source/java/org/alfresco/repo/domain/hibernate/TransactionImpl.java @@ -29,7 +29,7 @@ import java.util.Date; import org.alfresco.repo.domain.Server; import org.alfresco.repo.domain.Transaction; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * Bean containing all the persistence data representing a Transaction. diff --git a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java index 327a239e53..54df22cd32 100644 --- a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java @@ -28,8 +28,8 @@ import java.io.Serializable; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Abstract implementation for Mimetype DAO. diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java index ea01f663f3..31f7cb39b2 100644 --- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java +++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java @@ -25,7 +25,7 @@ package org.alfresco.repo.domain.mimetype; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * DAO services for alf_mimetype table diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java index 08dc519852..04624e8127 100644 --- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java +++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java @@ -32,7 +32,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java index 3bdcfdb70b..3501b6734d 100644 --- a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java @@ -41,7 +41,7 @@ import org.alfresco.repo.cache.lookup.EntityLookupCache.EntityLookupCallbackDAOA import org.alfresco.repo.domain.CrcHelper; import org.alfresco.repo.domain.propval.PropertyValueEntity.PersistedType; import org.alfresco.repo.props.PropertyUniqueConstraintViolation; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.DataIntegrityViolationException; diff --git a/source/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java b/source/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java index 041992054d..2a00349272 100644 --- a/source/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java +++ b/source/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java @@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Default converter for handling data going to and from the persistence layer. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java index 81a996dda3..9910f32424 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java @@ -27,7 +27,7 @@ package org.alfresco.repo.domain.propval; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.domain.CrcHelper; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_prop_class table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java index 7f5dc48a6c..c5a0206b49 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java @@ -29,8 +29,8 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.alfresco.util.ISO8601DateFormat; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_prop_date_value table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java index bd7d8c88c2..f10ae15a2c 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java @@ -25,7 +25,7 @@ package org.alfresco.repo.domain.propval; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_prop_numeric_value table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java index 06d6587a2e..1a6ed2274a 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java @@ -26,7 +26,7 @@ package org.alfresco.repo.domain.propval; import java.io.Serializable; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_prop_serializable_value table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java index a50094c865..56b359c825 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java @@ -25,7 +25,7 @@ package org.alfresco.repo.domain.propval; import org.alfresco.repo.domain.CrcHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for querying against the alf_prop_string_value table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java index 5403625866..fc87b34876 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java @@ -26,7 +26,7 @@ package org.alfresco.repo.domain.propval; import org.alfresco.repo.domain.CrcHelper; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Entity bean for alf_prop_string_value table. diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java index a98b691af4..9f0a47bea7 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java @@ -30,7 +30,7 @@ import java.util.List; import org.alfresco.repo.domain.CrcHelper; import org.alfresco.repo.props.PropertyUniqueConstraintViolation; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.dao.DataIntegrityViolationException; /** diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java index fc7d1853d9..61e5b4e258 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java @@ -46,8 +46,8 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.alfresco.util.ISO8601DateFormat; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.Pair; import org.bouncycastle.util.Arrays; import org.springframework.context.ApplicationContext; diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java index f5d5bbb0cc..7dc7100b69 100644 --- a/source/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java +++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java b/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java index ab8ad7ab75..42602a7bcf 100644 --- a/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java @@ -44,7 +44,7 @@ import org.alfresco.repo.domain.propval.PropertyStringValueEntity; import org.alfresco.repo.domain.propval.PropertyUniqueContextEntity; import org.alfresco.repo.domain.propval.PropertyValueEntity; import org.alfresco.repo.domain.propval.PropertyValueEntity.PersistedType; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.orm.ibatis.SqlMapClientTemplate; import com.ibatis.sqlmap.client.event.RowHandler; diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index 8584ac2572..6e5b1c5cb3 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -45,7 +45,7 @@ import java.util.Map; import java.util.Properties; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.patch.Patch; import org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch; import org.alfresco.repo.content.filestore.FileContentWriter; @@ -57,9 +57,9 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.descriptor.Descriptor; import org.alfresco.service.descriptor.DescriptorService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.LogUtil; +import org.springframework.extensions.surf.util.LogUtil; import org.alfresco.util.TempFileProvider; import org.alfresco.util.schemadump.Main; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/exporter/ExporterComponent.java b/source/java/org/alfresco/repo/exporter/ExporterComponent.java index 08745b2f7f..15eddbbd42 100644 --- a/source/java/org/alfresco/repo/exporter/ExporterComponent.java +++ b/source/java/org/alfresco/repo/exporter/ExporterComponent.java @@ -73,7 +73,7 @@ import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; diff --git a/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java b/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java index d9fdbc31de..7ee388051e 100644 --- a/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java +++ b/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java @@ -30,7 +30,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ContentData; diff --git a/source/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java b/source/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java index 13c0a35767..e761c1e10c 100644 --- a/source/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java +++ b/source/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.importer.system.SystemExporterImporter; @@ -55,7 +55,7 @@ import org.alfresco.service.cmr.view.Location; import org.alfresco.service.cmr.view.ReferenceType; import org.alfresco.service.cmr.view.RepositoryExporterService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.TempFileProvider; diff --git a/source/java/org/alfresco/repo/exporter/URLExporter.java b/source/java/org/alfresco/repo/exporter/URLExporter.java index b6762205f9..11f0b19060 100644 --- a/source/java/org/alfresco/repo/exporter/URLExporter.java +++ b/source/java/org/alfresco/repo/exporter/URLExporter.java @@ -34,7 +34,7 @@ import org.alfresco.service.cmr.view.ExportPackageHandler; import org.alfresco.service.cmr.view.Exporter; import org.alfresco.service.cmr.view.ExporterContext; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/forms/Item.java b/source/java/org/alfresco/repo/forms/Item.java index e7368ce724..363cc31665 100644 --- a/source/java/org/alfresco/repo/forms/Item.java +++ b/source/java/org/alfresco/repo/forms/Item.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.forms; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Represents an item a form is generated for. diff --git a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java index 66da5f8f3f..22e6c1eabf 100644 --- a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java +++ b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java @@ -12,7 +12,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.forms.AssociationFieldDefinition; import org.alfresco.repo.forms.FieldGroup; diff --git a/source/java/org/alfresco/repo/forms/processor/task/TaskFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/task/TaskFormProcessor.java index 56c957eb5f..76e7aceaeb 100644 --- a/source/java/org/alfresco/repo/forms/processor/task/TaskFormProcessor.java +++ b/source/java/org/alfresco/repo/forms/processor/task/TaskFormProcessor.java @@ -43,7 +43,7 @@ import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * @author Nick Smith diff --git a/source/java/org/alfresco/repo/forum/DiscussableAspect.java b/source/java/org/alfresco/repo/forum/DiscussableAspect.java index d694920770..feca46f7e5 100644 --- a/source/java/org/alfresco/repo/forum/DiscussableAspect.java +++ b/source/java/org/alfresco/repo/forum/DiscussableAspect.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; import org.alfresco.model.ForumModel; diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java index b8528907ae..d3a7b732a4 100644 --- a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java +++ b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java @@ -21,7 +21,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java b/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java index 2654d4fc8d..65a68a9686 100755 --- a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java +++ b/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java @@ -44,7 +44,7 @@ import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.template.TemplateNode; diff --git a/source/java/org/alfresco/repo/imap/AlfrescoImapServer.java b/source/java/org/alfresco/repo/imap/AlfrescoImapServer.java index 03859294c4..bf03cb5ded 100755 --- a/source/java/org/alfresco/repo/imap/AlfrescoImapServer.java +++ b/source/java/org/alfresco/repo/imap/AlfrescoImapServer.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.imap; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java index de5e3f6600..2edce52985 100644 --- a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java +++ b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java @@ -33,7 +33,7 @@ import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; public class ImapContentPolicy diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java index 39814f1aaa..561b8b80fa 100755 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -39,7 +39,7 @@ import javax.mail.Flags; import javax.mail.Flags.Flag; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.model.ImapModel; import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode; @@ -60,8 +60,8 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.Utf7; import org.alfresco.util.config.RepositoryFolderConfigBean; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/importer/DefaultContentHandler.java b/source/java/org/alfresco/repo/importer/DefaultContentHandler.java index 1ba9c371ec..bd58a66826 100644 --- a/source/java/org/alfresco/repo/importer/DefaultContentHandler.java +++ b/source/java/org/alfresco/repo/importer/DefaultContentHandler.java @@ -26,7 +26,7 @@ package org.alfresco.repo.importer; import java.io.InputStream; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java index 351d867098..7a01ec7a5f 100644 --- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java +++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java @@ -40,7 +40,7 @@ import java.util.Properties; import java.util.ResourceBundle; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.security.authentication.AuthenticationContext; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -57,8 +57,8 @@ import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/importer/ImporterComponent.java b/source/java/org/alfresco/repo/importer/ImporterComponent.java index e27d3bc9ca..3de9a82115 100644 --- a/source/java/org/alfresco/repo/importer/ImporterComponent.java +++ b/source/java/org/alfresco/repo/importer/ImporterComponent.java @@ -72,7 +72,7 @@ import org.alfresco.service.cmr.view.Location; import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.io.DefaultResourceLoader; diff --git a/source/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java b/source/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java index e0a883ca17..104ecb79f1 100644 --- a/source/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java +++ b/source/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java @@ -34,7 +34,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index c1ef5b128e..adc686d55e 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -59,7 +59,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.model.ContentModel; import org.alfresco.repo.invitation.site.*; import org.alfresco.repo.node.NodeServicePolicies; diff --git a/source/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java b/source/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java index e32fc51c24..c29433ca4e 100644 --- a/source/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java +++ b/source/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java @@ -29,7 +29,7 @@ package org.alfresco.repo.invitation.script; import org.alfresco.service.cmr.invitation.Invitation; import org.alfresco.service.cmr.invitation.InvitationService; import org.alfresco.service.cmr.invitation.NominatedInvitation; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import java.util.Date; diff --git a/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java b/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java index ca4851ac10..e31c4d2a25 100644 --- a/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java +++ b/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java @@ -37,8 +37,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jgroups.Address; diff --git a/source/java/org/alfresco/repo/jscript/AVM.java b/source/java/org/alfresco/repo/jscript/AVM.java index baaa8dc986..6039d4485d 100644 --- a/source/java/org/alfresco/repo/jscript/AVM.java +++ b/source/java/org/alfresco/repo/jscript/AVM.java @@ -32,7 +32,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMStoreDescriptor; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.sandbox.SandboxService; import org.alfresco.wcm.util.WCMUtil; diff --git a/source/java/org/alfresco/repo/jscript/AVMNode.java b/source/java/org/alfresco/repo/jscript/AVMNode.java index 41e4a16e53..d02cf40350 100644 --- a/source/java/org/alfresco/repo/jscript/AVMNode.java +++ b/source/java/org/alfresco/repo/jscript/AVMNode.java @@ -35,8 +35,8 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.locking.AVMLock; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.mozilla.javascript.Scriptable; /** diff --git a/source/java/org/alfresco/repo/jscript/Association.java b/source/java/org/alfresco/repo/jscript/Association.java index be71f05115..f6c8bb52e9 100644 --- a/source/java/org/alfresco/repo/jscript/Association.java +++ b/source/java/org/alfresco/repo/jscript/Association.java @@ -29,7 +29,7 @@ import java.io.Serializable; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.mozilla.javascript.Scriptable; /** diff --git a/source/java/org/alfresco/repo/jscript/ChildAssociation.java b/source/java/org/alfresco/repo/jscript/ChildAssociation.java index f72f147df5..709f1428ce 100644 --- a/source/java/org/alfresco/repo/jscript/ChildAssociation.java +++ b/source/java/org/alfresco/repo/jscript/ChildAssociation.java @@ -28,7 +28,7 @@ import java.io.Serializable; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ChildAssociationRef; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.mozilla.javascript.Scriptable; /** diff --git a/source/java/org/alfresco/repo/jscript/Classification.java b/source/java/org/alfresco/repo/jscript/Classification.java index 2690e209bc..9c351ce4f1 100644 --- a/source/java/org/alfresco/repo/jscript/Classification.java +++ b/source/java/org/alfresco/repo/jscript/Classification.java @@ -33,7 +33,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.CategoryService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; diff --git a/source/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java b/source/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java index 1419c9ecb8..5fdb771a37 100644 --- a/source/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java +++ b/source/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java @@ -31,7 +31,7 @@ import java.io.Reader; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.scripts.ScriptException; import org.alfresco.service.cmr.repository.ScriptLocation; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Classpath script location object. diff --git a/source/java/org/alfresco/repo/jscript/CrossRepositoryCopy.java b/source/java/org/alfresco/repo/jscript/CrossRepositoryCopy.java index aa70d157a1..cad3adb809 100644 --- a/source/java/org/alfresco/repo/jscript/CrossRepositoryCopy.java +++ b/source/java/org/alfresco/repo/jscript/CrossRepositoryCopy.java @@ -28,8 +28,8 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.mozilla.javascript.Scriptable; /** diff --git a/source/java/org/alfresco/repo/jscript/Imap.java b/source/java/org/alfresco/repo/jscript/Imap.java index 5fbf2bd98b..f9c79b8937 100755 --- a/source/java/org/alfresco/repo/jscript/Imap.java +++ b/source/java/org/alfresco/repo/jscript/Imap.java @@ -4,7 +4,7 @@ import org.alfresco.repo.model.Repository; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; public final class Imap extends BaseScopableProcessorExtension { diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java index b5f50b8471..5e65db32d0 100644 --- a/source/java/org/alfresco/repo/jscript/People.java +++ b/source/java/org/alfresco/repo/jscript/People.java @@ -47,7 +47,7 @@ import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.usage.ContentUsageService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/jscript/Presence.java b/source/java/org/alfresco/repo/jscript/Presence.java index dcca7726e1..b3ea09c1dd 100644 --- a/source/java/org/alfresco/repo/jscript/Presence.java +++ b/source/java/org/alfresco/repo/jscript/Presence.java @@ -26,7 +26,7 @@ package org.alfresco.repo.jscript; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Scripted Presence service for determining online status of People. diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java index 461990f338..745902bb24 100644 --- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java +++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java @@ -305,15 +305,7 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess { // load from classpath String scriptClasspath = resource.substring(PATH_CLASSPATH.length()); - InputStream stream; - if (logger.isDebugEnabled()) - { - stream = getClass().getClassLoader().getResource(scriptClasspath).openStream(); - } - else - { - stream = getClass().getClassLoader().getResourceAsStream(scriptClasspath); - } + InputStream stream = getClass().getClassLoader().getResource(scriptClasspath).openStream(); if (stream == null) { throw new AlfrescoRuntimeException("Unable to load included script classpath resource: " + resource); diff --git a/source/java/org/alfresco/repo/jscript/ScriptBehaviour.java b/source/java/org/alfresco/repo/jscript/ScriptBehaviour.java index 7467a820d0..2604420227 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptBehaviour.java +++ b/source/java/org/alfresco/repo/jscript/ScriptBehaviour.java @@ -34,7 +34,7 @@ import org.alfresco.repo.policy.BaseBehaviour; import org.alfresco.repo.policy.PolicyException; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ScriptLocation; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java index c241cfd6e1..8843f03acf 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptNode.java +++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java @@ -90,10 +90,10 @@ import org.alfresco.service.namespace.NamespacePrefixResolverProvider; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.Content; +import org.springframework.extensions.surf.util.Content; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.URLEncoder; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.URLEncoder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; @@ -2972,7 +2972,7 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol /* * (non-Javadoc) - * @see org.alfresco.util.Content#getInputStream() + * @see org.springframework.extensions.surf.util.Content#getInputStream() */ public InputStream getInputStream() { @@ -2983,7 +2983,7 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol /* * (non-Javadoc) - * @see org.alfresco.util.Content#getReader() + * @see org.springframework.extensions.surf.util.Content#getReader() */ public Reader getReader() { diff --git a/source/java/org/alfresco/repo/jscript/ScriptUtils.java b/source/java/org/alfresco/repo/jscript/ScriptUtils.java index bbc376266b..08a320160c 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptUtils.java +++ b/source/java/org/alfresco/repo/jscript/ScriptUtils.java @@ -28,12 +28,12 @@ import java.util.Date; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * Place for general and miscellaneous utility functions not already found in generic JavaScript. diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java index ab119f66c1..d1023edc61 100644 --- a/source/java/org/alfresco/repo/jscript/Search.java +++ b/source/java/org/alfresco/repo/jscript/Search.java @@ -46,7 +46,7 @@ import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.util.ISO9075; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.SAXReader; diff --git a/source/java/org/alfresco/repo/management/SafeEventPublisher.java b/source/java/org/alfresco/repo/management/SafeEventPublisher.java index 40833312f6..771d1d4b20 100644 --- a/source/java/org/alfresco/repo/management/SafeEventPublisher.java +++ b/source/java/org/alfresco/repo/management/SafeEventPublisher.java @@ -27,7 +27,7 @@ package org.alfresco.repo.management; import java.util.LinkedList; import java.util.List; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; @@ -49,7 +49,7 @@ public class SafeEventPublisher extends AbstractLifecycleBean implements Applica /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ @Override protected void onBootstrap(ApplicationEvent event) @@ -64,7 +64,7 @@ public class SafeEventPublisher extends AbstractLifecycleBean implements Applica /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ @Override protected void onShutdown(ApplicationEvent event) diff --git a/source/java/org/alfresco/repo/model/Repository.java b/source/java/org/alfresco/repo/model/Repository.java index a26233fb7d..7e54411bcb 100644 --- a/source/java/org/alfresco/repo/model/Repository.java +++ b/source/java/org/alfresco/repo/model/Repository.java @@ -50,7 +50,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeansException; diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java index d32d4c657d..4289bd2a65 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java @@ -36,7 +36,7 @@ import javax.transaction.UserTransaction; import junit.framework.TestCase; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.M2Model; diff --git a/source/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java b/source/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java index e90f4fc4fa..d168fdd1a2 100644 --- a/source/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java +++ b/source/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java @@ -32,7 +32,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.model.FileFolderService; diff --git a/source/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java b/source/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java index 4c74336b27..015ce869ae 100644 --- a/source/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java +++ b/source/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java @@ -30,12 +30,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.config.Config; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigLookupContext; -import org.alfresco.config.ConfigService; +import org.springframework.extensions.config.Config; +import org.springframework.extensions.config.ConfigElement; +import org.springframework.extensions.config.ConfigLookupContext; +import org.springframework.extensions.config.ConfigService; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java b/source/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java index 2d85a7b782..ac278795ad 100644 --- a/source/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java +++ b/source/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java @@ -35,7 +35,7 @@ import java.util.Set; import javax.transaction.SystemException; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.node.MLPropertyInterceptor; import org.alfresco.repo.policy.BehaviourFilter; diff --git a/source/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java b/source/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java index 6d08182b42..cd058c7243 100644 --- a/source/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java +++ b/source/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationUtil; diff --git a/source/java/org/alfresco/repo/module/AbstractModuleComponent.java b/source/java/org/alfresco/repo/module/AbstractModuleComponent.java index 9329f84b3b..6f4a75bda3 100644 --- a/source/java/org/alfresco/repo/module/AbstractModuleComponent.java +++ b/source/java/org/alfresco/repo/module/AbstractModuleComponent.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.tenant.TenantAdminService; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VersionNumber; import org.springframework.beans.factory.BeanNameAware; diff --git a/source/java/org/alfresco/repo/module/ImporterModuleComponent.java b/source/java/org/alfresco/repo/module/ImporterModuleComponent.java index 8f0d71f457..b4fe64fde2 100644 --- a/source/java/org/alfresco/repo/module/ImporterModuleComponent.java +++ b/source/java/org/alfresco/repo/module/ImporterModuleComponent.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.repo.importer.ImporterBootstrap; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** diff --git a/source/java/org/alfresco/repo/module/LoggerModuleComponent.java b/source/java/org/alfresco/repo/module/LoggerModuleComponent.java index dfccc7599b..07823e6536 100644 --- a/source/java/org/alfresco/repo/module/LoggerModuleComponent.java +++ b/source/java/org/alfresco/repo/module/LoggerModuleComponent.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.module; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java index d3f39104af..94f56c8a22 100644 --- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java +++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.registry.RegistryKey; import org.alfresco.repo.admin.registry.RegistryService; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -49,7 +49,7 @@ import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VersionNumber; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java index afc45a6c70..c164318f1b 100644 --- a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java +++ b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java @@ -35,8 +35,8 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.module.ModuleDependency; import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.cmr.module.ModuleInstallState; -import org.alfresco.util.ISO8601DateFormat; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.VersionNumber; /** diff --git a/source/java/org/alfresco/repo/module/ModuleStarter.java b/source/java/org/alfresco/repo/module/ModuleStarter.java index 89ec4dbfa2..e111536a3d 100644 --- a/source/java/org/alfresco/repo/module/ModuleStarter.java +++ b/source/java/org/alfresco/repo/module/ModuleStarter.java @@ -27,8 +27,8 @@ package org.alfresco.repo.module; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/node/FullNodeServiceTest.java b/source/java/org/alfresco/repo/node/FullNodeServiceTest.java index 664624bfbf..4c632a0b8d 100644 --- a/source/java/org/alfresco/repo/node/FullNodeServiceTest.java +++ b/source/java/org/alfresco/repo/node/FullNodeServiceTest.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.node.db.DbNodeServiceImpl; import org.alfresco.service.cmr.repository.MLText; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java b/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java index 39d2700080..24ffd9995d 100644 --- a/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java +++ b/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; diff --git a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java index 6b87c637df..3cb470613d 100644 --- a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java +++ b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConversionException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java b/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java index 7280d8fee7..728b7e7319 100644 --- a/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java +++ b/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java @@ -11,7 +11,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java index e221616a18..d888ad767a 100644 --- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java +++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java @@ -74,8 +74,8 @@ import org.alfresco.service.namespace.QNamePattern; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java index 4b08fd34d1..41b5fa409d 100644 --- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java +++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java @@ -34,7 +34,7 @@ import java.util.Set; import javax.transaction.UserTransaction; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.node.BaseNodeServiceTest; @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.lang.mutable.MutableInt; /** diff --git a/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java b/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java index 162fe58dbc..b4437200b5 100644 --- a/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java +++ b/source/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java @@ -9,7 +9,7 @@ import org.alfresco.repo.node.db.NodeDaoService.NodeRefQueryCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.lang.mutable.MutableLong; /** diff --git a/source/java/org/alfresco/repo/node/db/IndexChildrenWhereRequiredWorker.java b/source/java/org/alfresco/repo/node/db/IndexChildrenWhereRequiredWorker.java index 4ebfbcfced..7da3af9dd6 100644 --- a/source/java/org/alfresco/repo/node/db/IndexChildrenWhereRequiredWorker.java +++ b/source/java/org/alfresco/repo/node/db/IndexChildrenWhereRequiredWorker.java @@ -10,7 +10,7 @@ import org.alfresco.repo.node.db.NodeDaoService.NodeRefQueryCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Indexes child nodes where cascade re-indexing is disabled. diff --git a/source/java/org/alfresco/repo/node/db/NodeDaoService.java b/source/java/org/alfresco/repo/node/db/NodeDaoService.java index 161b70d34d..25cbcd05c5 100644 --- a/source/java/org/alfresco/repo/node/db/NodeDaoService.java +++ b/source/java/org/alfresco/repo/node/db/NodeDaoService.java @@ -47,7 +47,7 @@ import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.StoreExistsException; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Service layer accessing persistent node entities directly diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java index a37a568b3a..bc4dc90c83 100644 --- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java +++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java @@ -118,7 +118,7 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.CacheMode; diff --git a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java index 1fcae654a2..7bfb0367eb 100644 --- a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java +++ b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java @@ -58,8 +58,8 @@ import org.alfresco.service.cmr.repository.NodeRef.Status; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.VmShutdownListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java index fdcffff6e6..17673db45f 100644 --- a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java +++ b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java @@ -30,7 +30,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.domain.Transaction; import org.alfresco.repo.node.index.IndexTransactionTracker.IndexTransactionTrackerListener; diff --git a/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java b/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java index 2b4dc16904..6f24e59fa6 100644 --- a/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java +++ b/source/java/org/alfresco/repo/node/index/IndexRecoveryBootstrapBean.java @@ -16,7 +16,7 @@ */ package org.alfresco.repo.node.index; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java b/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java index e105205295..31b69b0daa 100644 --- a/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java +++ b/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java @@ -1,6 +1,6 @@ package org.alfresco.repo.node.index; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; diff --git a/source/java/org/alfresco/repo/node/index/IndexTransactionTracker.java b/source/java/org/alfresco/repo/node/index/IndexTransactionTracker.java index d55c6cabc3..d5b5043248 100644 --- a/source/java/org/alfresco/repo/node/index/IndexTransactionTracker.java +++ b/source/java/org/alfresco/repo/node/index/IndexTransactionTracker.java @@ -36,7 +36,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.domain.Transaction; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java index fadf4e1934..5d298ee425 100644 --- a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java +++ b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java @@ -52,7 +52,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java b/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java index 998d749805..cd207a839a 100644 --- a/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java +++ b/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/policy/BaseBehaviour.java b/source/java/org/alfresco/repo/policy/BaseBehaviour.java index 406f89d810..57f6fc213d 100644 --- a/source/java/org/alfresco/repo/policy/BaseBehaviour.java +++ b/source/java/org/alfresco/repo/policy/BaseBehaviour.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Stack; import org.alfresco.repo.policy.Behaviour.NotificationFrequency; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Base behaviour implementation diff --git a/source/java/org/alfresco/repo/policy/JavaBehaviour.java b/source/java/org/alfresco/repo/policy/JavaBehaviour.java index 4d8d95b8ab..6f2e66fef1 100644 --- a/source/java/org/alfresco/repo/policy/JavaBehaviour.java +++ b/source/java/org/alfresco/repo/policy/JavaBehaviour.java @@ -29,7 +29,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/policy/PolicyComponentImpl.java b/source/java/org/alfresco/repo/policy/PolicyComponentImpl.java index 3c41af51c0..5a6cd2fce4 100644 --- a/source/java/org/alfresco/repo/policy/PolicyComponentImpl.java +++ b/source/java/org/alfresco/repo/policy/PolicyComponentImpl.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/processor/ScriptServiceImpl.java b/source/java/org/alfresco/repo/processor/ScriptServiceImpl.java index 19223e7f0c..798a08e68b 100644 --- a/source/java/org/alfresco/repo/processor/ScriptServiceImpl.java +++ b/source/java/org/alfresco/repo/processor/ScriptServiceImpl.java @@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.ScriptProcessor; import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java b/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java index 14b2eab4a9..88a071f72a 100644 --- a/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java +++ b/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java @@ -27,8 +27,8 @@ package org.alfresco.repo.props; import java.io.Serializable; import org.alfresco.repo.domain.propval.PropertyValueDAO; -import org.alfresco.util.Pair; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java index 1224bd29b9..d53e37302e 100644 --- a/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java +++ b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java @@ -19,7 +19,7 @@ import org.alfresco.service.cmr.avm.VersionDescriptor; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.cmr.remote.AVMRemoteTransport; import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Client side wrapper for AVMRemoteTransport. diff --git a/source/java/org/alfresco/repo/remote/AttributeServiceRemote.java b/source/java/org/alfresco/repo/remote/AttributeServiceRemote.java index ec6dea7090..319bf7b984 100644 --- a/source/java/org/alfresco/repo/remote/AttributeServiceRemote.java +++ b/source/java/org/alfresco/repo/remote/AttributeServiceRemote.java @@ -32,7 +32,7 @@ import org.alfresco.repo.attributes.Attribute; import org.alfresco.service.cmr.attributes.AttrQuery; import org.alfresco.service.cmr.attributes.AttributeService; import org.alfresco.service.cmr.remote.AttributeServiceTransport; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Client side AttributeService implementation. diff --git a/source/java/org/alfresco/repo/remote/RepoRemoteImpl.java b/source/java/org/alfresco/repo/remote/RepoRemoteImpl.java index c5c8f0f2c2..66c8266e7a 100644 --- a/source/java/org/alfresco/repo/remote/RepoRemoteImpl.java +++ b/source/java/org/alfresco/repo/remote/RepoRemoteImpl.java @@ -10,7 +10,7 @@ import java.util.Map; import org.alfresco.service.cmr.remote.RepoRemote; import org.alfresco.service.cmr.remote.RepoRemoteTransport; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Client side implementation of RepoRemote interface. diff --git a/source/java/org/alfresco/repo/remote/RepoRemoteService.java b/source/java/org/alfresco/repo/remote/RepoRemoteService.java index bbb1c724c4..656759619b 100644 --- a/source/java/org/alfresco/repo/remote/RepoRemoteService.java +++ b/source/java/org/alfresco/repo/remote/RepoRemoteService.java @@ -22,7 +22,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/remote/RepoRemoteTransportService.java b/source/java/org/alfresco/repo/remote/RepoRemoteTransportService.java index 2ba0407789..73535fb915 100644 --- a/source/java/org/alfresco/repo/remote/RepoRemoteTransportService.java +++ b/source/java/org/alfresco/repo/remote/RepoRemoteTransportService.java @@ -17,7 +17,7 @@ import org.alfresco.service.cmr.remote.RepoRemoteTransport; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.util.GUID; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * The server side implementation of RepoRemoteTransport. It diff --git a/source/java/org/alfresco/repo/rule/RuleServiceImpl.java b/source/java/org/alfresco/repo/rule/RuleServiceImpl.java index 3481bf3847..f3e6c08d0a 100644 --- a/source/java/org/alfresco/repo/rule/RuleServiceImpl.java +++ b/source/java/org/alfresco/repo/rule/RuleServiceImpl.java @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/rule/RuleTypeImpl.java b/source/java/org/alfresco/repo/rule/RuleTypeImpl.java index e235d14c30..782fca0b29 100644 --- a/source/java/org/alfresco/repo/rule/RuleTypeImpl.java +++ b/source/java/org/alfresco/repo/rule/RuleTypeImpl.java @@ -26,7 +26,7 @@ package org.alfresco.repo.rule; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.CommonResourceAbstractBase; import org.alfresco.repo.rule.ruletrigger.RuleTrigger; diff --git a/source/java/org/alfresco/repo/rule/RulesAspect.java b/source/java/org/alfresco/repo/rule/RulesAspect.java index 3eac5d6849..f94e802737 100644 --- a/source/java/org/alfresco/repo/rule/RulesAspect.java +++ b/source/java/org/alfresco/repo/rule/RulesAspect.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Class containing behaviour for the rules aspect diff --git a/source/java/org/alfresco/repo/search/IndexerComponent.java b/source/java/org/alfresco/repo/search/IndexerComponent.java index 3655316757..90c97ce525 100644 --- a/source/java/org/alfresco/repo/search/IndexerComponent.java +++ b/source/java/org/alfresco/repo/search/IndexerComponent.java @@ -27,7 +27,7 @@ package org.alfresco.repo.search; import org.alfresco.repo.service.StoreRedirectorProxyFactory; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java index dfe5e4b9af..9b3f85cf21 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneCategoryTest.java @@ -61,7 +61,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.springframework.context.ApplicationContext; /** diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java index 82f21d7d40..bb5b5d14b5 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java @@ -44,7 +44,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.transform.ContentTransformer; @@ -78,7 +78,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConversionException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.alfresco.util.EqualsHelper; import org.alfresco.util.ISO9075; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java index 1454e3db6b..924cb8398b 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java @@ -41,7 +41,7 @@ import org.alfresco.cmis.CMISQueryOptions; import org.alfresco.cmis.CMISQueryService; import org.alfresco.cmis.CMISResultSetMetaData; import org.alfresco.cmis.CMISResultSetRow; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.search.CannedQueryDef; import org.alfresco.repo.search.EmptyResultSet; @@ -79,7 +79,7 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; import org.alfresco.util.ISO9075; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.util.SearchLanguageConversion; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java index 1fe6cd3d55..7e9f0d90ad 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java @@ -55,7 +55,7 @@ import junit.framework.TestCase; import org.alfresco.cmis.CMISQueryOptions; import org.alfresco.cmis.CMISResultSet; import org.alfresco.cmis.CMISResultSetRow; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.DictionaryNamespaceComponent; @@ -106,7 +106,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.alfresco.util.ISO9075; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java index 256de0275a..6caa046738 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java @@ -41,7 +41,7 @@ import java.util.Locale; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.model.WCMModel; import org.alfresco.repo.avm.AVMDAOs; @@ -83,11 +83,11 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConversionException; import org.alfresco.service.namespace.QName; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; import org.alfresco.util.ISO9075; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.lucene.analysis.Token; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java index e3fa7d2372..ad82cab1a1 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java @@ -55,7 +55,7 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; import org.alfresco.util.ISO9075; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Category service implementation diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java index 13a95cbcb5..f1bd1bc48f 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java @@ -39,7 +39,7 @@ import java.util.Locale; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.IndexTokenisationMode; import org.alfresco.repo.search.MLAnalysisMode; @@ -61,7 +61,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.alfresco.util.SearchLanguageConversion; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java index e4767bf422..6cb59ac4d9 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java @@ -29,7 +29,7 @@ import java.util.List; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespacePrefixResolver; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Lucene implementation specific entension to the seracher API diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTimeTokenFilter.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTimeTokenFilter.java index 51d5cf8f67..d2292cd9ee 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTimeTokenFilter.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTimeTokenFilter.java @@ -33,7 +33,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Iterator; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.WhitespaceTokenizer; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTokenFilter.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTokenFilter.java index 3e41b1f423..25b26b2b1a 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTokenFilter.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/analysis/DateTokenFilter.java @@ -31,7 +31,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.WhitespaceTokenizer; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java index a80330f596..8c5d2b8059 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayser.java @@ -30,7 +30,7 @@ import java.io.Reader; import java.util.HashMap; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.search.MLAnalysisMode; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; diff --git a/source/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java b/source/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java index 790185aa49..eecb2f5e0c 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java +++ b/source/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.search.MLAnalysisMode; import org.alfresco.repo.search.SearcherException; import org.alfresco.repo.search.impl.lucene.LuceneFunction; diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java b/source/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java index e2ebb41b4d..8318152ef4 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Set; import org.alfresco.service.cmr.search.ResultSet; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * @author andyh diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java b/source/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java index e64d6b0968..7699f12834 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.search.MLAnalysisMode; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.QueryParameterDefinition; diff --git a/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java b/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java index d9e4b91500..dd7f4bf15c 100644 --- a/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java +++ b/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java @@ -25,7 +25,7 @@ package org.alfresco.repo.security.authentication; import org.alfresco.repo.tenant.TenantService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.lang.RandomStringUtils; /** diff --git a/source/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java b/source/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java index ce7e5458fd..a39aa65862 100644 --- a/source/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java +++ b/source/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java @@ -37,7 +37,7 @@ import javax.security.auth.login.LoginException; import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.RealmCallback; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.security.authentication.AbstractAuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationException; diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java index 0c07644d1a..fdd845898e 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java @@ -544,7 +544,7 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing private AccessStatus doAvmCan(NodeRef nodeRef, PermissionReference permission) { - org.alfresco.util.Pair avmVersionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef); + org.springframework.extensions.surf.util.Pair avmVersionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef); int version = avmVersionPath.getFirst(); String path = avmVersionPath.getSecond(); boolean result = AVMRepository.GetInstance().can(nodeRef.getStoreRef().getIdentifier(), version, path, permission.getName()); diff --git a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java index c760707b17..dcd167fc11 100644 --- a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java +++ b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java @@ -36,7 +36,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.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; diff --git a/source/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java b/source/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java index 652c8fa7c9..c2b7e7bf18 100644 --- a/source/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java +++ b/source/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java @@ -33,7 +33,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java index ba45abb9d5..911e341a5c 100644 --- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java +++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java @@ -76,7 +76,7 @@ import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java b/source/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java index c8dcab3a57..15ed9cae37 100644 --- a/source/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java +++ b/source/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java @@ -25,7 +25,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.GUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java b/source/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java index aafa07b294..6ef8f3181d 100644 --- a/source/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java +++ b/source/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java @@ -1,6 +1,6 @@ package org.alfresco.repo.security.person; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; public class UserNameMatcherImpl implements UserNameMatcher { diff --git a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java index f84741fc80..13e2ca076b 100644 --- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java +++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java @@ -62,7 +62,7 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -1231,7 +1231,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ @Override protected void onBootstrap(ApplicationEvent event) @@ -1261,7 +1261,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl /* * (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ @Override protected void onShutdown(ApplicationEvent event) diff --git a/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java b/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java index 2532259e9e..3d031946b0 100644 --- a/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java +++ b/source/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java @@ -36,7 +36,7 @@ import java.util.Map; import org.alfresco.service.ServiceException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.FactoryBean; diff --git a/source/java/org/alfresco/repo/shutdown/ShutdownBackstop.java b/source/java/org/alfresco/repo/shutdown/ShutdownBackstop.java index f4c24cd625..d485e7e4b8 100644 --- a/source/java/org/alfresco/repo/shutdown/ShutdownBackstop.java +++ b/source/java/org/alfresco/repo/shutdown/ShutdownBackstop.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.shutdown; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java b/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java index 05b16823b1..eebf669c60 100644 --- a/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java +++ b/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java @@ -33,8 +33,8 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 0fcd847695..f425908279 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -74,8 +74,8 @@ import org.alfresco.service.cmr.tagging.TaggingService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/site/script/ScriptSiteService.java b/source/java/org/alfresco/repo/site/script/ScriptSiteService.java index 8fccf06b21..f0b103f1b9 100644 --- a/source/java/org/alfresco/repo/site/script/ScriptSiteService.java +++ b/source/java/org/alfresco/repo/site/script/ScriptSiteService.java @@ -32,7 +32,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/site/script/Site.java b/source/java/org/alfresco/repo/site/script/Site.java index 08bf80bb90..6e0fcf355e 100644 --- a/source/java/org/alfresco/repo/site/script/Site.java +++ b/source/java/org/alfresco/repo/site/script/Site.java @@ -55,7 +55,7 @@ import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.sandbox.script.Asset; import org.mozilla.javascript.NativeObject; diff --git a/source/java/org/alfresco/repo/template/AVM.java b/source/java/org/alfresco/repo/template/AVM.java index a3194d1d72..6c5c6a6222 100644 --- a/source/java/org/alfresco/repo/template/AVM.java +++ b/source/java/org/alfresco/repo/template/AVM.java @@ -31,7 +31,7 @@ import org.alfresco.config.JNDIConstants; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMStoreDescriptor; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.sandbox.SandboxService; import org.alfresco.wcm.util.WCMUtil; diff --git a/source/java/org/alfresco/repo/template/AVMTemplateNode.java b/source/java/org/alfresco/repo/template/AVMTemplateNode.java index a10a222423..db47b4c33b 100644 --- a/source/java/org/alfresco/repo/template/AVMTemplateNode.java +++ b/source/java/org/alfresco/repo/template/AVMTemplateNode.java @@ -55,8 +55,8 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespacePrefixResolverProvider; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QNameMap; -import org.alfresco.util.Pair; -import org.alfresco.util.URLEncoder; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.URLEncoder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.util.StringUtils; diff --git a/source/java/org/alfresco/repo/template/BaseContentNode.java b/source/java/org/alfresco/repo/template/BaseContentNode.java index 3996fb298d..97b8cc55b4 100644 --- a/source/java/org/alfresco/repo/template/BaseContentNode.java +++ b/source/java/org/alfresco/repo/template/BaseContentNode.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.FileTypeImageSize; import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.namespace.QName; -import org.alfresco.util.URLEncoder; +import org.springframework.extensions.surf.util.URLEncoder; /** * Base class for Template API objects that supply content functionality. diff --git a/source/java/org/alfresco/repo/template/I18NMessageMethod.java b/source/java/org/alfresco/repo/template/I18NMessageMethod.java index bd287d146a..23af11ddbc 100644 --- a/source/java/org/alfresco/repo/template/I18NMessageMethod.java +++ b/source/java/org/alfresco/repo/template/I18NMessageMethod.java @@ -26,7 +26,7 @@ package org.alfresco.repo.template; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import freemarker.template.TemplateDateModel; import freemarker.template.TemplateMethodModelEx; diff --git a/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java b/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java index 54e8fb64b5..19160038a7 100644 --- a/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java +++ b/source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java @@ -26,7 +26,7 @@ package org.alfresco.repo.template; import java.util.List; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import freemarker.template.TemplateDateModel; import freemarker.template.TemplateMethodModelEx; diff --git a/source/java/org/alfresco/repo/template/People.java b/source/java/org/alfresco/repo/template/People.java index 19684d515e..bf528bd26c 100644 --- a/source/java/org/alfresco/repo/template/People.java +++ b/source/java/org/alfresco/repo/template/People.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * People and users support in FreeMarker templates. diff --git a/source/java/org/alfresco/repo/template/Site.java b/source/java/org/alfresco/repo/template/Site.java index 89d9d8875f..7c0cdb111f 100644 --- a/source/java/org/alfresco/repo/template/Site.java +++ b/source/java/org/alfresco/repo/template/Site.java @@ -28,7 +28,7 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Site support in FreeMarker templates. diff --git a/source/java/org/alfresco/repo/template/VersionHistoryNode.java b/source/java/org/alfresco/repo/template/VersionHistoryNode.java index 49f3e617bb..b97a2aa2ec 100644 --- a/source/java/org/alfresco/repo/template/VersionHistoryNode.java +++ b/source/java/org/alfresco/repo/template/VersionHistoryNode.java @@ -41,7 +41,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespacePrefixResolverProvider; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QNameMap; -import org.alfresco.util.URLEncoder; +import org.springframework.extensions.surf.util.URLEncoder; /** * Template Node wrapper representing a record in the version history of a node. diff --git a/source/java/org/alfresco/repo/template/Workflow.java b/source/java/org/alfresco/repo/template/Workflow.java index 75ae9472f8..5b71e81186 100644 --- a/source/java/org/alfresco/repo/template/Workflow.java +++ b/source/java/org/alfresco/repo/template/Workflow.java @@ -54,7 +54,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolverProvider; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QNameMap; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Workflow and task support in FreeMarker templates. diff --git a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java index 536010b227..b9e0216b13 100755 --- a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java @@ -38,7 +38,7 @@ import javax.transaction.UserTransaction; import net.sf.acegisecurity.providers.encoding.PasswordEncoder; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.RepoModelDefinition; import org.alfresco.repo.attributes.BooleanAttributeValue; import org.alfresco.repo.attributes.MapAttribute; @@ -63,8 +63,8 @@ import org.alfresco.service.cmr.view.RepositoryExporterService; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; diff --git a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java index 9bae787e98..c3848b1b71 100755 --- a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java @@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java index 3447601cdf..7f00f7b8f6 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java +++ b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java @@ -24,8 +24,8 @@ */ package org.alfresco.repo.tenant; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java index e0802f9e99..57532b7cd4 100755 --- a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java +++ b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java @@ -31,14 +31,14 @@ import java.io.InputStream; import java.io.PrintStream; import java.util.List; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.admin.BaseInterpreter; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthorityService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; diff --git a/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java b/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java index 9317c91213..4b406849c3 100644 --- a/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java +++ b/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java @@ -50,7 +50,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java b/source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java index 7f74cfd8f1..6ce0adae0b 100644 --- a/source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java +++ b/source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java @@ -40,7 +40,7 @@ import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager; import org.alfresco.repo.node.integrity.IntegrityChecker; import org.alfresco.repo.search.impl.lucene.LuceneIndexerAndSearcher; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.orm.hibernate3.SessionFactoryUtils; diff --git a/source/java/org/alfresco/repo/transaction/TransactionUtil.java b/source/java/org/alfresco/repo/transaction/TransactionUtil.java index 5daf1bcf7e..22a2da6c9f 100644 --- a/source/java/org/alfresco/repo/transaction/TransactionUtil.java +++ b/source/java/org/alfresco/repo/transaction/TransactionUtil.java @@ -30,7 +30,7 @@ import javax.transaction.UserTransaction; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/usage/ContentUsageImpl.java b/source/java/org/alfresco/repo/usage/ContentUsageImpl.java index 44b72d14a5..5ad943bdb2 100644 --- a/source/java/org/alfresco/repo/usage/ContentUsageImpl.java +++ b/source/java/org/alfresco/repo/usage/ContentUsageImpl.java @@ -48,7 +48,7 @@ import org.alfresco.service.cmr.usage.ContentUsageService; import org.alfresco.service.cmr.usage.UsageService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java index dca599d840..7142429701 100644 --- a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java +++ b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java @@ -48,8 +48,8 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.usage.UsageService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.AbstractLifecycleBean; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java index 2a6ffd95b3..e45b96bbcf 100644 --- a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java +++ b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java @@ -55,7 +55,7 @@ import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.cmr.version.VersionServiceException; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/version/VersionMigrator.java b/source/java/org/alfresco/repo/version/VersionMigrator.java index 3ab6eabc03..7e6e2454ea 100644 --- a/source/java/org/alfresco/repo/version/VersionMigrator.java +++ b/source/java/org/alfresco/repo/version/VersionMigrator.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager; import org.alfresco.repo.node.MLPropertyInterceptor; diff --git a/source/java/org/alfresco/repo/version/VersionServiceImpl.java b/source/java/org/alfresco/repo/version/VersionServiceImpl.java index e634d7c7ef..cce646a882 100644 --- a/source/java/org/alfresco/repo/version/VersionServiceImpl.java +++ b/source/java/org/alfresco/repo/version/VersionServiceImpl.java @@ -62,7 +62,7 @@ import org.alfresco.service.cmr.version.VersionServiceException; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/version/VersionableAspect.java b/source/java/org/alfresco/repo/version/VersionableAspect.java index 3cdef372f4..2de5de399d 100644 --- a/source/java/org/alfresco/repo/version/VersionableAspect.java +++ b/source/java/org/alfresco/repo/version/VersionableAspect.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.ContentServicePolicies; import org.alfresco.repo.copy.CopyBehaviourCallback; diff --git a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java index b08deb7f94..0e483f4dd3 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java @@ -54,7 +54,7 @@ import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java index 621e009251..6524260784 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.BaseInterpreter; import org.alfresco.repo.avm.AVMNodeConverter; @@ -105,7 +105,7 @@ public class WorkflowInterpreter extends BaseInterpreter /* (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent) */ @Override protected void onBootstrap(ApplicationEvent event) @@ -113,7 +113,7 @@ public class WorkflowInterpreter extends BaseInterpreter } /* (non-Javadoc) - * @see org.alfresco.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) + * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent) */ @Override protected void onShutdown(ApplicationEvent event) diff --git a/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java index 109b62ef8e..e2b1b799d2 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.workflow.WorkflowException; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java index da8efaf894..e8daa274d6 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationComponent; diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java index e4388239ba..e1ad0ddd9b 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java @@ -24,7 +24,7 @@ */ package org.alfresco.repo.workflow.jbpm; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.jbpm.job.executor.JobExecutor; import org.springframework.context.ApplicationEvent; import org.springmodules.workflow.jbpm31.JbpmTemplate; diff --git a/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java b/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java index 1cf8f471d4..b041e845e6 100644 --- a/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java +++ b/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java @@ -55,7 +55,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.NamespacePrefixResolverProvider; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; diff --git a/source/java/org/alfresco/service/cmr/attributes/AttributeService.java b/source/java/org/alfresco/service/cmr/attributes/AttributeService.java index 31333121ee..f87d141036 100644 --- a/source/java/org/alfresco/service/cmr/attributes/AttributeService.java +++ b/source/java/org/alfresco/service/cmr/attributes/AttributeService.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import org.alfresco.repo.attributes.Attribute; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * This provides services for reading, writing, and querying global attributes. diff --git a/source/java/org/alfresco/service/cmr/avm/AVMService.java b/source/java/org/alfresco/service/cmr/avm/AVMService.java index b18e715067..d91141f585 100644 --- a/source/java/org/alfresco/service/cmr/avm/AVMService.java +++ b/source/java/org/alfresco/service/cmr/avm/AVMService.java @@ -38,7 +38,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Service interface for the Alfresco Versioning Model (AVM).
diff --git a/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java b/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java index 72c9486172..a9af7a24cd 100644 --- a/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java +++ b/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.avm; import java.io.Serializable; import java.util.Date; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * A value class for Data about an AVMStore. diff --git a/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java b/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java index 7b916be427..3af336399c 100644 --- a/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java +++ b/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.avm; import java.io.Serializable; import java.util.Date; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * All the information about a particular version. diff --git a/source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java b/source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java index 204bbb4432..6b44206869 100644 --- a/source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java +++ b/source/java/org/alfresco/service/cmr/avm/deploy/DeploymentEvent.java @@ -27,7 +27,7 @@ package org.alfresco.service.cmr.avm.deploy; import java.io.Serializable; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Interface for Deployment Events. diff --git a/source/java/org/alfresco/service/cmr/email/EmailMessageException.java b/source/java/org/alfresco/service/cmr/email/EmailMessageException.java index 36dd0de231..9eceb3cd99 100644 --- a/source/java/org/alfresco/service/cmr/email/EmailMessageException.java +++ b/source/java/org/alfresco/service/cmr/email/EmailMessageException.java @@ -24,7 +24,7 @@ */ package org.alfresco.service.cmr.email; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; /** * A checked and handled exception indicating a specific and well-known diff --git a/source/java/org/alfresco/service/cmr/lock/NodeLockedException.java b/source/java/org/alfresco/service/cmr/lock/NodeLockedException.java index 578cd0f8cd..bddc0e19a6 100644 --- a/source/java/org/alfresco/service/cmr/lock/NodeLockedException.java +++ b/source/java/org/alfresco/service/cmr/lock/NodeLockedException.java @@ -27,7 +27,7 @@ package org.alfresco.service.cmr.lock; import java.text.MessageFormat; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java b/source/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java index d6f9c7c8fe..035ae17908 100644 --- a/source/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java +++ b/source/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.lock; import java.text.MessageFormat; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java b/source/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java index d9fcc8fb96..c80ec8bd8d 100644 --- a/source/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java +++ b/source/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.lock; import java.text.MessageFormat; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java b/source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java index ae73a446c4..66547f551a 100644 --- a/source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java +++ b/source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java @@ -105,7 +105,7 @@ public interface MultilingualContentService /** * Given a cm:mlDocument, this method attempts to find the best translation for the given * locale. If there is not even a - * {@link org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set) partial match}, then the + * {@link org.springframework.extensions.surf.util.I18NUtil#getNearestLocale(Locale, Set) partial match}, then the * {@link #getPivotTranslation(NodeRef) pivot translation} is used. If that also gives no results * then the translation itself is returned. * @@ -114,7 +114,7 @@ public interface MultilingualContentService * @return Returns the best match for the locale (never null) * * @see #getTranslations(NodeRef) - * @see org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set) + * @see org.springframework.extensions.surf.util.I18NUtil#getNearestLocale(Locale, Set) */ @Auditable(key = Auditable.Key.ARG_0, parameters = {"translationNodeRef", "locale"}) NodeRef getTranslationForLocale(NodeRef translationNodeRef, Locale locale); diff --git a/source/java/org/alfresco/service/cmr/remote/AVMRemote.java b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java index a6bcd93361..627e5f5acb 100644 --- a/source/java/org/alfresco/service/cmr/remote/AVMRemote.java +++ b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java @@ -40,7 +40,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Remote interface for Alfresco Versioning Model (AVM).
diff --git a/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java index 96e23a774b..f68fd34371 100644 --- a/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java +++ b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java @@ -17,7 +17,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * This is the actual remote interface that is wrapped by diff --git a/source/java/org/alfresco/service/cmr/remote/AttributeServiceTransport.java b/source/java/org/alfresco/service/cmr/remote/AttributeServiceTransport.java index e6d709d387..84534b9fbc 100644 --- a/source/java/org/alfresco/service/cmr/remote/AttributeServiceTransport.java +++ b/source/java/org/alfresco/service/cmr/remote/AttributeServiceTransport.java @@ -30,7 +30,7 @@ import java.util.Map; import org.alfresco.repo.attributes.Attribute; import org.alfresco.service.cmr.attributes.AttrQuery; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * The transport wrapper for remoted AttributeService. diff --git a/source/java/org/alfresco/service/cmr/remote/RepoRemote.java b/source/java/org/alfresco/service/cmr/remote/RepoRemote.java index e88dd90d4e..7473397c7b 100644 --- a/source/java/org/alfresco/service/cmr/remote/RepoRemote.java +++ b/source/java/org/alfresco/service/cmr/remote/RepoRemote.java @@ -8,7 +8,7 @@ import java.io.OutputStream; import java.util.Map; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * A highly simplified remote interface for the repo. diff --git a/source/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java b/source/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java index c1c73c6754..9147b28c49 100644 --- a/source/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java +++ b/source/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java @@ -6,7 +6,7 @@ package org.alfresco.service.cmr.remote; import java.util.Map; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Over the wire, and authentication safe flavor of diff --git a/source/java/org/alfresco/service/cmr/repository/ContentData.java b/source/java/org/alfresco/service/cmr/repository/ContentData.java index 35e513d971..384566ad33 100644 --- a/source/java/org/alfresco/service/cmr/repository/ContentData.java +++ b/source/java/org/alfresco/service/cmr/repository/ContentData.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.util.Locale; import java.util.StringTokenizer; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.util.EqualsHelper; diff --git a/source/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java b/source/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java index e5b8273075..21f013b64d 100644 --- a/source/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java +++ b/source/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java @@ -24,7 +24,7 @@ */ package org.alfresco.service.cmr.repository; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.service.namespace.QName; diff --git a/source/java/org/alfresco/service/cmr/repository/MLText.java b/source/java/org/alfresco/service/cmr/repository/MLText.java index 3c1251c740..128c2fbea7 100644 --- a/source/java/org/alfresco/service/cmr/repository/MLText.java +++ b/source/java/org/alfresco/service/cmr/repository/MLText.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Set; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; /** * Class to represent a multilingual (ML) text value. diff --git a/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java b/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java index 3ea6b21d3d..f6b968dc8b 100644 --- a/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java +++ b/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java @@ -40,7 +40,7 @@ import java.util.Locale; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.attributes.Attribute; import org.alfresco.repo.attributes.MapAttribute; import org.alfresco.repo.attributes.MapAttributeValue; @@ -57,7 +57,7 @@ import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Period; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.util.VersionNumber; /** diff --git a/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java b/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java index 707d4b660a..53b71b4a0f 100644 --- a/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java +++ b/source/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java @@ -40,7 +40,7 @@ import org.alfresco.repo.attributes.StringAttribute; import org.alfresco.repo.attributes.StringAttributeValue; import org.alfresco.service.cmr.repository.MLText; import org.alfresco.service.cmr.repository.Period; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.util.VersionNumber; public class DefaultTypeConverterTest extends TestCase diff --git a/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java b/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java index 206c9373a4..fcc8544681 100644 --- a/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java +++ b/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java @@ -35,7 +35,7 @@ import java.text.ParsePosition; import java.util.Calendar; import java.util.Date; -import org.alfresco.util.CachingDateFormat; +import org.springframework.extensions.surf.util.CachingDateFormat; /** * This data type represents duration/interval/period as defined by the XMLSchema type diff --git a/source/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java b/source/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java index 0733fae99b..e59f13262b 100644 --- a/source/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java +++ b/source/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java @@ -31,7 +31,7 @@ import java.util.Map; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryException; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** diff --git a/source/java/org/alfresco/service/cmr/search/CategoryService.java b/source/java/org/alfresco/service/cmr/search/CategoryService.java index 18f74adc55..55556cd072 100644 --- a/source/java/org/alfresco/service/cmr/search/CategoryService.java +++ b/source/java/org/alfresco/service/cmr/search/CategoryService.java @@ -33,7 +33,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.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Category Service diff --git a/source/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java b/source/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java index 58fde6f59f..31399ed280 100644 --- a/source/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java +++ b/source/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java @@ -26,7 +26,7 @@ package org.alfresco.service.cmr.thumbnail; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Encapsulates the details of a thumbnails parent association diff --git a/source/java/org/alfresco/service/cmr/view/Location.java b/source/java/org/alfresco/service/cmr/view/Location.java index 720902fae2..f63dacb204 100644 --- a/source/java/org/alfresco/service/cmr/view/Location.java +++ b/source/java/org/alfresco/service/cmr/view/Location.java @@ -27,7 +27,7 @@ package org.alfresco.service.cmr.view; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; /** * Importer / Exporter Location diff --git a/source/java/org/alfresco/util/JSONtoFmModel.java b/source/java/org/alfresco/util/JSONtoFmModel.java index 50dc8887c8..b2c78792b7 100644 --- a/source/java/org/alfresco/util/JSONtoFmModel.java +++ b/source/java/org/alfresco/util/JSONtoFmModel.java @@ -35,6 +35,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; +import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * Utility to convert JSON to Freemarker-compatible data model diff --git a/source/java/org/alfresco/util/OpenOfficeConnectionTester.java b/source/java/org/alfresco/util/OpenOfficeConnectionTester.java index b85e91e578..46f9c58e75 100644 --- a/source/java/org/alfresco/util/OpenOfficeConnectionTester.java +++ b/source/java/org/alfresco/util/OpenOfficeConnectionTester.java @@ -33,7 +33,6 @@ import net.sf.jooreports.openoffice.connection.AbstractOpenOfficeConnection; import net.sf.jooreports.openoffice.connection.OpenOfficeConnection; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.i18n.I18NUtil; import org.alfresco.repo.content.metadata.MetadataExtracterRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,6 +42,8 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.I18NUtil; import com.sun.star.registry.RegistryValueType; import com.sun.star.registry.XRegistryKey; diff --git a/source/java/org/alfresco/util/PropertyMap.java b/source/java/org/alfresco/util/PropertyMap.java index 85f87bd03c..fa409299b4 100644 --- a/source/java/org/alfresco/util/PropertyMap.java +++ b/source/java/org/alfresco/util/PropertyMap.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.Map; import org.alfresco.service.namespace.QName; +import org.springframework.extensions.surf.util.Pair; /** * Property map helper class. diff --git a/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java b/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java index 783db8d6aa..196466a108 100644 --- a/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java +++ b/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java @@ -39,7 +39,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Composite property bean to identify a folder in the repository. This uses the diff --git a/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java b/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java index 9d606bf0e4..907428ac20 100644 --- a/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java +++ b/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java @@ -31,8 +31,8 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.ParameterCheck; +import org.springframework.extensions.surf.util.PropertyCheck; /** * Composite property bean to identify a repository path. diff --git a/source/java/org/alfresco/wcm/actions/WCMSandboxRevertSnapshotAction.java b/source/java/org/alfresco/wcm/actions/WCMSandboxRevertSnapshotAction.java index 14f58c3076..c32744fe08 100644 --- a/source/java/org/alfresco/wcm/actions/WCMSandboxRevertSnapshotAction.java +++ b/source/java/org/alfresco/wcm/actions/WCMSandboxRevertSnapshotAction.java @@ -33,7 +33,7 @@ import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; import org.alfresco.wcm.sandbox.SandboxService; import org.alfresco.wcm.util.WCMUtil; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/wcm/asset/AssetServiceImpl.java b/source/java/org/alfresco/wcm/asset/AssetServiceImpl.java index c20edc7041..7f99932431 100644 --- a/source/java/org/alfresco/wcm/asset/AssetServiceImpl.java +++ b/source/java/org/alfresco/wcm/asset/AssetServiceImpl.java @@ -59,7 +59,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.TempFileProvider; import org.alfresco.wcm.sandbox.SandboxConstants; import org.alfresco.wcm.util.WCMUtil; diff --git a/source/java/org/alfresco/wcm/preview/PreviewURIServiceImpl.java b/source/java/org/alfresco/wcm/preview/PreviewURIServiceImpl.java index 8a8543b74f..b2d0adca79 100644 --- a/source/java/org/alfresco/wcm/preview/PreviewURIServiceImpl.java +++ b/source/java/org/alfresco/wcm/preview/PreviewURIServiceImpl.java @@ -30,7 +30,7 @@ import java.util.Set; import org.alfresco.repo.avm.util.AVMUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.util.WCMUtil; import org.alfresco.wcm.webproject.WebProjectService; diff --git a/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java b/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java index 57a1cc1fcd..e2065dfd7b 100644 --- a/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java +++ b/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java @@ -27,7 +27,7 @@ package org.alfresco.wcm.preview; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.util.PropertyCheck; +import org.springframework.extensions.surf.util.PropertyCheck; import org.springframework.beans.factory.InitializingBean; diff --git a/source/java/org/alfresco/wcm/preview/VirtualisationServerPreviewURIService.java b/source/java/org/alfresco/wcm/preview/VirtualisationServerPreviewURIService.java index 0c38750b94..96a544929f 100644 --- a/source/java/org/alfresco/wcm/preview/VirtualisationServerPreviewURIService.java +++ b/source/java/org/alfresco/wcm/preview/VirtualisationServerPreviewURIService.java @@ -31,7 +31,7 @@ import org.alfresco.config.JNDIConstants; import org.alfresco.mbeans.VirtServerRegistry; import org.alfresco.repo.avm.util.AVMUtil; import org.alfresco.service.cmr.avm.AVMService; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.util.WCMUtil; diff --git a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImpl.java b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImpl.java index b0eea8c326..b6ef34514e 100644 --- a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImpl.java +++ b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImpl.java @@ -62,8 +62,8 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.NameMatcher; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.Pair; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.VirtServerUtils; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.asset.AssetInfoImpl; diff --git a/source/java/org/alfresco/wcm/sandbox/script/Asset.java b/source/java/org/alfresco/wcm/sandbox/script/Asset.java index e81e49cbd0..e930939c9c 100644 --- a/source/java/org/alfresco/wcm/sandbox/script/Asset.java +++ b/source/java/org/alfresco/wcm/sandbox/script/Asset.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.namespace.NamespaceException; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.asset.AssetService; import org.alfresco.wcm.sandbox.SandboxService; diff --git a/source/java/org/alfresco/wcm/sandbox/script/Sandbox.java b/source/java/org/alfresco/wcm/sandbox/script/Sandbox.java index 02859c55c2..106351c898 100644 --- a/source/java/org/alfresco/wcm/sandbox/script/Sandbox.java +++ b/source/java/org/alfresco/wcm/sandbox/script/Sandbox.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.asset.AssetService; import org.alfresco.wcm.sandbox.SandboxInfo; diff --git a/source/java/org/alfresco/wcm/util/WCMUtil.java b/source/java/org/alfresco/wcm/util/WCMUtil.java index 6e52d0a020..695919503d 100644 --- a/source/java/org/alfresco/wcm/util/WCMUtil.java +++ b/source/java/org/alfresco/wcm/util/WCMUtil.java @@ -46,7 +46,7 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.FileNameValidator; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.VirtServerUtils; import org.alfresco.wcm.sandbox.SandboxConstants; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImpl.java b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImpl.java index c18d1440db..cdfe63bb17 100644 --- a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImpl.java +++ b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImpl.java @@ -70,7 +70,7 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.DNSNameMangler; -import org.alfresco.util.ParameterCheck; +import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.wcm.preview.PreviewURIServiceRegistry; import org.alfresco.wcm.sandbox.SandboxConstants; import org.alfresco.wcm.sandbox.SandboxFactory; diff --git a/source/test-resources/tenant/mt-admin-context.xml b/source/test-resources/tenant/mt-admin-context.xml index 5b7ef1301f..e7bdfe5587 100644 --- a/source/test-resources/tenant/mt-admin-context.xml +++ b/source/test-resources/tenant/mt-admin-context.xml @@ -26,7 +26,7 @@ - + alfresco.messages.tenant-interpreter-help