From b3a235b6eb9e653d761bd12637393496c1e3c68f Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 19 Dec 2006 16:28:32 +0000
Subject: [PATCH] Merge 1.4 to HEAD    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
---
 .../extension/custom-hibernate-dialect.properties.sample  | 8 +++++++-
 .../java/org/alfresco/repo/domain/hibernate/Node.hbm.xml  | 2 +-
 .../org/alfresco/repo/jscript/CategoryTemplateNode.java   | 2 ++
 .../org/alfresco/repo/template/FreeMarkerProcessor.java   | 2 --
 .../alfresco/repo/template/TemplateServiceImplTest.java   | 1 +
 .../org/alfresco/service/cmr/repository/TemplateNode.java | 8 ++++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/extension/custom-hibernate-dialect.properties.sample b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
index 0a2e9f1d62..062409faf6 100644
--- a/config/alfresco/extension/custom-hibernate-dialect.properties.sample
+++ b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
@@ -26,4 +26,10 @@
 #
 # SQLServer dialect
 #
-#hibernate.dialect=org.hibernate.dialect.SQLServerDialect
\ No newline at end of file
+#hibernate.dialect=org.hibernate.dialect.SQLServerDialect
+
+#
+# PostgreSQL dialect
+#
+#org.hibernate.dialect.PostgreSQLDialect
+#hibernate.query.substitutions=true TRUE, false FALSE
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
index ac921c7d7e..cf0a22b2fa 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
@@ -240,7 +240,7 @@
                join assoc.child as child
             where
                assoc.parent.id = :parentId and
-               assoc.isPrimary = 1
+               assoc.isPrimary = true
          )
    </query>
    
diff --git a/source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java b/source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
index 2db629bcc2..5f0efa84df 100644
--- a/source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
+++ b/source/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
@@ -35,6 +35,8 @@ import org.alfresco.service.namespace.QName;
  */
 public class CategoryTemplateNode extends TemplateNode
 {
+    private static final long serialVersionUID = -2595282439089450151L;
+
     /**
      * Constructor
      * 
diff --git a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
index 269b76850a..8b90581768 100644
--- a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
+++ b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
@@ -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;
diff --git a/source/java/org/alfresco/repo/template/TemplateServiceImplTest.java b/source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
index ec73841c36..1880a39162 100644
--- a/source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
+++ b/source/java/org/alfresco/repo/template/TemplateServiceImplTest.java
@@ -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());
diff --git a/source/java/org/alfresco/service/cmr/repository/TemplateNode.java b/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
index bd3ce6bea0..e225972963 100644
--- a/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
+++ b/source/java/org/alfresco/service/cmr/repository/TemplateNode.java
@@ -133,6 +133,14 @@ public class TemplateNode implements Serializable
     // ------------------------------------------------------------------------------
     // Node API
     
+    /**
+     * Gets the image resolver
+     */
+    public TemplateImageResolver getImageResolver()
+    {
+        return imageResolver;
+    }
+    
     /**
      * @return The GUID for the node
      */