Author: sshyrkov
Date: Fri Nov 9 10:50:10 2007
New Revision: 19096
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19096&repname=
=3Djahia
Log:
[trunk r19066] invalidate cache when moving files (JAHIA-2429)
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/JahiaWebdavBaseService.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/webdav/JahiaWebdavBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService=
.java&rev=3D19096&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/JahiaWebdavBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/JahiaWebdavBaseService.java Fri Nov 9 10:50:10 2007
@@ -23,6 +23,8 @@
import org.apache.slide.util.conf.ConfigurationElement;
import org.apache.slide.util.conf.Populate;
import org.jahia.bin.Jahia;
+import org.jahia.content.ContentContainerKey;
+import org.jahia.content.ContentContainerListKey;
import org.jahia.content.ContentContainerListsXRefManager;
import org.jahia.content.ContentFieldXRefManager;
import org.jahia.data.files.JahiaFileField;
@@ -34,10 +36,10 @@
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.JahiaService;
+import org.jahia.services.cache.ContainerHTMLCache;
import org.jahia.services.cache.HtmlCache;
import org.jahia.services.containers.ContentContainer;
import org.jahia.services.containers.ContentContainerList;
-import org.jahia.services.database.ConnectionDispenser;
import org.jahia.services.fields.ContentField;
import org.jahia.services.search.JahiaSearchService;
import org.jahia.services.search.SearchHandler;
@@ -47,9 +49,9 @@
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.ContentObjectEntryState;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.webdav.model.PropertyDefinition;
import org.jahia.services.webdav.stores.FileContentStore;
import org.jahia.services.webdav.stores.JahiaDescriptorsStore;
-import org.jahia.services.webdav.model.PropertyDefinition;
import org.jahia.utils.JahiaTools;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -62,7 +64,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.sql.Connection;
import java.util.*;
=
/**
@@ -389,6 +390,18 @@
}
htmlCache.invalidatePageEntries (Integer.toString(fiel=
d.getPageID()));
}
+ ContainerHTMLCache containerHtmlCache =3D ServicesRegistry=
.getInstance().getCacheService().getContainerHTMLCacheInstance();
+ if (containerHtmlCache !=3D null) {
+ ContentField field =3D ContentField.getField(v.getId()=
);
+ if (field.getContainerID () > 0) {
+ ArrayList languageSettings =3D site.getLanguageSet=
tingsAsLocales(true);
+ for (int j =3D 0; j < languageSettings.size(); j++=
) {
+ Locale locale =3D (Locale) languageSettings.ge=
t(j);
+ containerHtmlCache.invalidateContainerEntriesI=
nAllModes(new ContentContainerKey(field.getContainerID ()).toString(), loca=
le.toString());
+ containerHtmlCache.invalidateContainerEntriesI=
nAllModes(new ContentContainerListKey(ContentContainer.getContainer(field.g=
etContainerID()).getParentContainerListID()).toString(), locale.toString());
+ }
+ }
+ }
}
} catch (JahiaException e) {
e.printStackTrace ();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
