Author: tdraier
Date: Fri Sep 21 11:31:37 2007
New Revision: 18606
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18606&repname=
=3Djahia
Log:
upgraded patch manager, added index scripts, added percentage and messages =
( port 18522 )
Added:
trunk/core/src/java/org/jahia/ajax/admin/
- copied from r18522, branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/=
jahia/ajax/admin/
trunk/core/src/java/org/jahia/ajax/admin/PatchStatusAction.java
- copied unchanged from r18522, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/ajax/admin/PatchStatusAction.java
trunk/core/src/java/org/jahia/version/Status.java
- copied unchanged from r18522, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/Status.java
trunk/core/src/webapp/WEB-INF/var/versions.properties
- copied unchanged from r18522, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/WEB-INF/var/versions.properties
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/admin/patches/ManagePatches.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaVersionManager.java
trunk/core/src/java/org/jahia/version/SqlPatcher.java
trunk/core/src/java/org/jahia/version/VersionService.java
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=3D18606&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 Fri Se=
p 21 11:31:37 2007
@@ -1072,6 +1072,15 @@
org.jahia.admin.patchmanagement.failed.label =3D Failed
org.jahia.admin.patchmanagement.available.label =3D Available patches
org.jahia.admin.patchmanagement.install.label =3D install
+org.jahia.admin.patchmanagement.ongoingInstall.label =3D Please wait, patc=
hes are being installed. This may take some time depending of the size of y=
our database.
+
+org.jahia.admin.patchmanagement.sql =3D Executing SQL statements
+
+org.jahia.admin.patchmanagement.aclpatch_17886.updateAclIds=3DUpdate ACL i=
ds (1/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.pickersAcl=3DUpdate content=
pickers ACLs (2/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.deleteAcl=3DDelete unused A=
CLs (3/3)
+
+org.jahia.admin.patchmanagement.languagestates_17886=3DPrecalculate workfl=
ow states
=
org.jahia.admin.workInProgress.label =3DWork in progress, please wait
=
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=3D18606&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 Fri=
Sep 21 11:31:37 2007
@@ -1072,6 +1072,15 @@
org.jahia.admin.patchmanagement.failed.label =3D Failed
org.jahia.admin.patchmanagement.available.label =3D Available patches
org.jahia.admin.patchmanagement.install.label =3D install
+org.jahia.admin.patchmanagement.ongoingInstall.label =3D Please wait, patc=
hes are being installed. This may take some time depending of the size of y=
our database.
+
+org.jahia.admin.patchmanagement.sql =3D Executing SQL statements
+
+org.jahia.admin.patchmanagement.aclpatch_17886.updateAclIds=3DUpdate ACL i=
ds (1/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.pickersAcl=3DUpdate content=
pickers ACLs (2/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.deleteAcl=3DDelete unused A=
CLs (3/3)
+
+org.jahia.admin.patchmanagement.languagestates_17886=3DPrecalculate workfl=
ow states
=
org.jahia.admin.workInProgress.label =3DWork in progress, please wait
=
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=3D18606&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 Fri=
Sep 21 11:31:37 2007
@@ -488,6 +488,15 @@
org.jahia.admin.patchmanagement.failed.label =3D =C3=A9chec
org.jahia.admin.patchmanagement.available.label =3D Correctifs disponibles
org.jahia.admin.patchmanagement.install.label =3D installer
+org.jahia.admin.patchmanagement.ongoingInstall.label =3D Veuillez patiente=
r, les correctifs sont en cours d'installation. Cela peut prendre un certai=
n temps, suivant la taille de votre base de donn=C3=A9es. =
+
+org.jahia.admin.patchmanagement.sql =3D Executing SQL statements
+
+org.jahia.admin.patchmanagement.aclpatch_17886.updateAclIds=3DMise =C3=A0 =
jour des ACLs (1/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.pickersAcl=3DMise =C3=A0 jo=
ur des ACLs du Content Picker (2/3)
+org.jahia.admin.patchmanagement.aclpatch_17886.deleteAcl=3DSuppression des=
ACLs inutilis=C3=A9s(3/3)
+
+org.jahia.admin.patchmanagement.languagestates_17886=3DPrecalcul des =C3=
=A9tats de workflow
=
org.jahia.admin.refresh.label =3D Actualiser
org.jahia.admin.required.label =3D requis
Modified: trunk/core/src/java/org/jahia/admin/patches/ManagePatches.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/patches/ManagePatches.java&rev=3D18606&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/admin/patches/ManagePatches.java (origina=
l)
+++ trunk/core/src/java/org/jahia/admin/patches/ManagePatches.java Fri Sep =
21 11:31:37 2007
@@ -59,6 +59,8 @@
SortedMap availablePatches =3D VersionService.getInstance().getPat=
chesToInstall();
request.setAttribute("availablePatches",availablePatches);
=
+ request.setAttribute("isPatchesAvailable", Boolean.toString(!avail=
ablePatches.isEmpty()));
+
JahiaAdministration.doRedirect(request, response, request.getSessi=
on(),
JahiaAdministration.JSP_PATH + "patch_list.jsp");
}
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaVersionManag=
er.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaVersionManager.java&rev=3D18606&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/java/org/jahia/hibernate/manager/JahiaVersionManager.jav=
a (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaVersionManager.jav=
a Fri Sep 21 11:31:37 2007
@@ -37,8 +37,8 @@
jahiaVersionDao.save(v);
}
=
- public void createOldVersion(int number) {
- JahiaVersion v =3D new JahiaVersion(new Integer(number), null, nul=
l);
+ public void createOldVersion(int number, String release) {
+ JahiaVersion v =3D new JahiaVersion(new Integer(number), release, =
null);
jahiaVersionDao.save(v);
}
}
Modified: trunk/core/src/java/org/jahia/version/SqlPatcher.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/version/SqlPatcher.java&rev=3D18606&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/version/SqlPatcher.java (original)
+++ trunk/core/src/java/org/jahia/version/SqlPatcher.java Fri Sep 21 11:31:=
37 2007
@@ -46,13 +46,15 @@
}
=
public int execute(Patch patch) {
+ VersionService.getInstance().setSubStatus("org.jahia.admin.patchma=
nagement.sql");
Connection c =3D null;
Statement stmt =3D null;
try {
c =3D ConnectionDispenser.getConnection();
stmt =3D c.createStatement();
-
+ int count =3D 0;
List stmts =3D scriptHelper.getScriptFileStatements(patch.getF=
ile());
+ int total =3D stmts.size();
for (Iterator iterator =3D stmts.iterator(); iterator.hasNext(=
);) {
String line =3D (String) iterator.next();
try {
@@ -70,6 +72,8 @@
logger.warn("Error while trying to execute query :=
" + line, e);
}
}
+ count++;
+ VersionService.getInstance().setPercentCompleted(((double)=
count*100)/(double)total);
}
=
} catch (Exception e) {
Modified: trunk/core/src/java/org/jahia/version/VersionService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/version/VersionService.java&rev=3D18606&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/version/VersionService.java (original)
+++ trunk/core/src/java/org/jahia/version/VersionService.java Fri Sep 21 11=
:31:37 2007
@@ -1,15 +1,18 @@
package org.jahia.version;
=
+import org.jahia.bin.Jahia;
+import org.jahia.bin.JahiaInterface;
+import org.jahia.hibernate.cache.JahiaBatchingClusterCacheHibernateProvide=
r;
+import org.jahia.hibernate.manager.JahiaInstalledPatchManager;
import org.jahia.hibernate.manager.JahiaVersionManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.jahia.hibernate.manager.JahiaInstalledPatchManager;
import org.jahia.hibernate.model.JahiaVersion;
-import org.jahia.bin.Jahia;
-import org.jahia.bin.JahiaInterface;
import org.jahia.registries.ServicesRegistry;
=
-import java.util.*;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.*;
=
/**
* Created by IntelliJ IDEA.
@@ -28,7 +31,9 @@
=
private List patchers =3D new ArrayList();
=
- private Status status =3D new Status();
+ private List status =3D new ArrayList();
+
+ private SortedMap versions =3D new TreeMap(); =
=
public static VersionService getInstance() {
if (instance =3D=3D null) {
@@ -47,6 +52,16 @@
File dir =3D new File(Jahia.getSettings().getJahiaVarDiskPath() + =
File.separator + "patches");
addPatches(dir);
=
+ Properties v =3D new Properties();
+ try {
+ v.load(new FileInputStream(Jahia.getSettings().getJahiaVarDisk=
Path() + File.separator + "versions.properties"));
+ for (Iterator it =3D v.keySet().iterator(); it.hasNext();) {
+ String s =3D (String) it.next();
+ versions.put(new Integer(s), v.getProperty(s));
+ }
+ } catch (IOException e) {
+ e.printStackTrace(); =
+ }
}
=
private void addPatches(File dir) {
@@ -67,6 +82,7 @@
}
=
public boolean installAllPatches() {
+ status =3D new ArrayList();
Jahia.setMaintenance(true);
try {
List list =3D manager.getAllVersion();
@@ -76,10 +92,16 @@
for (Iterator iterator =3D patchesToInstall.keySet().itera=
tor(); iterator.hasNext();) {
Patch patch =3D (Patch) iterator.next();
Patcher patcher =3D (Patcher) patchesToInstall.get(pat=
ch);
- status.scriptName =3D patch.getName();
+ Status s =3D new Status();
+ s.scriptName =3D patch.getName();
+ status.add(s);
+
int result =3D patcher.execute(patch);
ServicesRegistry.getInstance().getCacheService().flush=
AllCaches();
- status.reset();
+ JahiaBatchingClusterCacheHibernateProvider.flushAllCac=
hes();
+
+ s.result =3D result;
+
if (result >=3D 0) {
patchManager.afterPatchInstallation(patch.getName(=
), result);
}
@@ -129,7 +151,14 @@
return false;
}
=
- manager.createOldVersion(buildNumber);
+ SortedMap headMap =3D versions.headMap(new Integer(buildNumber));
+ String s =3D null;
+
+ if (!headMap.isEmpty()) {
+ s =3D (String) headMap.get(headMap.lastKey());
+ }
+
+ manager.createOldVersion(buildNumber, s);
=
if (!manager.isCurrentBuildDefined()) {
manager.createVersion();
@@ -149,29 +178,19 @@
return results;
}
=
- public Status getStatus() {
+ public List getScriptsStatus() {
return status;
}
=
- public void setSubStatus(String v) {
- status.subStatus =3D v;
+ public Status getLastScriptStatus() {
+ return (Status) status.get(status.size()-1);
}
=
- public void setPercentCompleted(int i) {
- status.percentCompleted =3D i;
+ public void setSubStatus(String v) {
+ getLastScriptStatus().setSubStatus(v);
}
=
- class Status {
-
- String scriptName =3D null;
- String subStatus =3D null;
- int percentCompleted =3D 0;
-
- void reset() {
- status.scriptName =3D null;
- status.subStatus =3D null;
- status.percentCompleted =3D 0;
- }
+ public void setPercentCompleted(double d) {
+ getLastScriptStatus().setPercentCompleted(d);
}
-
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
