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

Merge 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 .
   svn resolved root\projects\core\source\java\log4j.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
   svn resolved  root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 16:28:32 +00:00
parent 58ee1796a2
commit b3a235b6eb
6 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,6 @@ import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.service.cmr.repository.TemplateProcessor;
import org.apache.log4j.Logger;
import bsh.This;
import freemarker.cache.MruCacheStorage;
import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;

1
source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
View File

@@ -103,6 +103,7 @@ public class TemplateServiceImplTest extends TestCase
transactionService,
new TransactionUtil.TransactionWork<Object>()
{
@SuppressWarnings("unchecked")
public Object doWork() throws Exception
{
StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis());