Author: tdraier
Date: Fri Sep 14 13:36:59 2007
New Revision: 18491
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18491&repname=
=3Djahia
Log:
use operation mode instead of workflowstate (port 18359)
Modified:
trunk/core/src/java/org/jahia/services/cache/ContainerHTMLCache.java
trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java
trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java
Modified: trunk/core/src/java/org/jahia/services/cache/ContainerHTMLCache.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/cache/ContainerHTMLCache.java&rev=3D18491&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/cache/ContainerHTMLCache.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/cache/ContainerHTMLCache.java Fr=
i Sep 14 13:36:59 2007
@@ -47,7 +47,7 @@
* @param group
[EMAIL PROTECTED] user the user name
* @param languageCode the language code
- * @param workflowState the workflow state
+ * @param mode the workflow state
* @param scheme the request scheme (http/https)
* @return the generated cache key
*/
@@ -55,13 +55,13 @@
JahiaContainer container,
String group, JahiaUser user,
String languageCode,
- int workflowState,
+ String mode,
String scheme)
{
int id =3D container.getID();
String usercachekey =3D getUserCacheKey(user, container.getSiteID(=
));
=
- String key =3D getKey(id, workflowState, languageCode, usercacheke=
y, group, scheme);
+ String key =3D getKey(id, mode, languageCode, usercachekey, group,=
scheme);
=
return new GroupCacheKey(key, new HashSet());
}
@@ -70,27 +70,27 @@
JahiaContainer container,
String group, JahiaUser user,
String languageCode,
- int workflowState,
+ String mode,
String scheme, Set dependencies)
{
int id =3D container.getID();
ContentContainerKey containerkey =3D new ContentContainerKey(id);
String usercachekey =3D getUserCacheKey(user, container.getSiteID(=
));
=
- String key =3D getKey(id, workflowState, languageCode, usercacheke=
y, group, scheme);
+ String key =3D getKey(id, mode, languageCode, usercachekey, group,=
scheme);
=
Set groups =3D new HashSet();
- groups.add(containerkey + WORKFLOWSTATE_PREFIX + workflowState + L=
ANGUAGECODE_PREFIX + languageCode);
+ groups.add(containerkey + WORKFLOWSTATE_PREFIX + mode + LANGUAGECO=
DE_PREFIX + languageCode);
groups.add(USERNAME_PREFIX + usercachekey);
for (Iterator iterator =3D dependencies.iterator(); iterator.hasNe=
xt();) {
ContentObjectKey objectKey =3D (ContentObjectKey) iterator.nex=
t();
- groups.add(objectKey.toString()+WORKFLOWSTATE_PREFIX + workflo=
wState + LANGUAGECODE_PREFIX + languageCode);
+ groups.add(objectKey.toString()+WORKFLOWSTATE_PREFIX + mode + =
LANGUAGECODE_PREFIX + languageCode);
}
return new GroupCacheKey(key, groups);
}
=
- private String getKey(int id, int workflowState, String languageCode, =
String usercachekey, String group, String scheme) {
- String key =3D id + "-" + workflowState + "-" + languageCode + "-"=
+usercachekey ;
+ private String getKey(int id, String mode, String languageCode, String=
usercachekey, String group, String scheme) {
+ String key =3D id + "-" + mode + "-" + languageCode + "-" +usercac=
hekey ;
if (group !=3D null) {
key +=3D "-" + group;
}
Modified: trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/container/ContainerCacheTag.java&rev=3D18491&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java =
(original)
+++ trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java =
Fri Sep 14 13:36:59 2007
@@ -191,15 +191,14 @@
String bodyContent) throws JahiaInitializationException {
ContainerHTMLCache containerHTMLCache =3D ServicesRegistry.getInst=
ance().getCacheService().getContainerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().
- getWorkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(
processingContext.getLocale());
GroupCacheKey containerKey =3D containerHTMLCache.computeEntryKeyW=
ithGroups(
jahiaContainer, cacheKey, processingContext.getUser(),
curLanguageCode,
- workflowState,
+ mode,
processingContext.getScheme(), dependencies);
containerHTMLCache.put(containerKey, bodyContent);
}
@@ -207,15 +206,14 @@
private String getFromContainerCache(JahiaContainer jahiaContainer,Jah=
iaData jahiaData) throws JahiaInitializationException {
ContainerHTMLCache containerHTMLCache =3D ServicesRegistry.getInst=
ance().getCacheService().getContainerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().
- getWorkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(
processingContext.getLocale());
GroupCacheKey containerKey =3D containerHTMLCache.computeEntryKey(
jahiaContainer, cacheKey, processingContext.getUser(),
curLanguageCode,
- workflowState,
+ mode,
processingContext.getScheme());
return (String) containerHTMLCache.get(containerKey);
}
Modified: trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/container/ContainerTag.java&rev=3D18491&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java Fri S=
ep 14 13:36:59 2007
@@ -16,19 +16,19 @@
* limitations under the License.
*/package org.jahia.taglibs.container;
=
+import org.jahia.bin.Jahia;
+import org.jahia.content.ContentContainerKey;
+import org.jahia.content.ContentContainerListKey;
import org.jahia.data.JahiaData;
import org.jahia.data.beans.ContainerBean;
import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.containers.JahiaContainerList;
+import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.cache.ContainerHTMLCache;
import org.jahia.services.cache.GroupCacheKey;
-import org.jahia.services.containers.ContentContainerList;
-import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.content.ContentContainerListKey;
-import org.jahia.content.ContentContainerKey;
=
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
@@ -38,8 +38,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
=
=
/**
@@ -324,32 +324,33 @@
String bodyContent) throws JahiaInitializationException {
ContainerHTMLCache containerHTMLCache =3D ServicesRegistry.getInst=
ance().getCacheService().getContainerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().
- getWorkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
- String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(
- processingContext.getLocale());
- GroupCacheKey containerKey =3D containerHTMLCache.computeEntryKeyW=
ithGroups(
- jahiaContainer, cacheKey, processingContext.getUser(),
- curLanguageCode,
- workflowState,
- processingContext.getScheme(), dependencies);
+ String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(processingContext.getLocale());
+ GroupCacheKey containerKey =3D
+ containerHTMLCache.computeEntryKeyWithGroups(jahiaContaine=
r,
+ cacheKey,
+ processingCon=
text.getUser(),
+ curLanguageCo=
de,
+ mode,
+ processingCon=
text.getScheme(),
+ dependencies);
containerHTMLCache.put(containerKey, bodyContent);
}
=
private String getFromContainerCache(JahiaContainer jahiaContainer, Ja=
hiaData jahiaData) throws JahiaInitializationException {
ContainerHTMLCache containerHTMLCache =3D ServicesRegistry.getInst=
ance().getCacheService().getContainerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().
- getWorkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
- String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(
- processingContext.getLocale());
- GroupCacheKey containerKey =3D containerHTMLCache.computeEntryKey(
- jahiaContainer, cacheKey, processingContext.getUser(),
- curLanguageCode,
- workflowState,
- processingContext.getScheme());
+ String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(processingContext.getLocale());
+ GroupCacheKey containerKey =3D
+ containerHTMLCache.computeEntryKey(jahiaContainer,
+ cacheKey,
+ processingContext.getUs=
er(),
+ curLanguageCode,
+ mode,
+ processingContext.getSc=
heme());
return (String) containerHTMLCache.get(containerKey);
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
