Author: tdraier
Date: Thu Sep 20 18:37:26 2007
New Revision: 18580
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18580&repname=
=3Djahia
Log:
fixed cosmetics in patch installer ( JAHIA-2330 ), do not refresh image eve=
ry time, do not display "null" message, wait 10s before displaying time eval
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/admin/PatchSt=
atusAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Status.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy=
/aclpatch_17886.groovy
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy=
/languagestates_17918.groovy
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/p=
atch_list.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/admin/P=
atchStatusAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/admin/PatchStatusAction.java&rev=3D185=
80&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/ajax/admin/PatchSt=
atusAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/admin/PatchSt=
atusAction.java Thu Sep 20 18:37:26 2007
@@ -14,7 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.NumberFormat;
+import java.text.DecimalFormat;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -57,19 +57,28 @@
buf.append("</result>");
} else {
buf.append("<substatus>");
- String subStatus =3D VersionService.getInstance().getL=
astScriptStatus().getSubStatus();
+ Status lastStatus =3D VersionService.getInstance().get=
LastScriptStatus();
+ String subStatus =3D lastStatus.getSubStatus();
String s =3D JahiaResourceBundle.getAdminResource(subS=
tatus, jParams, currentLocale);
if (s =3D=3D null) {
s =3D subStatus;
}
+ if (s =3D=3D null) {
+ s =3D " ";
+ }
buf.append(s);
buf.append("</substatus>\n");
buf.append("<completed>");
- buf.append(VersionService.getInstance().getLastScriptS=
tatus().getPercentCompleted());
+ buf.append(lastStatus.getPercentCompleted());
buf.append("</completed>\n");
buf.append("<remaining>");
- int i =3D VersionService.getInstance().getLastScriptSt=
atus().getRemainingTime();
- buf.append((i/3600)+":"+(i/60)%60+":"+(i%60));
+ if (lastStatus.getExecutionTime() > 10) {
+ DecimalFormat df =3D new DecimalFormat("00");
+ int i =3D lastStatus.getRemainingTime();
+ buf.append(df.format(i/3600)+":"+df.format((i/60)%=
60)+":"+df.format(i%60));
+ } else {
+ buf.append("...");
+ }
buf.append("</remaining>\n");
}
buf.append("</script>\n");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Stat=
us.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/version/Status.java&rev=3D18580&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Status.jav=
a (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Status.jav=
a Thu Sep 20 18:37:26 2007
@@ -29,6 +29,7 @@
percentCompleted =3D 0.d;
percentTimeUnit =3D 0.d;
count =3D 0;
+ start =3D System.currentTimeMillis();
}
=
public int getPercentCompleted() {
@@ -41,6 +42,10 @@
count++;
}
=
+ public int getExecutionTime() {
+ return (int) ((System.currentTimeMillis()-start) / 1000);
+ }
+
public int getRemainingTime() {
return (int) (percentTimeUnit * (100.-percentCompleted)) / 1000;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/=
groovy/aclpatch_17886.groovy
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy/aclpatch_17886.groovy&re=
v=3D18580&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/var/patches/groovy=
/aclpatch_17886.groovy (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy=
/aclpatch_17886.groovy Thu Sep 20 18:37:26 2007
@@ -148,6 +148,7 @@
rs.next();
=
MyStatus.total =3D rs.getInt(1);
+MyStatus.pageCount =3D 0;
=
VersionService.getInstance().setSubStatus("org.jahia.admin.patchmanagement=
.aclpatch_17886.updateAclIds");
=
@@ -162,6 +163,7 @@
rs.next();
=
MyStatus.total =3D rs.getInt(1);
+MyStatus.pageCount =3D 0;
=
VersionService.getInstance().setSubStatus("org.jahia.admin.patchmanagement=
.aclpatch_17886.pickersAcl");
=
@@ -169,6 +171,7 @@
=
VersionService.getInstance().setSubStatus("org.jahia.admin.patchmanagement=
.aclpatch_17886.deleteAcl");
MyStatus.total =3D toDelete.size();
+MyStatus.pageCount =3D 0;
PreparedStatement delete =3D connection.prepareStatement("delete from jahi=
a_acl where id_jahia_acl=3D?")
=
Iterator iterator =3D toDelete.iterator();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/=
groovy/languagestates_17918.groovy
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy/languagestates_17918.gro=
ovy&rev=3D18580&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/var/patches/groovy=
/languagestates_17918.groovy (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/patches/groovy=
/languagestates_17918.groovy Thu Sep 20 18:37:26 2007
@@ -37,6 +37,7 @@
ResultSet rs =3D st.executeQuery("SELECT count( DISTINCT id_jahia_pages_da=
ta ) FROM jahia_pages_data");
rs.next();
MyStatus.total =3D rs.getInt(1);
+MyStatus.pageCount =3D 0;
connection.close();
=
Enumeration en =3D ServicesRegistry.getInstance().getJahiaSitesService().g=
etSites();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/patch_list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/patch_list.jsp&rev=3D18580=
&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/jsp/jahia/administration/p=
atch_list.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/p=
atch_list.jsp Thu Sep 20 18:37:26 2007
@@ -22,6 +22,7 @@
=
freqCall =3D 1;
watchcount =3D 0;
+ var results =3D new Array();
=
function getElementValueFromXmlDoc(xdoc,id,def){
if(!xdoc || !xdoc.getElementsByTagName(id)) return def;
@@ -37,14 +38,27 @@
var xdoc =3D tr.responseXML;
var elements =3D xdoc.getElementsByTagName("script");
for (i=3D0; i<elements.length; i++) {
- divElement =3D document.getElementById( getElementValueFro=
mXmlDoc(elements[i],"name","") );
var result =3D getElementValueFromXmlDoc(elements[i],"resu=
lt",'-1');
+ var divElementIcon =3D document.getElementById( getElement=
ValueFromXmlDoc(elements[i],"name","")+"Icon" );
+ var divElementStatus =3D document.getElementById( getEleme=
ntValueFromXmlDoc(elements[i],"name","")+"Status" );
+
+ if (result !=3D results[i]) {
+ if (result=3D=3D-1) {
+ divElementIcon.src=3D"<%=3Drequest.getContextPath(=
)%>/jsp/jahia/engines/images/waiting.gif";
+ } else if (result=3D=3D0) {
+ divElementIcon.src=3D"<%=3Drequest.getContextPath(=
)%>/jsp/jahia/engines/images/icons/workflow/accept.gif";
+ } else {
+ divElementIcon.src=3D"<%=3Drequest.getContextPath(=
)%>/jsp/jahia/engines/images/icons/workflow/errors.gif";
+ }
+ results[i] =3D result;
+ }
+
if (result=3D=3D-1) {
- divElement.innerHTML =3D '<img src=3D"<%=3Drequest.get=
ContextPath()%>/jsp/jahia/engines/images/waiting.gif"> ' + getElementV=
alueFromXmlDoc(elements[i],"substatus","") + " - " + getElementValueFromXml=
Doc(elements[i],"completed",'0') + "% ( "+ getElementValueFromXmlDoc(elemen=
ts[i],"remaining",'0') + " )";
+ divElementStatus.innerHTML =3D getElementValueFromXmlD=
oc(elements[i],"substatus","") + " - " + getElementValueFromXmlDoc(elements=
[i],"completed",'0') + "% ( "+ getElementValueFromXmlDoc(elements[i],"remai=
ning",'0') + " )";
} else if (result=3D=3D0) {
- divElement.innerHTML =3D '<img src=3D"<%=3Drequest.get=
ContextPath()%>/jsp/jahia/engines/images/icons/workflow/accept.gif"> <=
jahia:adminResourceBundle resourceName=3D"org.jahia.admin.patchmanagement.s=
uccess.label"/>';
+ divElementStatus.innerHTML =3D '<jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.patchmanagement.success.label"/>';
} else {
- divElement.innerHTML =3D '<img src=3D"<%=3Drequest.get=
ContextPath()%>/jsp/jahia/engines/images/icons/workflow/errors.gif"> <=
jahia:adminResourceBundle resourceName=3D"org.jahia.admin.patchmanagement.f=
ailed.label"/>';
+ divElementStatus.innerHTML =3D '<jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.patchmanagement.failed.label"/>';
}
}
}
@@ -138,7 +152,7 @@
<th>
<jahia:adminResourceBundle resourceName=3D"org=
.jahia.admin.patchmanagement.patchName.label"/>
</th>
- <th>
+ <th colspan=3D"2">
<jahia:adminResourceBundle resourceName=3D"org=
.jahia.admin.patchmanagement.status.label"/>
</th>
</tr>
@@ -146,7 +160,7 @@
<c:forEach items=3D"${availablePatches}" var=3D"patch" var=
Status=3D"patchStatus">
<tr class=3D"<c:if test=3D'${patchStatus.index % 2 =3D=
=3D 0}'>oddLine</c:if>">
<td><c:out value=3D"${patch.key.name}"/></td>
- <td><div id=3D"<c:out value=3D'${patch.key.name}'/=
>"> </div></td>
+ <td><img id=3D"<c:out value=3D'${patch.key.name}'/=
>Icon" /></td><td><div id=3D"<c:out value=3D'${patch.key.name}'/>Status"></=
div></div><div id=3D"<c:out value=3D'${patch.key.name}'/>Percent"></div></t=
d>
</tr>
</c:forEach>
</table>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
