it changes the version and add it to NavalPlan interface.
FEA : ItEr65S03NavalPlanVersionItEr64S08
This commit is contained in:
parent
7e8b13734c
commit
4bf30c6c2f
7 changed files with 74 additions and 7 deletions
|
|
@ -6,7 +6,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>navalplanner</artifactId>
|
<artifactId>navalplanner</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>0.9.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>ganttzk</artifactId>
|
<artifactId>ganttzk</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>navalplanner</artifactId>
|
<artifactId>navalplanner</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>0.9.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>navalplanner-business</artifactId>
|
<artifactId>navalplanner-business</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
/*
|
||||||
|
* This file is part of NavalPlan
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Wireless Galicia S.L.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.navalplanner.business.common;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It contains the current version of project and implements of singleton
|
||||||
|
* pattern.
|
||||||
|
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
|
||||||
|
*/
|
||||||
|
public class VersionInformation {
|
||||||
|
|
||||||
|
private static final VersionInformation singleton = new VersionInformation();
|
||||||
|
|
||||||
|
private String projectVersion;
|
||||||
|
|
||||||
|
private VersionInformation() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VersionInformation getInstance() {
|
||||||
|
return singleton;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It returns the current version of the project for retrieval at any place.
|
||||||
|
*/
|
||||||
|
public static String getVersion() {
|
||||||
|
return singleton.getProjectVersion();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getProjectVersion() {
|
||||||
|
return projectVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProjectVersion(String argVersion) {
|
||||||
|
projectVersion = argVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -127,6 +127,15 @@
|
||||||
class="org.navalplanner.business.orders.entities.CriterionRequirementOrderElementHandler"
|
class="org.navalplanner.business.orders.entities.CriterionRequirementOrderElementHandler"
|
||||||
factory-method="getInstance" />
|
factory-method="getInstance" />
|
||||||
|
|
||||||
|
<bean id="versionInformation"
|
||||||
|
class="org.navalplanner.business.common.VersionInformation"
|
||||||
|
factory-method="getInstance"
|
||||||
|
lazy-init="false">
|
||||||
|
<property name="projectVersion">
|
||||||
|
<value>${project.version}</value>
|
||||||
|
</property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
<bean id="scenarioManager"
|
<bean id="scenarioManager"
|
||||||
class="org.navalplanner.business.scenarios.OnlyMainScenarioAwareManager"
|
class="org.navalplanner.business.scenarios.OnlyMainScenarioAwareManager"
|
||||||
scope="singleton"/>
|
scope="singleton"/>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>navalplanner</artifactId>
|
<artifactId>navalplanner</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>0.9.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>navalplanner-webapp</artifactId>
|
<artifactId>navalplanner-webapp</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,9 @@
|
||||||
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
|
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
|
||||||
<?link rel="stylesheet" type="text/css" href="/common/css/login.css"?>
|
<?link rel="stylesheet" type="text/css" href="/common/css/login.css"?>
|
||||||
|
|
||||||
|
<?xel-method prefix="project" name="version" class="org.navalplanner.business.common.VersionInformation"
|
||||||
|
signature="java.lang.String getVersion()"?>
|
||||||
|
|
||||||
<div xmlns:n="http://www.zkoss.org/2005/zk/native">
|
<div xmlns:n="http://www.zkoss.org/2005/zk/native">
|
||||||
|
|
||||||
<zscript>
|
<zscript>
|
||||||
|
|
@ -110,7 +113,7 @@
|
||||||
</n:tr>
|
</n:tr>
|
||||||
<n:tr>
|
<n:tr>
|
||||||
<n:td><n:span class="supported-browsers">${i18n:_('Supported Chrome, Firefox, Safari and Epiphany browsers')}</n:span>
|
<n:td><n:span class="supported-browsers">${i18n:_('Supported Chrome, Firefox, Safari and Epiphany browsers')}</n:span>
|
||||||
<n:div class="navalplan-version">v1.0</n:div></n:td>
|
<n:div style="float:right;color:green;font-size:10px;">v${project:version()}</n:div></n:td>
|
||||||
</n:tr>
|
</n:tr>
|
||||||
<n:tr>
|
<n:tr>
|
||||||
<n:td height="100"><div align="right"><n:img src="${contextPath}/common/img/logos_footer.gif" width="475" height="40" /></div></n:td>
|
<n:td height="100"><div align="right"><n:img src="${contextPath}/common/img/logos_footer.gif" width="475" height="40" /></div></n:td>
|
||||||
|
|
|
||||||
6
pom.xml
6
pom.xml
|
|
@ -5,7 +5,7 @@
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>navalplanner</artifactId>
|
<artifactId>navalplanner</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.0.0</version>
|
<version>0.9.0</version>
|
||||||
<name>NavalPlan</name>
|
<name>NavalPlan</name>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|
@ -471,13 +471,13 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>ganttzk</artifactId>
|
<artifactId>ganttzk</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- NavalPlan Business -->
|
<!-- NavalPlan Business -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.navalplanner</groupId>
|
<groupId>org.navalplanner</groupId>
|
||||||
<artifactId>navalplanner-business</artifactId>
|
<artifactId>navalplanner-business</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dbunit</groupId>
|
<groupId>org.dbunit</groupId>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue