From 1c897ae1fb1cdde5874ce6674f03815384124207 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 16 Mar 2010 19:06:54 +0000 Subject: [PATCH] Latest SpringSurf libraries: - Cleanup and improvements to RequestContext related classes. - Removal of obsolete Alfresco util classes. Fixed up imports back to Alfresco versions of unused SpringSurf util classes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/cmis/search/CMISQueryParser.java | 2 +- source/java/org/alfresco/cmis/search/QueryTest.java | 2 +- .../java/org/alfresco/email/server/EmailServer.java | 2 +- .../org/alfresco/repo/action/ActionServiceImpl.java | 2 +- .../org/alfresco/repo/action/ActionsAspect.java | 2 +- .../repo/activities/feed/AbstractFeedGenerator.java | 2 +- .../repo/activities/feed/cleanup/FeedCleaner.java | 2 +- .../repo/activities/post/cleanup/PostCleaner.java | 2 +- .../repo/activities/post/lookup/PostLookup.java | 2 +- .../admin/patch/impl/ContentUrlConverterPatch.java | 2 +- .../repo/admin/registry/RegistryServiceImpl.java | 2 +- .../repo/audit/extractor/AbstractDataExtractor.java | 2 +- .../repo/audit/extractor/NodeNameDataExtractor.java | 2 +- .../repo/audit/extractor/NodeTypeDataExtractor.java | 2 +- .../repo/audit/generator/AbstractDataGenerator.java | 2 +- .../generator/AuthenticatedPersonDataGenerator.java | 2 +- .../repo/audit/model/AuditModelRegistryImpl.java | 2 +- .../repo/avm/VersionLayeredNodeEntryImpl.java | 2 +- .../repo/avm/locking/AVMLockingServiceImpl.java | 2 +- .../repo/cache/EhCacheManagerFactoryBean.java | 2 +- .../java/org/alfresco/repo/content/MimetypeMap.java | 2 +- .../repo/content/cleanup/ContentStoreCleaner.java | 2 +- .../content/cleanup/EagerContentStoreCleaner.java | 2 +- .../metadata/OpenOfficeMetadataExtracter.java | 2 +- .../metadata/xml/XPathMetadataExtracter.java | 2 +- .../content/metadata/xml/XmlMetadataExtracter.java | 2 +- .../RootElementNameContentWorkerSelector.java | 2 +- .../selector/XPathContentWorkerSelector.java | 2 +- .../OpenOfficeContentTransformerWorker.java | 2 +- .../RemoteOpenOfficeContentTransformer.java | 2 +- .../alfresco/repo/deploy/DeploymentServiceImpl.java | 2 +- source/java/org/alfresco/repo/dictionary/M2XML.java | 2 +- .../repo/dictionary/types/period/PeriodTest.java | 2 +- .../repo/domain/schema/SchemaBootstrap.java | 6 +++--- .../org/alfresco/repo/imap/ImapContentPolicy.java | 2 +- .../org/alfresco/repo/imap/ImapServiceImpl.java | 2 +- .../alfresco/repo/importer/ImporterBootstrap.java | 2 +- .../repo/invitation/InvitationServiceImpl.java | 2 +- .../repo/jgroups/AlfrescoJGroupsChannelFactory.java | 2 +- .../repo/module/AbstractModuleComponent.java | 2 +- .../repo/module/ImporterModuleComponent.java | 2 +- .../alfresco/repo/module/LoggerModuleComponent.java | 2 +- .../alfresco/repo/module/ModuleComponentHelper.java | 2 +- .../org/alfresco/repo/module/ModuleStarter.java | 2 +- source/java/org/alfresco/repo/node/NodeAuditor.java | 2 +- .../repo/node/NodeRefPropertyMethodInterceptor.java | 2 +- .../node/cleanup/AbstractNodeCleanupWorker.java | 2 +- .../repo/node/index/AbstractReindexComponent.java | 2 +- .../alfresco/repo/node/index/IndexRecoveryJob.java | 2 +- .../repo/node/integrity/IncompleteNodeTagger.java | 2 +- .../repo/node/integrity/IntegrityChecker.java | 2 +- .../repo/props/PropertyValueComponentImpl.java | 2 +- source/java/org/alfresco/repo/rule/RulesAspect.java | 2 +- .../search/impl/lucene/ADMLuceneIndexerImpl.java | 4 ++-- .../repo/search/impl/lucene/ADMLuceneTest.java | 13 ++----------- .../search/impl/lucene/AVMLuceneIndexerImpl.java | 4 ++-- .../repo/search/impl/lucene/LuceneQueryParser.java | 4 ++-- .../impl/lucene/analysis/DateTimeTokenFilter.java | 3 +-- .../impl/lucene/analysis/DateTokenFilter.java | 2 +- .../TenantAwareUserNameGenerator.java | 2 +- .../dynamic/LockOwnerDynamicAuthority.java | 2 +- .../permissions/impl/PermissionServiceImpl.java | 2 +- .../security/person/AbstractHomeFolderProvider.java | 2 +- .../repo/security/person/PersonServiceImpl.java | 2 +- .../org/alfresco/repo/site/SiteAVMBootstrap.java | 2 +- .../org/alfresco/repo/site/SiteServiceImpl.java | 2 +- .../repo/tenant/MultiTAdminServiceImpl.java | 2 +- .../alfresco/repo/tenant/MultiTenantBootstrap.java | 2 +- .../org/alfresco/repo/tenant/TenantInterpreter.java | 2 +- .../repo/transfer/RepoTransferReceiverImpl.java | 2 +- .../alfresco/repo/transfer/TransferServiceImpl.java | 2 +- .../repo/transfer/report/TransferReporterImpl.java | 2 +- .../VersionServiceVersionLabelRegistrationBean.java | 2 +- .../service/cmr/repository/datatype/Duration.java | 2 +- .../alfresco/util/OpenOfficeConnectionTester.java | 2 +- .../util/config/RepositoryFolderConfigBean.java | 2 +- .../util/config/RepositoryPathConfigBean.java | 2 +- .../wcm/preview/PreviewURIServiceRegistryImpl.java | 2 +- 78 files changed, 84 insertions(+), 94 deletions(-) diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java index 5434152287..261d1fe58e 100644 --- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java +++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java @@ -83,7 +83,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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.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 7941763735..e0d9074e71 100644 --- a/source/java/org/alfresco/cmis/search/QueryTest.java +++ b/source/java/org/alfresco/cmis/search/QueryTest.java @@ -78,7 +78,7 @@ import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.RecognitionException; import org.antlr.runtime.tree.CommonTree; -import org.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; import org.springframework.extensions.surf.util.I18NUtil; /** diff --git a/source/java/org/alfresco/email/server/EmailServer.java b/source/java/org/alfresco/email/server/EmailServer.java index ca1024ff62..6c0832196b 100644 --- a/source/java/org/alfresco/email/server/EmailServer.java +++ b/source/java/org/alfresco/email/server/EmailServer.java @@ -27,7 +27,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.email.EmailMessageException; import org.alfresco.service.cmr.email.EmailService; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/repo/action/ActionServiceImpl.java b/source/java/org/alfresco/repo/action/ActionServiceImpl.java index 4c39ab60fc..e069e47127 100644 --- a/source/java/org/alfresco/repo/action/ActionServiceImpl.java +++ b/source/java/org/alfresco/repo/action/ActionServiceImpl.java @@ -65,7 +65,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Action service implementation diff --git a/source/java/org/alfresco/repo/action/ActionsAspect.java b/source/java/org/alfresco/repo/action/ActionsAspect.java index 87e701a0fe..6c6ccd4f3a 100644 --- a/source/java/org/alfresco/repo/action/ActionsAspect.java +++ b/source/java/org/alfresco/repo/action/ActionsAspect.java @@ -34,7 +34,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Class containing behaviour for the actions aspect diff --git a/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java b/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java index 6cf5d0dcf9..cb986d412e 100644 --- a/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java +++ b/source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java @@ -21,7 +21,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/cleanup/FeedCleaner.java b/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java index fb72afe01a..a7efe3b4ea 100644 --- a/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java +++ b/source/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java @@ -24,7 +24,7 @@ import java.util.List; import org.alfresco.repo.domain.activities.ActivityFeedDAO; import org.alfresco.repo.domain.activities.ActivityFeedEntity; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 caf570eb76..4eb70bf176 100644 --- a/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java +++ b/source/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java @@ -24,7 +24,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 42945e0fd1..f32e965a74 100644 --- a/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java +++ b/source/java/org/alfresco/repo/activities/post/lookup/PostLookup.java @@ -37,7 +37,7 @@ 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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/patch/impl/ContentUrlConverterPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java index fe81e05e1d..b043a38860 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java @@ -60,7 +60,7 @@ import org.quartz.JobExecutionException; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.util.Pair; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Component to migrate old-style content URL storage (contentUrl=store://...|mimetype=...) diff --git a/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java b/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java index 90574d988b..e24c7ac82c 100644 --- a/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java +++ b/source/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java @@ -41,7 +41,7 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.EqualsHelper; import org.alfresco.util.Pair; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/audit/extractor/AbstractDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java index 79da7b1dca..374c2a75e2 100644 --- a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java @@ -18,7 +18,7 @@ */ package org.alfresco.repo.audit.extractor; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 7f17dc820c..afb4416d75 100644 --- a/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java @@ -23,7 +23,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 0a49581129..719d32193b 100644 --- a/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java @@ -23,7 +23,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 83107c5caa..d8cc2cc17e 100644 --- a/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java +++ b/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java @@ -18,7 +18,7 @@ */ package org.alfresco.repo.audit.generator; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 5a9f4194d4..fd12e82db2 100644 --- a/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java +++ b/source/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java @@ -25,7 +25,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Gives back the full name (person details) of the currently-authenticated user. diff --git a/source/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java b/source/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java index 587c03f466..1d065da004 100644 --- a/source/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java +++ b/source/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java @@ -62,7 +62,7 @@ import org.alfresco.util.registry.NamedObjectRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.springframework.util.ResourceUtils; import org.xml.sax.SAXParseException; diff --git a/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java b/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java index 11dd8cab83..5b6a8d58ed 100644 --- a/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java +++ b/source/java/org/alfresco/repo/avm/VersionLayeredNodeEntryImpl.java @@ -21,7 +21,7 @@ package org.alfresco.repo.avm; import java.io.Serializable; -import org.springframework.extensions.surf.util.MD5; +import org.alfresco.util.MD5; /** * Implementation of entry for tracking layered nodes which were diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java index 417da2057d..e18e12897c 100644 --- a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java +++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceImpl.java @@ -44,7 +44,7 @@ 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.springframework.extensions.surf.util.MD5; +import org.alfresco.util.MD5; import org.alfresco.util.Pair; 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 3b44934227..43009ffe49 100644 --- a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java +++ b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java @@ -25,7 +25,7 @@ import net.sf.ehcache.CacheException; import net.sf.ehcache.CacheManager; import org.alfresco.error.AlfrescoRuntimeException; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; 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 a1df400a18..818f904ae9 100644 --- a/source/java/org/alfresco/repo/content/MimetypeMap.java +++ b/source/java/org/alfresco/repo/content/MimetypeMap.java @@ -33,7 +33,7 @@ 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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java index 42962bee65..6aa22d39de 100644 --- a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java +++ b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java @@ -38,7 +38,7 @@ import org.alfresco.util.VmShutdownListener.VmShutdownException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.alfresco.util.Pair; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * This component is responsible cleaning up orphaned content. diff --git a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java index 62999de22a..6c2fdd1521 100644 --- a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java +++ b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java @@ -29,7 +29,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; 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 9d78f02e23..0875071f95 100644 --- a/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java @@ -25,7 +25,7 @@ import java.util.Map; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.ContentReader; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 2d896d946f..d74d0a6e3d 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java @@ -47,7 +47,7 @@ import org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.namespace.QName; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 8bf5ba48cd..1e371bfac8 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java @@ -35,7 +35,7 @@ import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * A metadata extractor that selects an appropiate workder for the extraction. diff --git a/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java b/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java index 8ba13dd724..ab530ce88d 100644 --- a/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java +++ b/source/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java @@ -31,7 +31,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 c8b2e96e1a..b635ea2ff6 100644 --- a/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java +++ b/source/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java @@ -35,7 +35,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/OpenOfficeContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java index 7e54998324..f8eb99adbe 100644 --- a/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java +++ b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java @@ -38,7 +38,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 4373fa191c..a631014089 100644 --- a/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/RemoteOpenOfficeContentTransformer.java @@ -38,7 +38,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.alfresco.util.TempFileProvider; import org.springframework.core.io.DefaultResourceLoader; diff --git a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java index 3bb63503ed..f680e56e48 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java @@ -83,7 +83,7 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.NameMatcher; import org.alfresco.util.Pair; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/dictionary/M2XML.java b/source/java/org/alfresco/repo/dictionary/M2XML.java index 2d3c0183be..c2b2364ccf 100644 --- a/source/java/org/alfresco/repo/dictionary/M2XML.java +++ b/source/java/org/alfresco/repo/dictionary/M2XML.java @@ -22,7 +22,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; /** 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 06ef00efae..08a16faccf 100644 --- a/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java +++ b/source/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java @@ -29,7 +29,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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; /** * Tests for period implementations - persistence and search is tested elsewhere diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index 4e26e16198..c9ed26a170 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Properties; import org.alfresco.error.AlfrescoRuntimeException; -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; @@ -51,9 +50,8 @@ 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.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.ApplicationContextHelper; -import org.springframework.extensions.surf.util.LogUtil; +import org.alfresco.util.LogUtil; import org.alfresco.util.TempFileProvider; import org.alfresco.util.schemadump.Main; import org.apache.commons.logging.Log; @@ -84,6 +82,8 @@ import org.springframework.context.ApplicationEvent; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.I18NUtil; import org.springframework.orm.hibernate3.LocalSessionFactoryBean; /** diff --git a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java index b44374b340..6256b2b0e1 100644 --- a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java +++ b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java @@ -27,7 +27,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 514d65f524..59dee9c4d4 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -56,7 +56,7 @@ import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java index 094143cb29..1a318166d9 100644 --- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java +++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java @@ -52,7 +52,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index d92cfe84fc..7770a6177c 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -67,7 +67,7 @@ import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Implementation of invitation service. diff --git a/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java b/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java index b270861b09..086096d04c 100644 --- a/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java +++ b/source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java @@ -32,7 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import org.alfresco.error.AlfrescoRuntimeException; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/module/AbstractModuleComponent.java b/source/java/org/alfresco/repo/module/AbstractModuleComponent.java index 20da7dbcba..acdda771be 100644 --- a/source/java/org/alfresco/repo/module/AbstractModuleComponent.java +++ b/source/java/org/alfresco/repo/module/AbstractModuleComponent.java @@ -30,7 +30,7 @@ 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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 7f3192c9dc..375b86ebe7 100644 --- a/source/java/org/alfresco/repo/module/ImporterModuleComponent.java +++ b/source/java/org/alfresco/repo/module/ImporterModuleComponent.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.repo.importer.ImporterBootstrap; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** diff --git a/source/java/org/alfresco/repo/module/LoggerModuleComponent.java b/source/java/org/alfresco/repo/module/LoggerModuleComponent.java index b35511bd0d..76ca760031 100644 --- a/source/java/org/alfresco/repo/module/LoggerModuleComponent.java +++ b/source/java/org/alfresco/repo/module/LoggerModuleComponent.java @@ -18,7 +18,7 @@ */ package org.alfresco.repo.module; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 afb1a634ad..af16e58a17 100644 --- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java +++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java @@ -43,7 +43,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/ModuleStarter.java b/source/java/org/alfresco/repo/module/ModuleStarter.java index 4393aadf55..ec685ae031 100644 --- a/source/java/org/alfresco/repo/module/ModuleStarter.java +++ b/source/java/org/alfresco/repo/module/ModuleStarter.java @@ -22,7 +22,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.transaction.TransactionService; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.springframework.context.ApplicationEvent; /** diff --git a/source/java/org/alfresco/repo/node/NodeAuditor.java b/source/java/org/alfresco/repo/node/NodeAuditor.java index d2860b1ae0..3457d46691 100644 --- a/source/java/org/alfresco/repo/node/NodeAuditor.java +++ b/source/java/org/alfresco/repo/node/NodeAuditor.java @@ -31,7 +31,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * A listener that ensures that an event is audited for every deleted node in a tree of nodes, not just the top one diff --git a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java index 7f338e5b88..229f7922ca 100644 --- a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java +++ b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java @@ -34,7 +34,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 b9821eb0f6..7cfa3c0468 100644 --- a/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java +++ b/source/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java @@ -29,7 +29,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java index fbcbb0d21a..4400bcb9bd 100644 --- a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java +++ b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java @@ -53,7 +53,7 @@ import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/IndexRecoveryJob.java b/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java index 35e556a132..b0f6b9d8d9 100644 --- a/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java +++ b/source/java/org/alfresco/repo/node/index/IndexRecoveryJob.java @@ -18,7 +18,7 @@ */ package org.alfresco.repo.node.index; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; diff --git a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java index 84d7704689..d84aab030c 100644 --- a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java +++ b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java @@ -48,7 +48,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 40e834cbc6..ba05e04c9e 100644 --- a/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java +++ b/source/java/org/alfresco/repo/node/integrity/IntegrityChecker.java @@ -42,7 +42,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; 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 e63b273063..7d16c0a161 100644 --- a/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java +++ b/source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java @@ -22,7 +22,7 @@ import java.io.Serializable; import org.alfresco.repo.domain.propval.PropertyValueDAO; import org.alfresco.util.Pair; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/rule/RulesAspect.java b/source/java/org/alfresco/repo/rule/RulesAspect.java index 3ea5bef640..c2822ebb33 100644 --- a/source/java/org/alfresco/repo/rule/RulesAspect.java +++ b/source/java/org/alfresco/repo/rule/RulesAspect.java @@ -34,7 +34,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Class containing behaviour for the rules aspect 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 6ccf718dbf..9f85a1a9be 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneIndexerImpl.java @@ -39,7 +39,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -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; @@ -73,7 +72,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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; import org.alfresco.util.EqualsHelper; import org.alfresco.util.ISO9075; import org.apache.commons.logging.Log; @@ -91,6 +90,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.BooleanClause.Occur; +import org.springframework.extensions.surf.util.I18NUtil; /** * The implementation of the lucene based indexer. Supports basic transactional behaviour if used on its own. 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 ffc30f01b0..2a1c3e073b 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java @@ -37,19 +37,11 @@ import java.util.Locale; import java.util.Map; import java.util.Random; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.RollbackException; import javax.transaction.Status; -import javax.transaction.SystemException; import javax.transaction.UserTransaction; import junit.framework.TestCase; -import org.alfresco.cmis.CMISQueryOptions; -import org.alfresco.cmis.CMISResultSet; -import org.alfresco.cmis.CMISResultSetRow; -import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.DictionaryListener; @@ -101,13 +93,12 @@ 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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; import org.alfresco.util.ISO9075; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; import org.springframework.context.ApplicationContext; +import org.springframework.extensions.surf.util.I18NUtil; /** * @author andyh 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 cd90f0bda2..bb56753207 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java @@ -35,7 +35,6 @@ import java.util.Locale; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.model.WCMModel; import org.alfresco.repo.avm.AVMDAOs; @@ -77,7 +76,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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; import org.alfresco.util.EqualsHelper; import org.alfresco.util.GUID; import org.alfresco.util.ISO9075; @@ -94,6 +93,7 @@ import org.apache.lucene.index.TermEnum; import org.apache.lucene.search.Hits; import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Searcher; +import org.springframework.extensions.surf.util.I18NUtil; /** * Update the index after a snap shot to an AVM store. (Revert is dealt with as a new snap shot is created) 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 7911596901..40a00dc306 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneQueryParser.java @@ -33,7 +33,6 @@ import java.util.Locale; import java.util.Set; import org.alfresco.error.AlfrescoRuntimeException; -import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.IndexTokenisationMode; import org.alfresco.repo.search.MLAnalysisMode; @@ -55,7 +54,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.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; import org.alfresco.util.SearchLanguageConversion; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -82,6 +81,7 @@ import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.saxpath.SAXPathException; +import org.springframework.extensions.surf.util.I18NUtil; import com.werken.saxpath.XPathReader; 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 46609a16c3..eea62d712f 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 @@ -21,13 +21,12 @@ package org.alfresco.repo.search.impl.lucene.analysis; import java.io.IOException; import java.io.Reader; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.Iterator; -import org.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.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 23eee90b2f..13caa6ae13 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 @@ -25,7 +25,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import org.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.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/security/authentication/TenantAwareUserNameGenerator.java b/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java index 7324f1373c..369e4ac58a 100644 --- a/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java +++ b/source/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java @@ -19,7 +19,7 @@ package org.alfresco.repo.security.authentication; import org.alfresco.repo.tenant.TenantService; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.apache.commons.lang.RandomStringUtils; /** diff --git a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java index 1910473d0e..eb495d0591 100644 --- a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java +++ b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java @@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.PermissionService; import org.springframework.context.ApplicationEvent; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * LockOwnerDynamicAuthority 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 bc50c5f946..6499eff270 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java @@ -67,7 +67,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEvent; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * The Alfresco implementation of a permissions service against our APIs for the permissions model and permissions diff --git a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java index baf278b956..e127e5c735 100644 --- a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java +++ b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java @@ -30,7 +30,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java index aebdc6c25a..54c8e8b8db 100644 --- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java +++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java @@ -71,7 +71,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java b/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java index aff58ca62c..a6e1d3f865 100644 --- a/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java +++ b/source/java/org/alfresco/repo/site/SiteAVMBootstrap.java @@ -28,7 +28,7 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 b7485a66c1..28ac8355bb 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -76,7 +76,7 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONException; import org.json.JSONObject; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Site Service Implementation. Also bootstraps the site AVM and DM stores. diff --git a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java index 83e09cf1c8..70ece5fb25 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java @@ -58,7 +58,7 @@ import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.transaction.TransactionService; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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/MultiTenantBootstrap.java b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java index 34475c5a77..c27b04ecc7 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java +++ b/source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java @@ -19,7 +19,7 @@ package org.alfresco.repo.tenant; import org.springframework.extensions.surf.util.AbstractLifecycleBean; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 12111b677a..63d5bf89c5 100644 --- a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java +++ b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java @@ -39,7 +39,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.io.ClassPathResource; import org.springframework.extensions.surf.util.I18NUtil; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * An interactive console for Tenants. diff --git a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java index 0ac9d5af73..c2335e021e 100644 --- a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java +++ b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java @@ -61,7 +61,7 @@ import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.springframework.util.FileCopyUtils; /** diff --git a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java index f21adf8eb8..6a3b6695d0 100644 --- a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java +++ b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java @@ -75,7 +75,7 @@ import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; public class TransferServiceImpl implements TransferService diff --git a/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java b/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java index bb3988b5b4..85a05d034e 100644 --- a/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java +++ b/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java @@ -53,7 +53,7 @@ import org.alfresco.service.cmr.transfer.TransferEvent; import org.alfresco.service.cmr.transfer.TransferTarget; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.xml.sax.SAXException; /** diff --git a/source/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java b/source/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java index d7f82ecba1..974925d14d 100644 --- a/source/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java +++ b/source/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java @@ -22,7 +22,7 @@ import org.alfresco.repo.version.VersionServicePolicies.CalculateVersionLabelPol import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.namespace.NamespacePrefixResolver; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Utility class to register a version label policy version service. 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 ea18d2fcba..3ab367d4b6 100644 --- a/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java +++ b/source/java/org/alfresco/service/cmr/repository/datatype/Duration.java @@ -29,7 +29,7 @@ import java.text.ParsePosition; import java.util.Calendar; import java.util.Date; -import org.springframework.extensions.surf.util.CachingDateFormat; +import org.alfresco.util.CachingDateFormat; /** * This data type represents duration/interval/period as defined by the XMLSchema type diff --git a/source/java/org/alfresco/util/OpenOfficeConnectionTester.java b/source/java/org/alfresco/util/OpenOfficeConnectionTester.java index 7c1b2b5a1c..fde17d0495 100644 --- a/source/java/org/alfresco/util/OpenOfficeConnectionTester.java +++ b/source/java/org/alfresco/util/OpenOfficeConnectionTester.java @@ -38,7 +38,7 @@ 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 org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import com.sun.star.registry.RegistryValueType; import com.sun.star.registry.XRegistryKey; diff --git a/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java b/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java index d896ade20e..8f436c30ef 100644 --- a/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java +++ b/source/java/org/alfresco/util/config/RepositoryFolderConfigBean.java @@ -33,7 +33,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.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.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 f1d09d5ac1..75f49e3b0e 100644 --- a/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java +++ b/source/java/org/alfresco/util/config/RepositoryPathConfigBean.java @@ -26,7 +26,7 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.namespace.NamespaceService; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; /** * Composite property bean to identify a repository path. diff --git a/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java b/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java index 6bca6d710b..082759835a 100644 --- a/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java +++ b/source/java/org/alfresco/wcm/preview/PreviewURIServiceRegistryImpl.java @@ -21,7 +21,7 @@ package org.alfresco.wcm.preview; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; -import org.springframework.extensions.surf.util.PropertyCheck; +import org.alfresco.util.PropertyCheck; import org.springframework.beans.factory.InitializingBean;