Author: sshyrkov
Date: Tue Jan 15 14:53:57 2008
New Revision: 19516
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19516&repname=
=3Djahia
Log:
Removed TemplatesObserver due to changes in the template deployment
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/deam=
ons/filewatcher/templateobserver/
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/site=
s/JahiaSiteTools.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/sites/JahiaSiteTools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/sites/JahiaSiteTools.java&rev=
=3D19516&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/site=
s/JahiaSiteTools.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/site=
s/JahiaSiteTools.java Tue Jan 15 14:53:57 2008
@@ -31,7 +31,6 @@
import org.jahia.exceptions.JahiaException;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.deamons.filewatcher.JahiaFileWatcherService;
-import org.jahia.services.deamons.filewatcher.templateobserver.TemplatesOb=
server;
import org.jahia.services.deamons.filewatcher.webappobserver.WebAppsObserv=
er;
import org.jahia.services.templates_deployer.JahiaTemplatesDeployerService;
import org.jahia.services.usermanager.GroupsTools;
@@ -468,61 +467,4 @@
}
=
=
- /**
- * Start a file watcher to watch a site's new templates folder
- *
- * @return boolean false on error
- *
- * @param site for which to create the templates folder
- * @deprecated due to changes in the template deployment
- */
- public static boolean startTemplateObserver (JahiaSite site,
- SettingsBean settingsBean,
- JahiaTemplatesDeployerSer=
vice tds,
- JahiaFileWatcherService f=
ileWatcherService) {
-
- if (tds =3D=3D null || site =3D=3D null) {
- return false;
- }
-
- StringBuffer buff =3D new StringBuffer (tds.getNewTemplatesPath ()=
);
- buff.append (File.separator);
- buff.append (site.getSiteKey ());
-
- File f =3D new File (buff.toString ());
-
- boolean success =3D true;
-
- if (!f.isDirectory ()) {
- // try to create it
- success =3D createSiteNewTemplatesFolder (site);
- }
-
- if (success) {
- long interval =3D settingsBean.getTemplatesObserverInterval();
- if (interval =3D=3D -1) {
- return false;
- }
-
- boolean fileOnly =3D true;
- boolean checkDate =3D false;
-
- try {
- new TemplatesObserver (site.getID (),
- tds.getNewTemplatesPath ()
- + File.separator + site.getSiteKey (),
- checkDate,
- interval,
- fileOnly,
- fileWatcherService);
- return true;
-
- } catch (JahiaException je) {
- logger.error ("exception with FilesObserver" + site.getSit=
eKey (), je);
- }
- }
- return false;
- }
-
-
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
