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
This commit is contained in:
Kevin Roast
2009-03-10 14:55:21 +00:00
parent 292c0d92f2
commit 3b8d0f0fa4
6 changed files with 158 additions and 54 deletions

View File

@@ -37,12 +37,11 @@ import org.alfresco.util.ParameterCheck;
* Classpath script location object.
*
* @author Roy Wetherall
*
*/
public class ClasspathScriptLocation implements ScriptLocation
{
/** Classpath location **/
private String location;
private final String location;
/**
* Constructor
@@ -91,7 +90,20 @@ public class ClasspathScriptLocation implements ScriptLocation
return reader;
}
public boolean isSecure()
/**
* @see org.alfresco.service.cmr.repository.ScriptLocation#getPath()
*/
public String getPath()
{
return this.location;
}
public boolean isCachable()
{
return true;
}
public boolean isSecure()
{
return true;
}
@@ -108,7 +120,7 @@ public class ClasspathScriptLocation implements ScriptLocation
return false;
}
ClasspathScriptLocation other = (ClasspathScriptLocation)obj;
return this.location.equals(other.location);
return this.location.equals(other.location);
}
@Override