From 6914366269365a1f2fa18ae2c77c043bf42e1da0 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/web-scripts-application-context.xml | 4 ++-- .../java/org/alfresco/repo/cmis/rest/CMISQueryReader.java | 2 +- .../alfresco/repo/cmis/ws/DMNavigationServicePort.java | 2 +- .../org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java | 2 +- .../alfresco/repo/web/scripts/RepositoryContainer.java | 2 +- .../repo/web/scripts/RepositoryTemplateProcessor.java | 2 +- .../web/scripts/activities/SiteActivitySystemTest.java | 3 ++- .../org/alfresco/repo/web/scripts/bean/KeywordSearch.java | 6 +++--- .../org/alfresco/repo/web/scripts/bean/LoginPost.java | 2 +- .../org/alfresco/repo/web/scripts/bean/SearchEngines.java | 6 +++--- .../org/alfresco/repo/web/scripts/bean/SearchProxy.java | 4 ++-- .../repo/web/scripts/config/OpenSearchConfigElement.java | 6 +++--- .../repo/web/scripts/config/OpenSearchElementReader.java | 8 ++++---- .../repo/web/scripts/invite/InviteServiceTest.java | 2 +- .../repo/web/scripts/person/ChangePasswordPost.java | 2 +- .../scripts/servlet/BasicHttpAuthenticatorFactory.java | 2 +- .../repo/web/scripts/wcm/sandbox/SandboxTest.java | 2 +- source/java/org/alfresco/repo/webdav/GetMethod.java | 2 +- 18 files changed, 30 insertions(+), 29 deletions(-) diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index 735282f07f..0844450b77 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -8,7 +8,7 @@ - + classpath:alfresco/web-scripts-config.xml @@ -18,7 +18,7 @@ - + diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java index a98ee3e458..8b0a8d6bca 100644 --- a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java +++ b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java @@ -33,7 +33,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.alfresco.util.Content; +import org.springframework.extensions.surf.util.Content; import org.alfresco.web.scripts.FormatReader; import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.WebScriptRequest; diff --git a/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java index 9fa7f2e939..ec2fe05f45 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java @@ -39,7 +39,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.web.util.paging.Cursor; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.Pair; +import org.springframework.extensions.surf.util.Pair; /** * Port for navigation service diff --git a/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java b/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java index 134218fcee..7d2f8e2489 100755 --- a/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java +++ b/source/java/org/alfresco/repo/cmis/ws/utils/CmisObjectsUtils.java @@ -64,7 +64,7 @@ import org.alfresco.service.cmr.version.VersionType; 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; /** * @author Dmitry Velichkevich diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java index c2f628c570..33548d224a 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java @@ -50,7 +50,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.TemplateService; import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.descriptor.DescriptorService; -import org.alfresco.util.StringBuilderWriter; +import org.springframework.extensions.surf.util.StringBuilderWriter; import org.alfresco.web.scripts.AbstractRuntimeContainer; import org.alfresco.web.scripts.Authenticator; import org.alfresco.web.scripts.Cache; diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java index 0b20e93095..2a69086c8d 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java @@ -32,7 +32,7 @@ import java.util.List; import org.alfresco.processor.ProcessorExtension; import org.alfresco.repo.template.FreeMarkerProcessor; import org.alfresco.repo.template.QNameAwareObjectWrapper; -import org.alfresco.util.AbstractLifecycleBean; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.web.scripts.SearchPath; import org.alfresco.web.scripts.Store; import org.alfresco.web.scripts.TemplateProcessor; diff --git a/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java b/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java index 0cdf3ee608..67e3fce926 100644 --- a/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java +++ b/source/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java @@ -39,7 +39,8 @@ import junit.framework.TestCase; import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.web.scripts.activities.feed.UserFeedRetrieverWebScript; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONArray; diff --git a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java index 44cdaab0fb..f9c3a6ce66 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.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.repo.template.TemplateNode; import org.alfresco.repo.web.scripts.RepositoryImageResolver; import org.alfresco.service.ServiceRegistry; @@ -42,8 +42,8 @@ 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.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.alfresco.web.scripts.DeclarativeWebScript; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.WebScriptException; diff --git a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java index d9336235e8..404f42bb94 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/LoginPost.java @@ -31,7 +31,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.alfresco.repo.security.authentication.AuthenticationException; -import org.alfresco.util.Content; +import org.springframework.extensions.surf.util.Content; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.WebScriptRequest; diff --git a/source/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java b/source/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java index da106b1517..943038aaec 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java @@ -29,9 +29,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.alfresco.config.Config; -import org.alfresco.config.ConfigService; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.config.Config; +import org.springframework.extensions.config.ConfigService; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement; import org.alfresco.web.scripts.DeclarativeWebScript; diff --git a/source/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java b/source/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java index 1b6976c6f5..3c9e83cfcd 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java @@ -35,8 +35,8 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.alfresco.config.Config; -import org.alfresco.config.ConfigService; +import org.springframework.extensions.config.Config; +import org.springframework.extensions.config.ConfigService; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.EngineConfig; diff --git a/source/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java b/source/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java index 1fe73ebf24..cb8a6539de 100644 --- a/source/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java +++ b/source/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigException; -import org.alfresco.config.element.ConfigElementAdapter; +import org.springframework.extensions.config.ConfigElement; +import org.springframework.extensions.config.ConfigException; +import org.springframework.extensions.config.element.ConfigElementAdapter; /** diff --git a/source/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java b/source/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java index 2d52551990..5b0885ce8f 100644 --- a/source/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java +++ b/source/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java @@ -26,9 +26,9 @@ package org.alfresco.repo.web.scripts.config; import java.util.Iterator; -import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigException; -import org.alfresco.config.xml.elementreader.ConfigElementReader; +import org.springframework.extensions.config.ConfigElement; +import org.springframework.extensions.config.ConfigException; +import org.springframework.extensions.config.xml.elementreader.ConfigElementReader; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.EngineConfig; import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.ProxyConfig; import org.dom4j.Element; @@ -53,7 +53,7 @@ public class OpenSearchElementReader implements ConfigElementReader /** - * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element) + * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element) */ @SuppressWarnings("unchecked") public ConfigElement parse(Element element) diff --git a/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java index 7e574c75ff..9c4b0dc433 100644 --- a/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java +++ b/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java @@ -56,7 +56,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; -import org.alfresco.util.URLEncoder; +import org.springframework.extensions.surf.util.URLEncoder; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.TestWebScriptServer.GetRequest; import org.alfresco.web.scripts.TestWebScriptServer.PutRequest; diff --git a/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java b/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java index 6261663a10..0f7c9125e6 100644 --- a/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java +++ b/source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java @@ -31,7 +31,7 @@ import java.util.Map; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthorityService; -import org.alfresco.util.Content; +import org.springframework.extensions.surf.util.Content; import org.alfresco.web.scripts.DeclarativeWebScript; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.WebScriptException; diff --git a/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java index 8d08de044d..cdaf09eb93 100644 --- a/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.service.cmr.security.AuthenticationService; -import org.alfresco.util.Base64; +import org.springframework.extensions.surf.util.Base64; import org.alfresco.web.scripts.Authenticator; import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.Description.RequiredAuthentication; diff --git a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java index 979c21e1ba..053db98f64 100644 --- a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java +++ b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java @@ -35,7 +35,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.util.ISO8601DateFormat; +import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.util.PropertyMap; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest; diff --git a/source/java/org/alfresco/repo/webdav/GetMethod.java b/source/java/org/alfresco/repo/webdav/GetMethod.java index 903199cb13..f9ad8f6a18 100644 --- a/source/java/org/alfresco/repo/webdav/GetMethod.java +++ b/source/java/org/alfresco/repo/webdav/GetMethod.java @@ -35,7 +35,7 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletResponse; -import org.alfresco.i18n.I18NUtil; +import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo;