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 V2.1 to V2.0

Browse Source 
6435: AR-1644 Web Scripts do not provide any control over caching
   6469: Replaced EUPL licence with standard license header
   6526: AR-1685 Error creating workflow with no document associated
   6565: Fix for issue with file Upload in main web-client portlet for JBoss/Liferay portal integration.
   6578: AR-1620: Upgraded One-Jar to 0.96-RC4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-08-20 15:46:59 +00:00
parent 4ffc28f0bf
commit 4ba65b9950
16 changed files with 449 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java
View File

@@ -34,7 +34,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import org.alfresco.service.cmr.repository.FileTypeImageSize;
@@ -531,6 +530,34 @@ public class DeclarativeWebScriptRegistry extends AbstractLifecycleBean
}
}
// retrieve caching
WebScriptCache cache = new WebScriptCache();
Element cacheElement = rootElement.element("cache");
if (cacheElement != null)
{
Element neverElement = cacheElement.element("never");
if (neverElement != null)
{
String neverStr = neverElement.getTextTrim();
boolean neverBool = (neverStr == null || neverStr.length() == 0) ? true : Boolean.valueOf(neverStr);
cache.setNeverCache(neverBool);
}
Element publicElement = cacheElement.element("public");
if (publicElement != null)
{
String publicStr = publicElement.getTextTrim();
boolean publicBool = (publicStr == null || publicStr.length() == 0) ? true : Boolean.valueOf(publicStr);
cache.setIsPublic(publicBool);
}
Element revalidateElement = cacheElement.element("mustrevalidate");
if (revalidateElement != null)
{
String revalidateStr = revalidateElement.getTextTrim();
boolean revalidateBool = (revalidateStr == null || revalidateStr.length() == 0) ? true : Boolean.valueOf(revalidateStr);
cache.setMustRevalidate(revalidateBool);
}
}
// construct service description
WebScriptDescriptionImpl serviceDesc = new WebScriptDescriptionImpl();
serviceDesc.setStore(store);
@@ -541,6 +568,7 @@ public class DeclarativeWebScriptRegistry extends AbstractLifecycleBean
serviceDesc.setDescription(description);
serviceDesc.setRequiredAuthentication(reqAuth);
serviceDesc.setRequiredTransaction(reqTrx);
serviceDesc.setRequiredCache(cache);
serviceDesc.setMethod(method);
serviceDesc.setUris(uris.toArray(new String[uris.size()]));
serviceDesc.setDefaultFormat(defaultFormat);