svn commit: [jahia] r17923 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: conf/java/ java/org/jahia/services/lock/ java/org/jahia/workflow/nstep/ webapp/WEB-INF/etc/spring/

xlawrence Mon, 09 Jul 2007 05:57:34 -0700

Author: xlawrence
Date: Mon Jul  9 14:57:27 2007
New Revision: 17923

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17923&repname=
=3Djahia
Log:
Added new role on possibility to immediately execute a cron job


Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/lock/Lock=
Prerequisites.java
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nstep/NSt=
epWorkflow.java
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D17=
923&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/conf/java/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Mon Jul  9 14:57:27 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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D17923&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/conf/java/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Mon Jul  9 14:57:27 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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D17923&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/conf/java/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Mon Jul  9 14:57:27 2007
@@ -647,6 +647,7 @@
 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.publishAll.labe=
l=3DPublier/Notifier tous les objets du site
+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-5-0-SP-BRANCH/core/src/java/org/jahia/services/loc=
k/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/lock/LockPrerequisites.java&rev=3D=
17923&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/lock/Lock=
Prerequisites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/lock/Lock=
Prerequisites.java Mon Jul  9 14:57:27 2007
@@ -48,6 +48,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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nst=
ep/NStepWorkflow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java&rev=3D179=
23&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/workflow/nstep/NSt=
epWorkflow.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nstep/NSt=
epWorkflow.java Mon Jul  9 14:57:27 2007
@@ -48,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;
@@ -481,11 +484,16 @@
         }
         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));
-// ensure we only show the site job
+                    // ensure we only show the site job
                     String jobNamePrefix =3D ProductionJob.JOB_NAME_PREFIX=
 + jParams.getSiteID();
                     StringBuffer options =3D new StringBuffer();
                     options.append("<option value=3D\"none\" selected>").a=
ppend(resourceBundle.getString("workflow.last.step.production.no")).append(=
"</option>");
@@ -505,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);
                 }
             }
         }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/a=
pplicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml&=
rev=3D17923&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/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml Mon Jul  9 14:57:27 2007
@@ -493,6 +493,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

svn commit: [jahia] r17923 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: conf/java/ java/org/jahia/services/lock/ java/org/jahia/workflow/nstep/ webapp/WEB-INF/etc/spring/

Reply via email to