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
2025-08-21 18:09:20 +00:00 · 2009-12-14 13:41:05 +00:00
parent 8eb5174ad5
commit 6914366269
18 changed files with 30 additions and 29 deletions
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;


 /**
--- 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)
--- 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;
--- 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;
--- 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;
--- 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;