From e1e68fc7e931acf20b286758b22ba19a986e4a70 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Tue, 10 Mar 2009 14:55:21 +0000
Subject: [PATCH] Merged V3.1 to HEAD    12911: Fix for Share calendar toolbar
 after regression from site membership refactoring    12940: Refactoring of
 the Repository ScriptService to support compilation of Rhino JavaScript (from
 iDay work).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/web/scripts/RepoStore.java  | 11 +++++++--
 .../scripts/RepositoryScriptProcessor.java    | 24 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/RepoStore.java b/source/java/org/alfresco/repo/web/scripts/RepoStore.java
index cd487ba2e6..cd416d6049 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepoStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepoStore.java
@@ -946,7 +946,15 @@ public class RepoStore implements Store, TenantDeployer
 		{
 		    return "/" + path + " (in repository store " + repoStore.toString() + getBaseDir() + ")";
 		}
-
+		
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.ScriptContent#isCachable()
+         */
+        public boolean isCachable()
+        {
+            return false;
+        }
+        
         /* (non-Javadoc)
          * @see org.alfresco.web.scripts.ScriptContent#isSecure()
          */
@@ -955,5 +963,4 @@ public class RepoStore implements Store, TenantDeployer
             return false;
         }
     }
-
 }
diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java b/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
index 24e4a5d667..93bfe5807c 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
@@ -57,7 +57,7 @@ public class RepositoryScriptProcessor implements ScriptProcessor
     protected SearchPath searchPath;
 
     // Javascript Converter
-    private ValueConverter valueConverter = new ValueConverter();
+    private final ValueConverter valueConverter = new ValueConverter();
 
     
     /**
@@ -122,6 +122,7 @@ public class RepositoryScriptProcessor implements ScriptProcessor
     public void reset()
     {
         init();
+        this.scriptService.resetScriptProcessors();
     }
     
     /**
@@ -171,6 +172,14 @@ public class RepositoryScriptProcessor implements ScriptProcessor
             return content.getReader();
         }
         
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#isCachable()
+         */
+        public boolean isCachable()
+        {
+            return content.isCachable();
+        }
+        
         /* (non-Javadoc)
          * @see org.alfresco.service.cmr.repository.ScriptLocation#isSecure()
          */
@@ -178,12 +187,19 @@ public class RepositoryScriptProcessor implements ScriptProcessor
         {
             return content.isSecure();
         }
-
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getPath()
+         */
+        public String getPath()
+        {
+            return content.getPath();
+        }
+        
         @Override
         public String toString()
         {
         	return content.getPathDescription();
         }
     }
-
-}
+}
\ No newline at end of file