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

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>
    

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
      * 

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;

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());