Merged 1.4 to HEAD (Repo and other pieces for support of Records Management)

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4617 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4617 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4617 .
   svn revert common.properties
   Manually carried common.properties file changes over


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java

@@ -104,7 +104,7 @@ public class FreeMarkerWithLuceneExtensionsModelFactory implements TemplateActio
     {
         Map<String, Object> model = getModel();
 
-        TemplateNode companyRootNode = new TemplateNode(nodeRef, serviceRegistry);
+        TemplateNode companyRootNode = new TemplateNode(nodeRef, serviceRegistry, null);
         model.put("node", companyRootNode);
 
         return model;

source/java/org/alfresco/repo/template/DateCompareMethod.java

@@ -19,7 +19,6 @@ package org.alfresco.repo.template;
 import java.util.Date;
 import java.util.List;
 
-import freemarker.ext.beans.BeanModel;
 import freemarker.template.TemplateDateModel;
 import freemarker.template.TemplateMethodModelEx;
 import freemarker.template.TemplateModelException;

source/java/org/alfresco/repo/template/DateIncrementMethod.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.template;
+
+import java.util.Date;
+import java.util.List;
+
+import freemarker.template.TemplateDateModel;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModelException;
+import freemarker.template.TemplateNumberModel;
+
+/**
+ * @author Roy Wetherall
+ * 
+ 
+ */
+public final class DateIncrementMethod implements TemplateMethodModelEx
+{
+    /**
+     * @see freemarker.template.TemplateMethodModel#exec(java.util.List)
+     */
+    public Object exec(List args) throws TemplateModelException
+    {
+        Date result = null;
+        
+        if (args.size() == 2)
+        {
+            Object arg0 = args.get(0);
+            Object arg1 = args.get(1);
+            
+            if (arg0 instanceof TemplateDateModel && arg1 instanceof TemplateNumberModel)
+            {
+                Date origionalDate = (Date)((TemplateDateModel)arg0).getAsDate();
+                Number number = ((TemplateNumberModel)arg1).getAsNumber();
+                long increment = number.longValue();
+            
+                long modified = origionalDate.getTime() + increment;
+                result = new Date(modified);
+            }
+        }
+        
+        return result;
+    }
+}

source/java/org/alfresco/repo/template/FreeMarkerProcessor.java

@@ -337,6 +337,7 @@ public class FreeMarkerProcessor implements TemplateProcessor
         model.put("hasAspect", new HasAspectMethod());
         model.put("message", new I18NMessageMethod());
         model.put("dateCompare", new DateCompareMethod());
+        model.put("incrementDate", new DateIncrementMethod());
         
         return model;
     }