Author: tdraier
Date: Mon Sep 3 15:12:35 2007
New Revision: 18359
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18359&repname=
=3Djahia
Log:
use operation mode instead of workflowstate
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Con=
tainerHTMLCache.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/ContainerHTMLCache.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/ContainerHTMLCache.java&rev=
=3D18359&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Con=
tainerHTMLCache.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Con=
tainerHTMLCache.java Mon Sep 3 15:12:35 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerCacheTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java&re=
v=3D18359&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java Mon Sep 3 15:12:35 2007
@@ -240,15 +240,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);
}
@@ -256,15 +255,14 @@
private String getFromContainerCache(JahiaContainer jahiaContainer,Jah=
iaData jahiaData,boolean b) 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());
if (b) {
aclGroupFinalKey =3D ServicesRegistry.getInstance()
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerTag.java&rev=3D1=
8359&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java Mon Sep 3 15:12:35 2007
@@ -411,7 +411,7 @@
ContainerHTMLCache containerHTMLCache =3D
ServicesRegistry.getInstance().getCacheService().getContai=
nerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().getW=
orkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(processingContext.getLocale());
GroupCacheKey containerKey =3D
@@ -419,7 +419,7 @@
cacheKey,
processingCon=
text.getUser(),
curLanguageCo=
de,
- workflowState,
+ mode,
processingCon=
text.getScheme(),
dependencies);
containerHTMLCache.put(containerKey, bodyContent);
@@ -431,7 +431,7 @@
ContainerHTMLCache containerHTMLCache =3D
ServicesRegistry.getInstance().getCacheService().getContai=
nerHTMLCacheInstance();
ProcessingContext processingContext =3D jahiaData.getProcessingCon=
text();
- int workflowState =3D processingContext.getEntryLoadRequest().getW=
orkflowState();
+ String mode =3D jahiaData.getProcessingContext().getOperationMode(=
);
// Get the language code
String curLanguageCode =3D LanguageCodeConverters.localeToLanguage=
Tag(processingContext.getLocale());
GroupCacheKey containerKey =3D
@@ -439,7 +439,7 @@
cacheKey,
processingContext.getUs=
er(),
curLanguageCode,
- workflowState,
+ mode,
processingContext.getSc=
heme());
// Todo POC for making each container an esi fragment
// Test if esi is active
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
