inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
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 0ae263110a
commit e1e68fc7e9
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/web/scripts/RepoStore.java
View File

@@ -946,7 +946,15 @@ public class RepoStore implements Store, TenantDeployer
{ {
return "/" + path + " (in repository store " + repoStore.toString() + getBaseDir() + ")"; return "/" + path + " (in repository store " + repoStore.toString() + getBaseDir() + ")";
} }
/* (non-Javadoc)
* @see org.alfresco.web.scripts.ScriptContent#isCachable()
*/
public boolean isCachable()
{
return false;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.web.scripts.ScriptContent#isSecure() * @see org.alfresco.web.scripts.ScriptContent#isSecure()
*/ */
@@ -955,5 +963,4 @@ public class RepoStore implements Store, TenantDeployer
return false; return false;
} }
} }
} }

24
source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
View File

@@ -57,7 +57,7 @@ public class RepositoryScriptProcessor implements ScriptProcessor
protected SearchPath searchPath; protected SearchPath searchPath;
// Javascript Converter // 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() public void reset()
{ {
init(); init();
this.scriptService.resetScriptProcessors();
} }
/** /**
@@ -171,6 +172,14 @@ public class RepositoryScriptProcessor implements ScriptProcessor
return content.getReader(); return content.getReader();
} }
/* (non-Javadoc)
* @see org.alfresco.service.cmr.repository.ScriptLocation#isCachable()
*/
public boolean isCachable()
{
return content.isCachable();
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.service.cmr.repository.ScriptLocation#isSecure() * @see org.alfresco.service.cmr.repository.ScriptLocation#isSecure()
*/ */
@@ -178,12 +187,19 @@ public class RepositoryScriptProcessor implements ScriptProcessor
{ {
return content.isSecure(); return content.isSecure();
} }
/* (non-Javadoc)
* @see org.alfresco.service.cmr.repository.ScriptLocation#getPath()
*/
public String getPath()
{
return content.getPath();
}
@Override @Override
public String toString() public String toString()
{ {
return content.getPathDescription(); return content.getPathDescription();
} }
} }
}
}