Author: xlawrence
Date: Mon Jul 9 15:08:15 2007
New Revision: 17924
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17924&repname=
=3Djahia
Log:
Added new role on possibility to immediately execute a cron job
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties
trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java
trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D17924&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/conf/java/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Mon Ju=
l 9 15:08:15 2007
@@ -502,6 +502,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DBypass URL integrity checks
org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DBypass WAI compliance checks
org.jahia.admin.sitepermissions.permission.engines.actions.publishAll.labe=
l=3DPublish/Notify all objects of a site
+org.jahia.admin.sitepermissions.permission.engines.actions.immediateCron.l=
abel=3DFire a Cron job immediately
org.jahia.admin.sitepermissions.permission.engines.languages.en.label=3DEd=
it content in English
org.jahia.admin.sitepermissions.permission.engines.languages.fr.label=3DEd=
it content in French
org.jahia.admin.sitepermissions.permission.engines.languages.de.label=3DEd=
it content in German
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_en.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_en.properties&rev=3D17924&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/conf/java/JahiaAdministrationResources_en.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_en.properties Mon=
Jul 9 15:08:15 2007
@@ -502,6 +502,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DBypass URL integrity checks
org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DBypass WAI compliance checks
org.jahia.admin.sitepermissions.permission.engines.actions.publishAll.labe=
l=3DPublish/Notify all objects of a site
+org.jahia.admin.sitepermissions.permission.engines.actions.immediateCron.l=
abel=3DFire a Cron job immediately
org.jahia.admin.sitepermissions.permission.engines.languages.en.label=3DEd=
it content in English
org.jahia.admin.sitepermissions.permission.engines.languages.fr.label=3DEd=
it content in French
org.jahia.admin.sitepermissions.permission.engines.languages.de.label=3DEd=
it content in German
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_fr.properties&rev=3D17924&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/conf/java/JahiaAdministrationResources_fr.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties Mon=
Jul 9 15:08:15 2007
@@ -540,6 +540,7 @@
org.jahia.admin.serverpermissions.noPrincipals.label=3DPermission accord=
=C3=A9e =C3=A0 aucun utilisateur / groupe
org.jahia.admin.serverpermissions.permission.admin.audit.ManageLogs.label=
=3DLogs d'administration
org.jahia.admin.serverpermissions.permission.admin.categories.ManageCatego=
ries.label=3DG=C3=A9rer les cat=C3=A9gories
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D Vous n'avez pas le droit de lecture sur la cat=C3=A9gorie root =
org.jahia.admin.serverpermissions.permission.admin.components.ManageShareC=
omponents.label=3DGestion du partage des portlets
org.jahia.admin.serverpermissions.permission.admin.database.ManageDatabase=
.label=3DParam=C3=A8tres de la base de donn=C3=A9es
org.jahia.admin.serverpermissions.permission.admin.htmleditors.HtmlEditors=
Admin.label=3DV=C3=A9rifications et validation du code HTML
Modified: trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/lock/LockPrerequisites.java&rev=3D17924&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/lock/LockPrerequisites.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/services/lock/LockPrerequisites.java Mon =
Jul 9 15:08:15 2007
@@ -49,6 +49,7 @@
public static final String TIME_BASED_PUBLISHING =3D "engines.timebase=
dpublishing.TimeBasedPublishingEngine";
public static final String FIELD_RIGHTS =3D "engines.containerlistprop=
erties.FieldRightsEngine";
public static final String PUBLISH_ALL =3D "engines.actions.publishAll=
";
+ public static final String IMMEDIATE_CRON =3D "engines.actions.immedia=
teCron";
=
public static final String CONTENT_PICKER =3D "engines.importexport.Ma=
nageContentPicker";
public static final String VERSIONNING =3D "engines.versioning.PagesVe=
rsioningAction";
Modified: trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/workflow/nstep/NStepWorkflow.java&rev=3D17924&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/workflow/nstep/NStepWorkflow.java (origin=
al)
+++ trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java Mon Jul=
9 15:08:15 2007
@@ -49,6 +49,9 @@
import org.jahia.services.workflow.ExternalWorkflow;
import org.jahia.services.workflow.WorkflowService;
import org.jahia.services.workflow.ExternalWorkflowInstanceCurrentInfos;
+import org.jahia.services.acl.JahiaACLManagerService;
+import org.jahia.services.acl.JahiaBaseACL;
+import org.jahia.services.lock.LockPrerequisites;
import org.jahia.utils.LanguageCodeConverters;
import org.jahia.workflow.nstep.model.Workflow;
import org.jahia.workflow.nstep.model.WorkflowInstance;
@@ -481,7 +484,12 @@
}
if (Boolean.valueOf(productionPresence).booleanValue()) {
Workflow workflowByName =3D workflowManager.getWorkflowByName(=
processName);
- if (workflowByName.isLastStep(untrimActionName(actionName))) {
+ final JahiaACLManagerService aclService =3D ServicesRegistry.g=
etInstance().getJahiaACLManagerService();
+ if ((jParams.getUser().isAdminMember(jParams.getSiteID()) || a=
clService.getSiteActionPermission(
+ LockPrerequisites.IMMEDIATE_CRON,
+ jParams.getUser(),
+ JahiaBaseACL.READ_RIGHTS,
+ jParams.getSiteID()) > 0) && workflowByName.isLastStep=
(untrimActionName(actionName))) {
SchedulerService schedulerServ =3D ServicesRegistry.getIns=
tance().getSchedulerService();
try {
String[] jobNames =3D schedulerServ.getJobNames(Backgr=
oundJob.getGroupName(ProductionJob.class));
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-servi=
ces.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-services.xml&rev=3D17924&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l (original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l Mon Jul 9 15:08:15 2007
@@ -494,6 +494,7 @@
<value>org.jahia.actions.sites.*.engines.a=
ctions.byPassIntegrityChecks</value>
<value>org.jahia.actions.sites.*.engines.a=
ctions.byPassWAIChecks</value>
<value>org.jahia.actions.sites.*.engines.a=
ctions.publishAll</value>
+ <value>org.jahia.actions.sites.*.engines.a=
ctions.immediateCron</value>
</list>
</entry>
<entry>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
