From d61e65f82c936e5dc986e4f850d4a5998b9caa2d Mon Sep 17 00:00:00 2001
From: evernat <evernat@free.fr>
Date: Wed, 12 Apr 2017 16:48:57 +0200
Subject: [PATCH] display webapp version at the top and display drop-down to
 choose period based on webapp versions

---
 .../java/net/bull/javamelody/Collector.java   |  90 +++++++++++++
 .../net/bull/javamelody/FilterContext.java    |   1 +
 .../net/bull/javamelody/HtmlCoreReport.java   | 119 ++++++++++++++++--
 .../net/bull/javamelody/JavaInformations.java |   7 ++
 .../net/bull/javamelody/MavenArtifact.java    |  32 +++++
 .../java/net/bull/javamelody/Parameter.java   |   5 +
 .../resource/translations.properties          |   2 +
 .../resource/translations_de.properties       |   2 +
 .../resource/translations_fr.properties       |   2 +
 .../resource/translations_pt.properties       |   2 +
 .../resource/translations_zh.properties       |   3 +
 11 files changed, 254 insertions(+), 11 deletions(-)

diff --git a/javamelody-core/src/main/java/net/bull/javamelody/Collector.java b/javamelody-core/src/main/java/net/bull/javamelody/Collector.java
index 5298e54ef..d04ecd194 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/Collector.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/Collector.java
@@ -18,7 +18,13 @@
 package net.bull.javamelody;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
@@ -28,7 +34,9 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.bull.javamelody.Counter.CounterRequestContextComparator;
@@ -39,7 +47,10 @@
  * @author Emeric Vernat
  */
 class Collector { // NOPMD
+	private static final String VERSIONS_FILENAME = "versions.properties";
+	private static final String VERSIONS_DATE_PATTERN = "yyyy/MM/dd";
 	private static final long NOT_A_NUMBER = Long.MIN_VALUE;
+
 	// période entre 2 collectes en milli-secondes
 	private final int periodMillis;
 	private final String application;
@@ -68,6 +79,10 @@ class Collector { // NOPMD
 	private Date lastDateOfDeletedObsoleteFiles = new Date();
 	private boolean stopped;
 	private final boolean noDatabase = Parameters.isNoDatabase();
+	/**
+	 * Les versions de l'applications avec pour chacune la date de déploiement.
+	 */
+	private final Map<String, Date> datesByWebappVersions;
 
 	/**
 	 * Constructeur.
@@ -122,6 +137,8 @@ class Collector { // NOPMD
 			LOG.warn("exception while reading counters data from files in "
 					+ Parameters.getStorageDirectory(application), e);
 		}
+
+		datesByWebappVersions = readDatesByWebappVersions();
 	}
 
 	/**
@@ -147,6 +164,10 @@ List<SampledMethod> getHotspots() {
 		return samplingProfiler.getHotspots(1000);
 	}
 
+	Map<String, Date> getDatesByWebappVersions() {
+		return Collections.unmodifiableMap(datesByWebappVersions);
+	}
+
 	/**
 	 * @return La liste des counters de ce collector
 	 */
@@ -348,6 +369,14 @@ private long collect(List<JavaInformations> javaInformationsList) throws IOExcep
 				}
 			}
 
+			if (!javaInformationsList.isEmpty()) {
+				final String webappVersion = javaInformationsList.get(0).getWebappVersion();
+				if (webappVersion != null && !datesByWebappVersions.containsKey(webappVersion)) {
+					addWebappVersion(webappVersion);
+					datesByWebappVersions.put(webappVersion, new Date());
+				}
+			}
+
 			return memorySize;
 		}
 	}
@@ -917,6 +946,67 @@ private Collection<JRobin> getDisplayedJRobins(Collection<JRobin> jrobins) {
 		return Collections.unmodifiableCollection(displayedJRobins);
 	}
 
+	@SuppressWarnings("unchecked")
+	private Map<String, Date> readDatesByWebappVersions() {
+		final Map<String, Date> result = new HashMap<String, Date>();
+		final File storageDirectory = Parameters.getStorageDirectory(application);
+		final File versionsFile = new File(storageDirectory, VERSIONS_FILENAME);
+		if (versionsFile.exists()) {
+			final Properties versionsProperties = new Properties();
+			try {
+				final InputStream input = new FileInputStream(versionsFile);
+				try {
+					versionsProperties.load(input);
+				} finally {
+					input.close();
+				}
+				final List<String> propertyNames = (List<String>) Collections
+						.list(versionsProperties.propertyNames());
+				final SimpleDateFormat dateFormat = new SimpleDateFormat(VERSIONS_DATE_PATTERN,
+						Locale.US);
+				for (final String version : propertyNames) {
+					try {
+						final Date date = dateFormat.parse(versionsProperties.getProperty(version));
+						result.put(version, date);
+					} catch (final ParseException e) {
+						continue;
+					}
+				}
+			} catch (final IOException e) {
+				// lecture échouée, tant pis
+				LOG.warn("exception while reading versions in " + versionsFile, e);
+			}
+		}
+		return result;
+	}
+
+	private void addWebappVersion(String webappVersion) throws IOException {
+		assert webappVersion != null && !webappVersion.isEmpty();
+		final File storageDirectory = Parameters.getStorageDirectory(application);
+		final File versionsFile = new File(storageDirectory, VERSIONS_FILENAME);
+		final Properties versionsProperties = new Properties();
+		if (versionsFile.exists()) {
+			final InputStream input = new FileInputStream(versionsFile);
+			try {
+				versionsProperties.load(input);
+			} finally {
+				input.close();
+			}
+		}
+		assert versionsProperties.getProperty(webappVersion) == null;
+
+		final SimpleDateFormat dateFormat = new SimpleDateFormat(VERSIONS_DATE_PATTERN, Locale.US);
+		versionsProperties.setProperty(webappVersion, dateFormat.format(new Date()));
+
+		final OutputStream output = new FileOutputStream(versionsFile);
+		try {
+			versionsProperties.store(output, "Application deployments with versions and dates");
+		} finally {
+			output.close();
+		}
+		LOG.debug("New application version added: " + webappVersion);
+	}
+
 	/**
 	 * Purge les données pour un compteur à partir de son nom.
 	 * @param counterName Nom du compteur
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/FilterContext.java b/javamelody-core/src/main/java/net/bull/javamelody/FilterContext.java
index c4d6825bf..863c79a76 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/FilterContext.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/FilterContext.java
@@ -335,6 +335,7 @@ private void logSystemInformationsAndParameters() {
 			LOG.debug("JavaMelody classes loaded from: " + location);
 		}
 		LOG.debug("Application type: " + applicationType);
+		LOG.debug("Application version: " + MavenArtifact.getWebappVersion());
 		LOG.debug("Host: " + Parameters.getHostName() + '@' + Parameters.getHostAddress());
 		for (final Parameter parameter : Parameter.values()) {
 			final String value = Parameters.getParameter(parameter);
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/HtmlCoreReport.java b/javamelody-core/src/main/java/net/bull/javamelody/HtmlCoreReport.java
index 661cc4dc9..489a18f40 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/HtmlCoreReport.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/HtmlCoreReport.java
@@ -22,7 +22,11 @@
 import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -48,16 +52,49 @@ class HtmlCoreReport extends HtmlAbstractReport {
 	private final long start = System.currentTimeMillis();
 	private final Map<String, String> menuTextsByAnchorName = new LinkedHashMap<String, String>();
 
+	private static class MapValueComparator<K, V extends Comparable<V>>
+			implements Comparator<Map.Entry<K, V>> {
+		MapValueComparator() {
+			super();
+		}
+
+		@Override
+		public int compare(Map.Entry<K, V> o1, Map.Entry<K, V> o2) {
+			return o1.getValue().compareTo(o2.getValue());
+		}
+	}
+
 	private static class HtmlForms extends HtmlAbstractReport {
+		private static final Comparator<Map.Entry<String, Date>> MAP_VALUE_COMPARATOR = Collections
+				.reverseOrder(new MapValueComparator<String, Date>());
+
 		HtmlForms(Writer writer) {
 			super(writer);
 		}
 
-		void writeCustomPeriodLink(Range range, String graphName, String part) throws IOException {
+		void writeCustomPeriodLinks(Map<String, Date> datesByWebappVersions, Range currentRange,
+				String graphName, String part) throws IOException {
 			writeln("<a href=\"javascript:showHide('customPeriod');document.customPeriodForm.startDate.focus();\" ");
-			final String linkLabel = getString("personnalisee");
-			writeln("title='" + getFormattedString("Choisir_periode", linkLabel) + "'>");
+			writeln("title='" + getFormattedString("Choisir_periode", getString("personnalisee"))
+					+ "'>");
 			writeln("<img src='?resource=calendar.png' alt='#personnalisee#' /> #personnalisee#</a>");
+
+			if (!datesByWebappVersions.isEmpty()) {
+				writeln("&nbsp;<a href=\"javascript:showHide('deploymentPeriod');\" ");
+				writeln("title='"
+						+ getFormattedString("Choisir_periode", getString("par_deploiement"))
+						+ "'>");
+				writeln("<img src='?resource=calendar.png' alt='#par_deploiement#' /> #par_deploiement#</a>");
+			}
+
+			writeCustomPeriodDiv(currentRange, graphName, part);
+			if (!datesByWebappVersions.isEmpty()) {
+				writeDeploymentPeriodDiv(datesByWebappVersions, currentRange, graphName, part);
+			}
+		}
+
+		private void writeCustomPeriodDiv(Range currentRange, String graphName, String part)
+				throws IOException {
 			writeln("<div id='customPeriod' style='display: none;'>");
 			writeln(SCRIPT_BEGIN);
 			writeln("function validateCustomPeriodForm() {");
@@ -80,12 +117,12 @@ void writeCustomPeriodLink(Range range, String graphName, String part) throws IO
 			}
 			writeln("<form name='customPeriodForm' method='get' action='' onsubmit='return validateCustomPeriodForm();'>");
 			writeln("<br/><b>#startDate#</b>&nbsp;&nbsp;<input type='text' size='10' name='startDate' ");
-			if (range.getStartDate() != null) {
-				writeln("value='" + dateFormat.format(range.getStartDate()) + '\'');
+			if (currentRange.getStartDate() != null) {
+				writeln("value='" + dateFormat.format(currentRange.getStartDate()) + '\'');
 			}
 			writeln("/>&nbsp;&nbsp;<b>#endDate#</b>&nbsp;&nbsp;<input type='text' size='10' name='endDate' ");
-			if (range.getEndDate() != null) {
-				writeln("value='" + dateFormat.format(range.getEndDate()) + '\'');
+			if (currentRange.getEndDate() != null) {
+				writeln("value='" + dateFormat.format(currentRange.getEndDate()) + '\'');
 			}
 			writeln("/>&nbsp;&nbsp;");
 			writeDirectly('(' + dateFormatPattern + ')');
@@ -99,6 +136,54 @@ void writeCustomPeriodLink(Range range, String graphName, String part) throws IO
 			writeln(END_DIV);
 		}
 
+		private void writeDeploymentPeriodDiv(Map<String, Date> datesByWebappVersions,
+				Range currentRange, String graphName, String part) throws IOException {
+			writeln("<div id='deploymentPeriod' style='display: none;'>");
+			writeln("<br/>");
+			final DateFormat dateFormat = I18N.createDateFormat();
+			final String currentRangeValue = currentRange.getValue();
+			final String startDateLabel = I18N.getString("startDate")
+					.toLowerCase(I18N.getCurrentLocale());
+			final String endDateLabel = I18N.getString("endDate");
+			writeln("<form name='deploymentPeriodForm' method='get' action=''>");
+			writeln("<br/><b>#Version#</b>&nbsp;&nbsp;");
+			writeln("<select name='period' onchange='document.deploymentPeriodForm.submit();'>");
+			writeDirectly("<option>&nbsp;</option>");
+			// on doit retrier les versions ici, notamment s'il y en a une ajoutée à la fin
+			final List<Map.Entry<String, Date>> orderedVersionsByDate = new ArrayList<Map.Entry<String, Date>>(
+					datesByWebappVersions.entrySet());
+			Collections.sort(orderedVersionsByDate, MAP_VALUE_COMPARATOR);
+			String previousDate = null;
+			for (final Map.Entry<String, Date> entry : orderedVersionsByDate) {
+				final String version = entry.getKey();
+				final String date = dateFormat.format(entry.getValue());
+				final String label;
+				if (previousDate == null) {
+					previousDate = dateFormat.format(new Date());
+					label = version + ' ' + startDateLabel + ' ' + date;
+				} else {
+					label = version + ' ' + startDateLabel + ' ' + date + ' ' + endDateLabel + ' '
+							+ previousDate;
+				}
+				final String rangeValue = date + Range.CUSTOM_PERIOD_SEPARATOR + previousDate;
+				writeDirectly("<option value='" + rangeValue + "'");
+				if (rangeValue.equals(currentRangeValue)) {
+					writeDirectly(" selected='selected'");
+				}
+				writeDirectly(">");
+				writeDirectly(htmlEncodeButNotSpace(label));
+				writeDirectly("</option>");
+				previousDate = date;
+			}
+			writeln("</select><br/><br/>");
+			if (graphName != null) {
+				writeln("<input type='hidden' name='part' value='" + part + "'/>");
+				writeln("<input type='hidden' name='graph' value='" + urlEncode(graphName) + "'/>");
+			}
+			writeln("</form><br/>");
+			writeln(END_DIV);
+		}
+
 		void writeAddAndRemoveApplicationLinks(String currentApplication) throws IOException {
 			if (currentApplication == null) {
 				writeln("<div align='center'><h3>#add_application#</h3>");
@@ -265,9 +350,19 @@ private void writeSummary() throws IOException {
 			writeDirectly(getFormattedString("Statistiques_sans_depuis", javaMelodyUrl,
 					I18N.getCurrentDateAndTime(), collector.getApplication()));
 		}
-		if (javaInformationsList.get(0).getContextDisplayName() != null) {
-			writeDirectly(htmlEncodeButNotSpace(
-					" (" + javaInformationsList.get(0).getContextDisplayName() + ')'));
+		final String contextDisplayName = javaInformationsList.get(0).getContextDisplayName();
+		final String webappVersion = javaInformationsList.get(0).getWebappVersion();
+		if (contextDisplayName != null) {
+			writeDirectly(" (");
+			writeDirectly(htmlEncodeButNotSpace(contextDisplayName));
+			if (webappVersion != null) {
+				writeDirectly(", " + htmlEncodeButNotSpace(webappVersion));
+			}
+			writeDirectly(")");
+		} else if (webappVersion != null) {
+			writeDirectly(" (");
+			writeDirectly(htmlEncodeButNotSpace(webappVersion));
+			writeDirectly(")");
 		}
 		writeln("");
 	}
@@ -889,7 +984,9 @@ void writeRefreshAndPeriodLinks(String graphName, String part) throws IOExceptio
 					+ myPeriod.getLinkLabel() + "' /> ");
 			writeln(myPeriod.getLinkLabel() + "</a>&nbsp;");
 		}
-		new HtmlForms(getWriter()).writeCustomPeriodLink(range, graphName, part);
+		final HtmlForms htmlForms = new HtmlForms(getWriter());
+		final Map<String, Date> datesByWebappVersions = collector.getDatesByWebappVersions();
+		htmlForms.writeCustomPeriodLinks(datesByWebappVersions, range, graphName, part);
 
 		writeln(END_DIV);
 	}
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java b/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java
index d1668904a..eaeeca58c 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/JavaInformations.java
@@ -77,6 +77,7 @@ class JavaInformations implements Serializable { // NOPMD
 	private final String serverInfo;
 	private final String contextPath;
 	private final String contextDisplayName;
+	private final String webappVersion;
 	private final Date startDate;
 	private final String jvmArguments;
 	private final long freeDiskSpaceInTemp;
@@ -157,10 +158,12 @@ public int compare(JobInformations job1, JobInformations job2) {
 			serverInfo = null;
 			contextPath = null;
 			contextDisplayName = null;
+			webappVersion = null;
 		} else {
 			serverInfo = servletContext.getServerInfo();
 			contextPath = Parameters.getContextPath(servletContext);
 			contextDisplayName = servletContext.getServletContextName();
+			webappVersion = MavenArtifact.getWebappVersion();
 		}
 		startDate = START_DATE;
 		jvmArguments = buildJvmArguments();
@@ -590,6 +593,10 @@ String getContextDisplayName() {
 		return contextDisplayName;
 	}
 
+	String getWebappVersion() {
+		return webappVersion;
+	}
+
 	Date getStartDate() {
 		return startDate;
 	}
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/MavenArtifact.java b/javamelody-core/src/main/java/net/bull/javamelody/MavenArtifact.java
index ca2e78706..f630e3573 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/MavenArtifact.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/MavenArtifact.java
@@ -65,6 +65,8 @@ final class MavenArtifact implements Serializable { // NOPMD
 
 	private static Map<String, String> sourceFilePathsByJarFileNames;
 
+	private static String webappVersion;
+
 	private String name;
 	private String url;
 	private String groupId;
@@ -435,6 +437,36 @@ static InputStream getWebappPomXmlAsStream() {
 		return getWebappPomFile("pom.xml");
 	}
 
+	static synchronized String getWebappVersion() {
+		if (webappVersion == null) {
+			webappVersion = Parameters.getParameter(Parameter.APPLICATION_VERSION);
+			if (webappVersion == null) {
+				final InputStream input = getWebappPomFile("pom.properties");
+				if (input != null) {
+					try {
+						try {
+							final Properties properties = new Properties();
+							properties.load(input);
+							webappVersion = properties.getProperty("version");
+						} finally {
+							input.close();
+						}
+					} catch (final IOException e) {
+						LOG.debug(e.toString(), e);
+					}
+				}
+				if (webappVersion == null) {
+					// remember that the webapp version can't be found
+					webappVersion = "";
+				}
+			}
+		}
+		if (webappVersion.isEmpty()) {
+			return null;
+		}
+		return webappVersion;
+	}
+
 	private static InputStream getWebappPomFile(String pomFilename) {
 		final Set<?> mavenDir = Parameters.getServletContext().getResourcePaths("/META-INF/maven/");
 		if (mavenDir == null || mavenDir.isEmpty()) {
diff --git a/javamelody-core/src/main/java/net/bull/javamelody/Parameter.java b/javamelody-core/src/main/java/net/bull/javamelody/Parameter.java
index b9532ae7c..ae87c704c 100644
--- a/javamelody-core/src/main/java/net/bull/javamelody/Parameter.java
+++ b/javamelody-core/src/main/java/net/bull/javamelody/Parameter.java
@@ -325,6 +325,11 @@ public enum Parameter {
 	 */
 	APPLICATION_NAME("application-name"),
 
+	/**
+	 * Explicit version of the monitored application (to override the version from Maven files for example).
+	 */
+	APPLICATION_VERSION("application-version"),
+
 	/**
 	 * Comma separated list of Maven repositories URLs (https://repo1.maven.org/maven2/ by default).
 	 */
diff --git a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations.properties b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations.properties
index 5defffa92..fcbb01f7b 100644
--- a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations.properties
+++ b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations.properties
@@ -67,6 +67,7 @@ startDate=From
 endDate=to
 dateFormatPattern=
 ok=OK
+Version=Version
 graph_units=The units of the values are "m" for milli (1 / 1000), "k" for kilo/thousands, "M" for mega/millions, "G" for giga/billions and "u" for micro (1 / 1000000)
 hide_maximum=Hide maximum
 
@@ -312,6 +313,7 @@ mois_link_label=Month
 annee_link_label=Year
 tout_link_label=All
 personnalisee=Customized
+par_deploiement=By deployment
 
 # JRobin
 Moyenne=Mean
diff --git a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_de.properties b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_de.properties
index 8559de346..a9f3a9ecd 100644
--- a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_de.properties
+++ b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_de.properties
@@ -67,6 +67,7 @@ startDate=von
 endDate=bis
 dateFormatPattern=tt.mm.jj
 ok=OK
+Version=Version
             
 graph_units=Die Einheiten der Werte sind "m" für milli (1 / 1000), "k" für kilo/thousands, "M" für mega/millions, "G" für giga/billions und "u" für micro (1 / 1000000)
 hide_maximum=Maximale verbergen
@@ -313,6 +314,7 @@ mois_link_label=Monat
 annee_link_label=Jahr
 tout_link_label=Alle
 personnalisee=Benutzerdefiniert
+par_deploiement=By deployment
 
 # JRobin
 Moyenne=Mittel
diff --git a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_fr.properties b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_fr.properties
index bcdbd04ab..d62809cbb 100644
--- a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_fr.properties
+++ b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_fr.properties
@@ -67,6 +67,7 @@ startDate=De
 endDate=à
 dateFormatPattern=jj/mm/aa
 ok=OK
+Version=Version
 graph_units=Les unités des valeurs sont "m" pour millièmes (1 / 1000), "k" pour kilo/milliers, "M" pour méga/millions, "G" pour giga/milliards et "u" pour micro (1 / 1000000)
 hide_maximum=Cacher maximum
 
@@ -312,6 +313,7 @@ mois_link_label=Mois
 annee_link_label=Année
 tout_link_label=Tout
 personnalisee=Personnalisée
+par_deploiement=Par déploiement
 
 # JRobin
 Moyenne=Moyenne
diff --git a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_pt.properties b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_pt.properties
index a59f25bfb..d0ae38f21 100644
--- a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_pt.properties
+++ b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_pt.properties
@@ -71,6 +71,7 @@ startDate=a partir de
 endDate=até
 dateFormatPattern=
 ok=OK
+Version=Version
 graph_units=A unidade dos valores são: "m" para milissegundos (1 / 1000), "k" para kilo/milhares, "M" para mega/milhões, "G" for giga/bilhões e "u" para micro (1 / 1000000)
 hide_maximum=Esconder ao máximo
 
@@ -316,6 +317,7 @@ mois_link_label=M
 annee_link_label=Ano
 tout_link_label=Todos
 personnalisee=Personalizado
+par_deploiement=By deployment
 
 # JRobin
 Moyenne=Média
diff --git a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_zh.properties b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_zh.properties
index d24221bd2..d85bebcda 100644
--- a/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_zh.properties
+++ b/javamelody-core/src/main/resources/net/bull/javamelody/resource/translations_zh.properties
@@ -927,3 +927,6 @@ Licence=License
 # HtmlSpringContextReport
 Spring_beans = Spring beans
 nb_beans = {0} beans
+
+Version=Version
+par_deploiement=By deployment