Author: sshyrkov
Date: Thu Oct 4 15:40:17 2007
New Revision: 18753
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18753&repname=
=3Djahia
Log:
1) org.jahia.acl.preload_count is removed, as it is not considered in any c=
ase
2) org.jahia.workflow.preload_active, org.jahia.workflow.preload_count are =
removed, as there is no preloading done for workflow states now
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/acl/Jahia=
ACLManagerService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/acl=
/JahiaACLManagerService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java&re=
v=3D18753&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/acl/Jahia=
ACLManagerService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/acl/Jahia=
ACLManagerService.java Thu Oct 4 15:40:17 2007
@@ -122,10 +122,11 @@
mACLCache =3D cacheService.createCacheInstance(ACL_TREE_CACHE);
=
if (settingsBean.isAclPreloadActive()) {
- int preloadCount =3D this.settingsBean.getAclPreloadCount();
-
- logger.info("Preloading " + preloadCount + " ACLs from the dat=
abase...");
+ long startTime =3D System.currentTimeMillis();
+ logger.info("Preloading ACLs from the database...");
manager.preloadACLs(mACLCache);
+ logger.info("Preloading ACLs from the database took "
+ + (System.currentTimeMillis() - startTime) + " ms");
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowService.java&rev=
=3D18753&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/workflow/=
WorkflowService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowService.java Thu Oct 4 15:40:17 2007
@@ -17,7 +17,6 @@
*/
package org.jahia.services.workflow;
=
-import org.jahia.bin.Jahia;
import org.jahia.content.*;
import org.jahia.content.events.ContentActivationEvent;
import org.jahia.engines.EngineMessage;
@@ -39,7 +38,6 @@
import org.jahia.services.pages.ContentPage;
import org.jahia.services.scheduler.BackgroundJob;
import org.jahia.services.scheduler.SchedulerService;
-import org.jahia.services.sites.JahiaSite;
import org.jahia.services.usermanager.JahiaGroup;
import org.jahia.services.version.*;
import org.quartz.JobDataMap;
@@ -132,37 +130,6 @@
cache =3D cacheService.createCacheInstance(WORKFLOWLANGUAGESSTATES=
_CACHENAME);
modeCache =3D cacheService.createCacheInstance(WORKFLOWMODE_CACHEN=
AME);
linkedObjectsCache =3D cacheService.createCacheInstance(WORKFLOWLI=
NKEDOBJECT_CACHENAME);
-
- if (Jahia.getSettings().isWorkflowLevelsPreloadActive()) {
- try {
- Enumeration e =3D ServicesRegistry.getInstance().getJahiaS=
itesService().getSites();
- while (e.hasMoreElements()) {
- JahiaSite jahiaSite =3D (JahiaSite) e.nextElement();
- if (jahiaSite !=3D null) {
- ContentPage homeContentPage =3D jahiaSite.getHomeC=
ontentPage();
- if (homeContentPage !=3D null) {
- ContentObjectKey k =3D (ContentObjectKey) home=
ContentPage.getObjectKey();
- logger.info("Preloading " + Jahia.getSettings(=
).getWorkflowLevelsPreloadCount() + " levels of workflow states for site "+=
jahiaSite.getSiteKey()+"...");
- preload(k, Jahia.getSettings().getWorkflowLeve=
lsPreloadCount());
- }
- }
- }
- } catch (Exception ex) {
- logger.error("Error during preloading of workflow levels",=
ex);
- }
- }
- }
-
- private void preload(ContentObjectKey k, int level) throws JahiaExcept=
ion {
-// if (level-- =3D=3D 0) {
-// return;
-// }
-// getLanguagesStates(k);
-// List l =3D getUnlinkedContentObjects(k);
-// for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
-// ContentObjectKey contentObjectKey =3D (ContentObjectKey) ite=
rator.next();
-// preload(contentObjectKey, level);
-// }
}
=
public void stop() {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/Set=
tingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/settings/SettingsBean.java&rev=3D18753&repn=
ame=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/settings/SettingsB=
ean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java Thu Oct 4 15:40:17 2007
@@ -228,13 +228,6 @@
private String defaultSite;
=
private boolean aclPreloadActive =3D true;
- // this value is used to preload ACLs upon Jahia startup in order to a=
void
- // the real time cost of loading them upon first access. This value *m=
ust*
- // be smaller than the maximum size of the cache.
- private int aclPreloadCount =3D 0;
-
- private boolean workflowLevelsPreloadActive =3D true;
- private int workflowLevelsPreloadCount =3D 3;
=
// should the webdav filenames be converted into full-ascii
private boolean transformFilenames;
@@ -633,10 +626,6 @@
defaultLanguageCode =3D getString ("org.jahia.multilang.defaul=
t_language_code", "en");
=
aclPreloadActive =3D getBoolean("org.jahia.acl.preload_active"=
, true);
- aclPreloadCount =3D getInt("org.jahia.acl.preload_count", 0 /*=
preload count is deactivated by default */);
-
- workflowLevelsPreloadActive =3D getBoolean("org.jahia.workflow=
.preload_active", true);
- workflowLevelsPreloadCount =3D getInt("org.jahia.workflow.prel=
oad_count", 1 /* preload count is deactivated by default */);
=
preloadCountForPageProperties =3D getInt("org.jahia.pages.prop=
erties.preload_count", 2000);
=
@@ -1169,11 +1158,6 @@
return defaultLanguageCode;
}
=
- public int getAclPreloadCount () {
- return aclPreloadCount;
- }
-
-
public boolean isAclPreloadActive() {
return aclPreloadActive;
}
@@ -1182,10 +1166,6 @@
this.aclPreloadActive =3D aclPreloadActive;
}
=
- public int getWorkflowLevelsPreloadCount() {
- return workflowLevelsPreloadCount;
- }
-
/**
* Used to get the build number.
*
@@ -2143,14 +2123,6 @@
this.outputCacheExpirationOnly =3D outputCacheExpirationOnly;
}
=
- public boolean isWorkflowLevelsPreloadActive() {
- return workflowLevelsPreloadActive;
- }
-
- public void setWorkflowLevelsPreloadActive(boolean workflowLevelsPrelo=
adActive) {
- this.workflowLevelsPreloadActive =3D workflowLevelsPreloadActive;
- }
-
public int getEditModeSessionTimeout() {
return editModeSessionTimeout;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/j=
ahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.skeleton&rev=3D18753&repna=
me=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/webapp/WEB-INF/etc/config/jahia.s=
keleton (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton Thu Oct 4 15:40:17 2007
@@ -413,22 +413,6 @@
######################################################################
# Specifies whether we should preload ACLs from database on startup.
org.jahia.acl.preload_active =3D true
-# Specifies the number of ACLs to preload at Jahia startup. This
-# variable will do nothing if the preloading is not activated
-# in the above variable.
-org.jahia.acl.preload_count =3D 10000
-
-######################################################################
-### Workflows states ###############################################
-######################################################################
-# Specifies whether the workflow levels should be precalculated upon
-# Jahia startup.
-org.jahia.workflow.preload_active =3D true
-# This settings specifies the amount of level of page tree hierarchy
-# to preload upon Jahia startup. The preload will calculate the
-# workflow status per language at startup. This variable will do
-# nothing if the above preload_active variable is set to false
-org.jahia.workflow.preload_count =3D 3
=
######################################################################
### Page properties ##################################################
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
