inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV/TEMPORARY to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2009-12-14 13:41:05 +00:00
parent eaacdeb2ed
commit b726c4d6db
470 changed files with 572 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/template/AVM.java
View File

@@ -31,7 +31,7 @@ import org.alfresco.config.JNDIConstants;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.util.ParameterCheck;
import org.springframework.extensions.surf.util.ParameterCheck;
import org.alfresco.wcm.asset.AssetInfo;
import org.alfresco.wcm.sandbox.SandboxService;
import org.alfresco.wcm.util.WCMUtil;

4
source/java/org/alfresco/repo/template/AVMTemplateNode.java
View File

@@ -55,8 +55,8 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNameMap;
import org.alfresco.util.Pair;
import org.alfresco.util.URLEncoder;
import org.springframework.extensions.surf.util.Pair;
import org.springframework.extensions.surf.util.URLEncoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.StringUtils;

2
source/java/org/alfresco/repo/template/BaseContentNode.java
View File

@@ -45,7 +45,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.FileTypeImageSize;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.URLEncoder;
import org.springframework.extensions.surf.util.URLEncoder;
/**
* Base class for Template API objects that supply content functionality.

2
source/java/org/alfresco/repo/template/I18NMessageMethod.java
View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.template;
import java.util.List;
import org.alfresco.i18n.I18NUtil;
import org.springframework.extensions.surf.util.I18NUtil;
import freemarker.template.TemplateDateModel;
import freemarker.template.TemplateMethodModelEx;

2
source/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.template;
import java.util.List;
import org.alfresco.util.ISO8601DateFormat;
import org.springframework.extensions.surf.util.ISO8601DateFormat;
import freemarker.template.TemplateDateModel;
import freemarker.template.TemplateMethodModelEx;

2
source/java/org/alfresco/repo/template/People.java
View File

@@ -39,7 +39,7 @@ import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.ParameterCheck;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
* People and users support in FreeMarker templates.

2
source/java/org/alfresco/repo/template/Site.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.util.ParameterCheck;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
* Site support in FreeMarker templates.

2
source/java/org/alfresco/repo/template/VersionHistoryNode.java
View File

@@ -41,7 +41,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNameMap;
import org.alfresco.util.URLEncoder;
import org.springframework.extensions.surf.util.URLEncoder;
/**
* Template Node wrapper representing a record in the version history of a node.

2
source/java/org/alfresco/repo/template/Workflow.java
View File

@@ -54,7 +54,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNameMap;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.Pair;
import org.springframework.extensions.surf.util.Pair;
/**
* Workflow and task support in FreeMarker templates.