Author: xlawrence
Date: Mon Aug 6 08:47:17 2007
New Revision: 18133
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18133&repname=
=3Djahia
Log:
Backport immediate cron role into MINEFI Branch
Modified:
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_en.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_fr.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_de.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_en.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_es.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_fr.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_it.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_pt.properties
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/services/l=
ock/LockPrerequisites.java
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/workflow/n=
step/NStepWorkflow.java
branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/webapp/WEB-INF/etc/spring=
/applicationcontext-services.xml
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdmi=
nistrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministrationResources.properties&=
rev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources.properties Mon Aug 6 08:47:17 2007
@@ -501,6 +501,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAccess to edit mode
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.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: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdmi=
nistrationResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministrationResources_en.properti=
es&rev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_en.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_en.properties Mon Aug 6 08:47:17 2007
@@ -501,6 +501,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAccess to edit mode
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.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: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdmi=
nistrationResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es&rev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_fr.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/JahiaAdministra=
tionResources_fr.properties Mon Aug 6 08:47:17 2007
@@ -659,6 +659,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.editMode.label=
=3DAcc=C3=A8s au mode d'=C3=A9dition
org.jahia.admin.sitepermissions.permission.engines.actions.byPassIntegrity=
Checks.label=3DIgnorer les erreurs d'int=C3=A9grit=C3=A9 des liens
org.jahia.admin.sitepermissions.permission.engines.actions.byPassWAIChecks=
.label=3DIgnorer les erreurs WAI
+org.jahia.admin.sitepermissions.permission.engines.actions.immediateCron.l=
abel=3DMise en production imm=C3=A9diate sur serveur distant
org.jahia.admin.sitepermissions.permission.engines.audit.ManageLogs_Engine=
.label=3DJournaux
org.jahia.admin.sitepermissions.permission.engines.containerlistproperties=
.FieldRightsEngine.label=3DDroits sur les champs (pop-up)
org.jahia.admin.sitepermissions.permission.engines.content.Edit.label=3D=
=C3=89dition de contenu
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources.properties&rev=
=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources.properties Mon Aug 6 08:47:17 2007
@@ -19,6 +19,7 @@
process.three_validation_step_workflow.step.third_step =3D Publish modific=
ation on current page
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Rollback to previous step
process.three_validation_step_workflow.step.rollback_to_author =3D Rollbac=
k to author
+# This value is of type boolean so its value must be true or false in all =
languages
process.three_validation_step_workflow.last.step.production.present =3D tr=
ue
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DList of elements which have advanced of o=
ne step :
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_de.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_de.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_de.properties Mon Aug 6 08:47:17 2007
@@ -18,7 +18,6 @@
process.three_validation_step_workflow.step.third_step =3D =C3=84nderungen=
auf der aktuellen Seite ver=C3=B6ffentlichen
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Zur=C3=BCck zum vorausgehenden Schritt
process.three_validation_step_workflow.step.rollback_to_author =3D Zur=C3=
=BCck zum Autor
-process.three_validation_step_workflow.last.step.production.present =3D wa=
hr
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DListe der Elemente, die einen Schritt vor=
angekommen sind:
notification.elements.deleted=3DListe der Elemente, die gel=C3=B6scht wurd=
en:
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_en.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_en.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_en.properties Mon Aug 6 08:47:17 2007
@@ -19,7 +19,6 @@
process.three_validation_step_workflow.step.third_step =3D Publish modific=
ation on current page
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Rollback to previous step
process.three_validation_step_workflow.step.rollback_to_author =3D Rollbac=
k to author
-process.three_validation_step_workflow.last.step.production.present =3D tr=
ue
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DList of elements which have advanced of o=
ne step :
notification.elements.deleted=3DList of elements which have been deleted :
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_es.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_es.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_es.properties Mon Aug 6 08:47:17 2007
@@ -16,7 +16,6 @@
process.three_validation_step_workflow.step.third_step =3D Publicar modifi=
caci=C3=B3n en la p=C3=A1gina actual
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Retroceder al paso anterior
process.three_validation_step_workflow.step.rollback_to_author =3D Retroce=
der al autor
-process.three_validation_step_workflow.last.step.production.present =3D ve=
rdadero
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DLista de elementos que han avanzado un pa=
so:
notification.elements.deleted=3DLista de elementos que han sido eliminados:
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_fr.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_fr.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_fr.properties Mon Aug 6 08:47:17 2007
@@ -19,7 +19,6 @@
process.three_validation_step_workflow.step.third_step =3D Publier la modi=
fication de la page en cours
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Renvoyer =C3=A0 l'=C3=A9tape pr=C3=A9c=C3=A9dente
process.three_validation_step_workflow.step.rollback_to_author =3D Renvoye=
r au r=C3=A9dacteur
-process.three_validation_step_workflow.last.step.production.present =3D vr=
ai
process.three_validation_step_workflow.notification.template.path=3Dextern=
al_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DListe des =C3=A9l=C3=A9ments qui ont avan=
c=C3=A9 d'une =C3=A9tape :
notification.elements.deleted=3DListe des =C3=A9l=C3=A9ments qui ont =C3=
=A9t=C3=A9 supprim=C3=A9s :
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_it.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_it.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_it.properties Mon Aug 6 08:47:17 2007
@@ -16,7 +16,6 @@
process.three_validation_step_workflow.step.third_step =3D Pubblica modifi=
ca su pagina corrente
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Ripristina a fase precedente
process.three_validation_step_workflow.step.rollback_to_author =3D Riprist=
ina ad autore
-process.three_validation_step_workflow.last.step.production.present =3D ve=
ro
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DElenco di elementi che sono avanzati di f=
ase:
notification.elements.deleted=3DElenco di elementi che sono stati eliminat=
i:
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-wor=
kflowResources_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowResources_pt.properties&re=
v=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_pt.properties (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/conf/java/nstep-workflowR=
esources_pt.properties Mon Aug 6 08:47:17 2007
@@ -16,7 +16,6 @@
process.three_validation_step_workflow.step.third_step =3D Publicar modifi=
ca=C3=A7=C3=A3o na p=C3=A1gina atual
process.three_validation_step_workflow.step.rollback_to_previous_step =3D =
Reverter para etapa anterior
process.three_validation_step_workflow.step.rollback_to_author =3D Reverte=
r para autor
-process.three_validation_step_workflow.last.step.production.present =3D ve=
rdadeiro
process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
notification.elements.advanced=3DLista de elementos que avan=C3=A7aram uma=
etapa:
notification.elements.deleted=3DLista de elementos que foram exclu=C3=ADdo=
s:
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/serv=
ices/lock/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/java/org/jahia/services/lock/LockPrerequisites.jav=
a&rev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/services/l=
ock/LockPrerequisites.java (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/services/l=
ock/LockPrerequisites.java Mon Aug 6 08:47:17 2007
@@ -50,6 +50,7 @@
public static final String RIGHTS =3D "engines.rights.ManageRights";
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 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: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/work=
flow/nstep/NStepWorkflow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java&r=
ev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/workflow/n=
step/NStepWorkflow.java (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/java/org/jahia/workflow/n=
step/NStepWorkflow.java Mon Aug 6 08:47:17 2007
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.workflow.nstep;
+ */
+package org.jahia.workflow.nstep;
=
import groovy.lang.Binding;
import groovy.util.GroovyScriptEngine;
@@ -47,6 +48,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;
@@ -142,7 +146,9 @@
private TransactionTemplate transactionTemplate;
// --------------------------- CONSTRUCTORS ---------------------------
=
- /** Constructs a new NStepWorkflow. */
+ /**
+ * Constructs a new NStepWorkflow.
+ */
public NStepWorkflow() {
}
=
@@ -231,17 +237,23 @@
=
// --------------------- Interface ExternalWorkflow ---------------------
=
- /** [EMAIL PROTECTED] */
+ /**
+ * [EMAIL PROTECTED]
+ */
public void startSession() {
startSession(Locale.getDefault());
}
=
- /** [EMAIL PROTECTED] */
+ /**
+ * [EMAIL PROTECTED]
+ */
public void startSession(Locale locale) {
this.resourceBundle =3D ResourceBundle.getBundle("nstep-workflowRe=
sources", locale);
}
=
- /** [EMAIL PROTECTED] */
+ /**
+ * [EMAIL PROTECTED]
+ */
public void endSession() {
}
=
@@ -441,7 +453,9 @@
return list;
}
=
- /** [EMAIL PROTECTED] */
+ /**
+ * [EMAIL PROTECTED]
+ */
public String getActionName(String processName, String actionName) {
return resourceBundle.getString("process." + trimActionName(proces=
sName.toLowerCase()) + ".step." +
trimActionName(actionName.toLowerC=
ase()));
@@ -470,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));
@@ -494,7 +513,7 @@
s.append("</select>");
}
} catch (JahiaException e) {
- e.printStackTrace(); //To change body of catch statem=
ent use File | Settings | File Templates.
+ log.error("Error in getParameterForm !", e);
}
}
}
@@ -599,7 +618,9 @@
return true;
}
=
- /** [EMAIL PROTECTED] */
+ /**
+ * [EMAIL PROTECTED]
+ */
public void sendResults(ProcessingContext processingContext, Activatio=
nTestResults activationTestResults, Map userNotifData) {
final MailService mailService =3D ServicesRegistry.getInstance().g=
etMailService();
GroovyScriptEngine groovyScriptEngine =3D (GroovyScriptEngine) Spr=
ingContextSingleton.getInstance().getContext().getBean("groovyScriptEngine"=
);
@@ -664,15 +685,17 @@
}
}
=
- public boolean isUserAuthorizedForWorkflow(String processName, String =
objectKey, JahiaUser user) {
+ public boolean isUserAuthorizedForWorkflow(final String processName,
+ final String objectKey,
+ final JahiaUser user) {
if(user.isRoot()) return true;
- Workflow instance =3D workflowManager.getWorkflowByName(processNam=
e);
+ final Workflow instance =3D workflowManager.getWorkflowByName(proc=
essName);
final List steps =3D instance.getSteps();
- WorkflowStep workflowStep =3D (WorkflowStep) steps.get(1);
+ final WorkflowStep workflowStep =3D (WorkflowStep) steps.get(1);
try {
final ContentObject contentObjectInstance =3D ContentPage.getC=
ontentObjectInstance(ContentPageKey.getInstance(objectKey));
final WorkflowService workflowService =3D ServicesRegistry.get=
Instance().getWorkflowService();
- JahiaGroup group =3D workflowService.getRoleGroup(contentObjec=
tInstance, trimActionName(workflowStep.getName()), true);
+ final JahiaGroup group =3D workflowService.getRoleGroup(conten=
tObjectInstance, trimActionName(workflowStep.getName()), true);
return group.isMember(user);
} catch (ClassNotFoundException e) {
log.warn("error during eval of user authorization on this work=
flow",e);
Modified: branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/webapp/WEB-INF/etc/=
spring/applicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-MINEFI=
-5-0-2-SPBRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-servi=
ces.xml&rev=3D18133&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-MINEFI-5-0-2-SPBRANCH/core/src/webapp/WEB-INF/etc/spring=
/applicationcontext-services.xml (original)
+++ branches/JAHIA-MINEFI-5-0-2-SPBRANCH/core/src/webapp/WEB-INF/etc/spring=
/applicationcontext-services.xml Mon Aug 6 08:47:17 2007
@@ -491,6 +491,7 @@
<value>org.jahia.actions.sites.*.engines.a=
ctions.editMode</value>
<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.actions.immediate=
Cron</value>
</list>
</entry>
<entry>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
