Author: xlawrence
Date: Tue Jul 31 13:05:34 2007
New Revision: 18077
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18077&repname=
=3Djahia
Log:
added publish all patch in VODAFONE BRANCH (Missing files)
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_de.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_en.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_fr.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_de.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_en.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_fr.properties
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-dao.xml
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-hibernate.xml
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-manager.xml
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-services.xml
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema-index.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema.sql
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/jsp/jahia/engin=
es/workflow/adv_workflow.jsp
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaA=
dministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaAdministrationResources.proper=
ties&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources.properties Tue Jul 31 13:05:34 2007
@@ -508,6 +508,8 @@
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.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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaA=
dministrationResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaAdministrationResources_de.pro=
perties&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_de.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_de.properties Tue Jul 31 13:05:34 2007
@@ -496,6 +496,7 @@
org.jahia.admin.sitepermissions.permission.engines.actions.copy.label=3DCo=
ntent kopieren
org.jahia.admin.sitepermissions.permission.engines.actions.add.label=3DCon=
tent hinzuf=C3=BCgen
org.jahia.admin.sitepermissions.permission.engines.actions.paste.label=3DC=
ontent einf=C3=BCgen
+org.jahia.admin.sitepermissions.permission.engines.actions.publishAll.labe=
l=3DAlle Objekte ver\u00F6ffentlichen/melden
org.jahia.admin.sitepermissions.permission.engines.languages.en.label=3DCo=
ntent auf Englisch bearbeiten
org.jahia.admin.sitepermissions.permission.engines.languages.fr.label=3DCo=
ntent auf Franz=C3=B6sisch bearbeiten
org.jahia.admin.sitepermissions.permission.engines.languages.de.label=3DCo=
ntent auf Deutsch bearbeiten
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaA=
dministrationResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaAdministrationResources_en.pro=
perties&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_en.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_en.properties Tue Jul 31 13:05:34 2007
@@ -508,6 +508,8 @@
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.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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaA=
dministrationResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.pro=
perties&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_fr.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_fr.properties Tue Jul 31 13:05:34 2007
@@ -665,6 +665,8 @@
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.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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaE=
nginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaEnginesResources.properties&re=
v=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources.properties Tue Jul 31 13:05:34 2007
@@ -1253,6 +1253,10 @@
org.jahia.engines.workflow.WorkflowEngine.notifyCompletedPages.label =3D N=
otify completed pages
org.jahia.engines.workflow.WorkflowEngine.pageMoved.label =3D Page moved
org.jahia.engines.workflow.WorkflowEngine.publishPages.label =3D Pages&nbs=
p;ready for publishing
+org.jahia.engines.workflow.WorkflowEngine.publishAll.label =3D Publish all=
site
+org.jahia.engines.workflow.WorkflowEngine.publishAllTooltip.label =3D Atte=
mpts to publish all staging or waiting objects of the site
+org.jahia.engines.workflow.WorkflowEngine.notifyAll.label =3D Notify all s=
ite
+org.jahia.engines.workflow.WorkflowEngine.notifyAllTooltip.label =3D Attem=
pts to notify all staging objects of the site
org.jahia.engines.workflow.WorkflowEngine.refusePages.label =3D Refuse pag=
es
org.jahia.engines.workflow.WorkflowEngine.site.label =3D Site
org.jahia.engines.workflow.WorkflowEngine.siteName.label =3D Site name
@@ -1497,7 +1501,7 @@
org.jahia.engines.processDisplay.launched.label =3D launched
org.jahia.engines.processDisplay.launchedsince.label =3D since
org.jahia.engines.processDisplay.executed.label =3D executed during
-org.jahia.engines.processDisplay.failed.label =3D the process have failed
+org.jahia.engines.processDisplay.failed.label =3D the process has failed
org.jahia.engines.processDisplay.error.message =3D Some problems occured d=
uring the execution of this process. Please consult the logs or contact you=
r System Administrator
org.jahia.engines.processDisplay.error.see =3D to see the
org.jahia.engines.processDisplay.error.errors =3D errors logs
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaE=
nginesResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties=
&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_de.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_de.properties Tue Jul 31 13:05:34 2007
@@ -1214,6 +1214,10 @@
org.jahia.engines.workflow.WorkflowEngine.notifyCompletedPages.label =3D F=
ertig gestellte Seiten melden
org.jahia.engines.workflow.WorkflowEngine.pageMoved.label =3D Seite versch=
oben
org.jahia.engines.workflow.WorkflowEngine.publishPages.label =3D Seiten be=
reit f\u00FCr Ver\u00F6ffentlichung
+org.jahia.engines.workflow.WorkflowEngine.publishAll.label=3DAlles ver\u00=
F6ffentlichen
+org.jahia.engines.workflow.WorkflowEngine.publishAllTooltip.label=3DVersuc=
ht alle staging oder wartende Objekte zu ver\u00F6ffentlichen
+org.jahia.engines.workflow.WorkflowEngine.notifyAll.label=3DAlles melden
+org.jahia.engines.workflow.WorkflowEngine.notifyAllTooltip.label=3DVersuch=
t alle staging Objekte zu melden
org.jahia.engines.workflow.WorkflowEngine.refusePages.label =3D Seiten abl=
ehnen
org.jahia.engines.workflow.WorkflowEngine.site.label =3D Site
org.jahia.engines.workflow.WorkflowEngine.siteName.label =3D Name der Site
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaE=
nginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties=
&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_en.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_en.properties Tue Jul 31 13:05:34 2007
@@ -1253,6 +1253,10 @@
org.jahia.engines.workflow.WorkflowEngine.notifyCompletedPages.label =3D N=
otify completed pages
org.jahia.engines.workflow.WorkflowEngine.pageMoved.label =3D Page moved
org.jahia.engines.workflow.WorkflowEngine.publishPages.label =3D Pages&nbs=
p;ready for publishing
+org.jahia.engines.workflow.WorkflowEngine.publishAll.label =3D Publish all=
site
+org.jahia.engines.workflow.WorkflowEngine.publishAllTooltip.label =3D Atte=
mpts to publish all staging or waiting objects of the site
+org.jahia.engines.workflow.WorkflowEngine.notifyAll.label =3D Notify all s=
ite
+org.jahia.engines.workflow.WorkflowEngine.notifyAllTooltip.label =3D Attem=
pts to notify all staging objects of the site
org.jahia.engines.workflow.WorkflowEngine.refusePages.label =3D Refuse pag=
es
org.jahia.engines.workflow.WorkflowEngine.site.label =3D Site
org.jahia.engines.workflow.WorkflowEngine.siteName.label =3D Site name
@@ -1497,7 +1501,7 @@
org.jahia.engines.processDisplay.launched.label =3D launched
org.jahia.engines.processDisplay.launchedsince.label =3D since
org.jahia.engines.processDisplay.executed.label =3D executed during
-org.jahia.engines.processDisplay.failed.label =3D the process have failed
+org.jahia.engines.processDisplay.failed.label =3D the process has failed
org.jahia.engines.processDisplay.error.message =3D Some problems occured d=
uring the execution of this process. Please consult the logs or contact you=
r System Administrator
org.jahia.engines.processDisplay.success.message =3D The process have been=
successfully executed.
org.jahia.engines.processDisplay.jobresult.label =3D Job Results
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaE=
nginesResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties=
&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_fr.properties (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/conf/java/JahiaEngines=
Resources_fr.properties Tue Jul 31 13:05:34 2007
@@ -1013,6 +1013,10 @@
org.jahia.engines.workflow.WorkflowEngine.noworkflow.label =3D Aucun workf=
low
org.jahia.engines.workflow.WorkflowEngine.process.label =3D Processus
org.jahia.engines.workflow.WorkflowEngine.publishPages.label =3D Pages&nbs=
p;pr=C3=AAtes pour publication
+org.jahia.engines.workflow.WorkflowEngine.publishAll.label =3D Publier tou=
t le site
+org.jahia.engines.workflow.WorkflowEngine.publishAllTooltip.label =3D Tent=
e de publier tous les objets du site
+org.jahia.engines.workflow.WorkflowEngine.notifyAll.label =3D Notifier tou=
t le site
+org.jahia.engines.workflow.WorkflowEngine.notifyAllTooltip.label =3D Tente=
de notifier tous les objets du site
org.jahia.engines.workflow.WorkflowEngine.refusePages.label =3D Refuser le=
s pages
org.jahia.engines.workflow.WorkflowEngine.reject.label =3D Refuser
org.jahia.engines.workflow.WorkflowEngine.select.label =3D S=C3=A9lectionn=
er une action
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/e=
tc/spring/applicationcontext-dao.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-=
dao.xml&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-dao.xml (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-dao.xml Tue Jul 31 13:05:34 2007
@@ -186,6 +186,11 @@
<ref bean=3D"sessionFactory"/>
</property>
</bean>
+ <bean id=3D"jahiaLanguagesStatesDAO" class=3D"org.jahia.hibernate.dao.=
JahiaLanguagesStatesDAO" parent=3D"abstractGeneratorDAO">
+ <property name=3D"sessionFactory">
+ <ref bean=3D"sessionFactory"/>
+ </property>
+ </bean>
<bean id=3D"nstepUserDAO" class=3D"org.jahia.workflow.nstep.dao.hibern=
ate.UserDAOHibernate" parent=3D"abstractGeneratorDAO">
<property name=3D"sessionFactory">
<ref bean=3D"sessionFactory"/>
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/e=
tc/spring/applicationcontext-hibernate.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-=
hibernate.xml&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-hibernate.xml (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-hibernate.xml Tue Jul 31 13:05:34 2007
@@ -102,6 +102,7 @@
<value>org/jahia/hibernate/model/JahiaUser.hbm.xml</value>
<value>org/jahia/hibernate/model/JahiaUserProp.hbm.xml</va=
lue>
<value>org/jahia/hibernate/model/JahiaWorkflow.hbm.xml</va=
lue>
+ <value>org/jahia/hibernate/model/JahiaLanguagesStates.hbm.=
xml</value>
<value>org/jahia/workflow/nstep/model/User.hbm.xml</value>
<value>org/jahia/workflow/nstep/model/Workflow.hbm.xml</va=
lue>
<value>org/jahia/workflow/nstep/model/WorkflowStep.hbm.xml=
</value>
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/e=
tc/spring/applicationcontext-manager.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-=
manager.xml&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-manager.xml (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-manager.xml Tue Jul 31 13:05:34 2007
@@ -562,6 +562,18 @@
</bean>
</property>
</bean>
+ <bean id=3D"org.jahia.hibernate.manager.JahiaLanguagesStatesManager" p=
arent=3D"txProxyTemplate">
+ <property name=3D"target">
+ <bean class=3D"org.jahia.hibernate.manager.JahiaLanguagesState=
sManager">
+ <property name=3D"jahiaLanguagesStatesDAO">
+ <ref bean=3D"jahiaLanguagesStatesDAO"/>
+ </property>
+ <property name=3D"cacheService">
+ <ref bean=3D"JahiaCacheService"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
<bean id=3D"org.jahia.hibernate.manager.JahiaBigTextDataManager" paren=
t=3D"txProxyTemplate">
<property name=3D"target">
<bean class=3D"org.jahia.hibernate.manager.JahiaBigTextDataMan=
ager">
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/e=
tc/spring/applicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-=
services.xml&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-services.xml (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-services.xml Tue Jul 31 13:05:34 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.a=
ctions.publishAll</value>
</list>
</entry>
<entry>
@@ -719,6 +720,9 @@
<property name=3D"workflowManager">
<ref bean=3D"org.jahia.hibernate.manager.JahiaWorkflow=
Manager"/>
</property>
+ <property name=3D"languagesStatesManager">
+ <ref bean=3D"org.jahia.hibernate.manager.JahiaLanguage=
sStatesManager"/>
+ </property>
<property name=3D"cacheService">
<ref bean=3D"JahiaCacheService"/>
</property>
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/hypersonic/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/j=
ahia-schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -106,6 +106,8 @@
=
DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
+DROP INDEX jahia_languages_states_index ON jahia_languages_states ;
+
=
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
@@ -226,4 +228,5 @@
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+CREATE INDEX jahia_languages_states_index ON jahia_languages_states (workf=
low_state, siteid);
\ No newline at end of file
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/hypersonic/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/j=
ahia-schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/hypersonic/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -558,6 +558,17 @@
);
=
=
+drop table jahia_languages_states if exists;
+
+create table jahia_languages_states (
+ objectkey varchar(40) not null,
+ language_code varchar(10) not null,
+ workflow_state integer,
+ siteid integer,
+ primary key (objectkey, language_code)
+);
+
+
--------------------------------------------------------------------------=
---
-- jahia_link
--------------------------------------------------------------------------=
---
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mssql/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-=
schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -106,6 +106,8 @@
=
DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
+DROP INDEX jahia_languages_states_index ON jahia_languages_states ;
+
=
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
@@ -214,4 +216,5 @@
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+CREATE INDEX jahia_languages_states_index ON jahia_languages_states (workf=
low_state, siteid);
\ No newline at end of file
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mssql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-=
schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mssql/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -105,6 +105,7 @@
drop table jahia_homepages_prop;
drop table jahia_indexingjobs;
drop table jahia_indexingjobsserver;
+drop table jahia_languages_states;
drop table jahia_link;
drop table jahia_link_metadata;
drop table jahia_locks_non_excl;
@@ -491,6 +492,13 @@
serverid NVARCHAR(255) null,
indexing_date numeric(19,0) null
);
+create table jahia_languages_states (
+ objectkey nvarchar(40) not null,
+ language_code nvarchar(10) not null,
+ workflow_state int null,
+ siteid int null,
+ primary key (objectkey, language_code)
+);
create table jahia_link (
id int not null,
left_oid NVARCHAR(100) null,
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mysql-tx/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jah=
ia-schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -104,6 +104,7 @@
=
DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
+DROP INDEX jahia_languagestates_index ON jahia_languagestates ;
=
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
@@ -224,4 +225,5 @@
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
wstate, siteid);
\ No newline at end of file
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mysql-tx/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jah=
ia-schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql-tx/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -1324,6 +1324,22 @@
=
ALTER TABLE jahia_indexingjobs TYPE=3DInnoDB; =
=
+--------------------------------------------------------------------------=
---
+-- jahia_languages_states
+--------------------------------------------------------------------------=
---
+drop table if exists jahia_languages_states;
+
+CREATE TABLE jahia_languages_states
+(
+ objectkey VARCHAR(40) NOT NULL,
+ languagecode VARCHAR(10) NOT NULL,
+ workflowstate INTEGER,
+ siteid INTEGER,
+ PRIMARY KEY (objectkey, languagecode)
+);
+
+ALTER TABLE jahia_languages_states TYPE=3DInnoDB; =
+
=
=
=
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mysql/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-=
schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -106,6 +106,7 @@
=
DROP INDEX jahia_indexingjobs_index ON jahia_indexingjobs ;
=
+DROP INDEX jahia_languagestates_index ON jahia_languages_states ;
=
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
@@ -228,4 +229,5 @@
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
\ No newline at end of file
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/mysql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-=
schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/mysql/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -526,6 +526,16 @@
PRIMARY KEY(id_jahia_homepages)
);
=
+drop table if exists jahia_languages_states;
+
+create table jahia_languages_states (
+ objectkey varchar(40) not null,
+ language_code varchar(10) not null,
+ workflow_state integer,
+ siteid integer,
+ primary key (objectkey, language_code)
+);
+
# -----------------------------------------------------------------------
# jahia_homepages_prop
# -----------------------------------------------------------------------
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/oracle/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia=
-schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -96,6 +96,8 @@
=
DROP INDEX jahia_indexingjobsserver_index;
=
+DROP INDEX jahia_languagestates_index;
+
=
CREATE INDEX jahia_acl_index2 ON jahia_acl (parent_id_jahia_acl, id_jahia_=
acl);
=
@@ -194,3 +196,5 @@
CREATE INDEX jahia_users_index2 ON jahia_users (siteid_jahia_users);
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
+
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/oracle/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia=
-schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/oracle/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -38,6 +38,7 @@
drop table jahia_homepages_prop cascade constraints;
drop table jahia_indexingjobs cascade constraints;
drop table jahia_indexingjobsserver cascade constraints;
+drop table jahia_languages_states cascade constraints;
drop table jahia_link cascade constraints;
drop table jahia_link_metadata cascade constraints;
drop table jahia_locks_non_excl cascade constraints;
@@ -423,6 +424,13 @@
indexing_date number(19,0),
primary key (serverid, indexingjobid)
);
+create table jahia_languages_states (
+ objectkey varchar2(40) not null,
+ language_code varchar2(10) not null,
+ workflow_state number(10,0),
+ siteid number(10,0),
+ primary key (objectkey, language_code)
+);
create table jahia_link (
id number(10,0) not null,
left_oid varchar2(100),
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/postgresql/jahia-schema-index.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/j=
ahia-schema-index.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema-index.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema-index.sql Tue Jul 31 13:05:34 2007
@@ -106,6 +106,8 @@
=
DROP INDEX jahia_indexingjobs_index;
=
+DROP INDEX jahia_languagestates_index;
+
=
=
CREATE INDEX jahia_acl_index ON jahia_acl (id_jahia_acl);
@@ -228,4 +230,5 @@
=
CREATE INDEX jahia_indexingjobsserver_index ON jahia_indexingjobsserver (i=
ndexingjobid, serverid);
=
-CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
\ No newline at end of file
+CREATE INDEX jahia_indexingjobs_index ON jahia_indexingjobs (id_indexingjo=
b);
+CREATE INDEX jahia_languagestates_index ON jahia_languages_states (workflo=
w_state, siteid);
\ No newline at end of file
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/v=
ar/db/sql/schema/postgresql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/j=
ahia-schema.sql&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema.sql (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/WEB-INF/var/db/=
sql/schema/postgresql/jahia-schema.sql Tue Jul 31 13:05:34 2007
@@ -608,6 +608,16 @@
);
=
=
+drop table jahia_languages_states CASCADE;
+
+create table jahia_languages_states (
+ objectkey varchar(40) not null,
+ language_code varchar(10) not null,
+ workflow_state int4,
+ siteid int4,
+ primary key (objectkey, language_code)
+);
+
--------------------------------------------------------------------------=
---
-- jahia_link
--------------------------------------------------------------------------=
---
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/jsp/jahia=
/engines/workflow/adv_workflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/webapp/jsp/jahia/engines/workflow/adv_workflo=
w.jsp&rev=3D18077&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-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/jsp/jahia/engin=
es/workflow/adv_workflow.jsp (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/webapp/jsp/jahia/engin=
es/workflow/adv_workflow.jsp Tue Jul 31 13:05:34 2007
@@ -23,6 +23,11 @@
org.jahia.services.sites.SiteLanguageSettings,
org.jahia.taglibs.ajax.ComplexTreeInclude" %>
<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
+<%@ page import=3D"org.jahia.services.acl.JahiaACLManagerService" %>
+<%@ page import=3D"org.jahia.services.lock.LockPrerequisites" %>
+<%@ page import=3D"org.jahia.services.acl.JahiaBaseACL" %>
=
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
@@ -158,8 +163,10 @@
=
<% if (activeTabOption !=3D null && ! "noWorkFlow".equals(activeTabOption)=
) { %>
=
-<h5 class=3D"asInline"><jahia:engineResourceBundle resourceName=3D"org.jah=
ia.engines.workflow.WorkflowEngine.select.label"/>:</h5>
-<select name=3D"workflowAction" onchange=3D"handleActionChanges('display&d=
isplay=3D<%=3D activeTabOption %>&obj=3D<%=3DentryPoint%>')">
+<h5 class=3D"asInline"><jahia:engineResourceBundle resourceName=3D"org.jah=
ia.engines.workflow.WorkflowEngine.select.label"/>
+ :</h5>
+<select name=3D"workflowAction"
+ onchange=3D"handleActionChanges('display&display=3D<%=3D activeTab=
Option %>&obj=3D<%=3DentryPoint%>')">
<%
final Iterator orderedActionsiterator =3D orderedActions.iterator(=
);
while (orderedActionsiterator.hasNext()) {
@@ -174,6 +181,54 @@
<% } %>
</select>
=
+<%
+ final JahiaACLManagerService aclService =3D ServicesRegistry.getInstan=
ce().getJahiaACLManagerService();
+ final JahiaUser currentUser =3D jParams.getUser();
+ final boolean hasPublishAllRole =3D aclService.getSiteActionPermission=
(LockPrerequisites.PUBLISH_ALL,
+ currentUser, JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > =
0;
+ if (hasPublishAllRole || currentUser.isAdminMember(jParams.getSiteID()=
)) { %>
+
+<div class=3D"button" id=3D"notifyAllButton">
+ <a href=3D"javascript:sendFormNotifyAll();"
+ title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.workflow.WorkflowEngine.notifyAllTooltip.label"/>"
+ onclick=3D"javascript:setWaitingCursor(1);">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.work=
flow.WorkflowEngine.notifyAll.label"/>
+ </a>
+</div>
+
+<div class=3D"button" id=3D"publishAllButton">
+ <a href=3D"javascript:sendPublishAll();"
+ title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.workflow.WorkflowEngine.publishAllTooltip.label"/>"
+ onclick=3D"javascript:setWaitingCursor(1);">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.work=
flow.WorkflowEngine.publishAll.label"/>
+ </a>
+</div>
+
+<script type=3D"text/javascript">
+ function sendFormNotifyAll() {
+ if (check() && submittedCount =3D=3D 0) {
+ var button =3D document.getElementById("notifyAllButton");
+ if (button) button.innerHTML =3D "<div class=3D'clicked'><jahi=
a:engineResourceBundle resourceName=3D"org.jahia.engines.workflow.WorkflowE=
ngine.notifyAll.label"/></div>";
+ delete button;
+ document.mainForm.screen.value =3D "notifyAll";
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+
+ function sendPublishAll() {
+ if (check() && submittedCount =3D=3D 0) {
+ var button =3D document.getElementById("publishAllButton");
+ if (button) button.innerHTML =3D "<div class=3D'clicked'><jahi=
a:engineResourceBundle resourceName=3D"org.jahia.engines.workflow.WorkflowE=
ngine.publishAll.label"/></div>";
+ delete button;
+ document.mainForm.screen.value =3D "publishAll";
+ saveContent();
+ teleportCaptainFlam(document.mainForm);
+ }
+ }
+</script>
+<% } %>
+
<table border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
<td>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
