Author: brett
Date: Mon Oct 22 06:02:47 2007
New Revision: 587079
URL: http://svn.apache.org/viewvc?rev=587079&view=rev
Log:
[MRM-559] fix version setting
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java?rev=587079&r1=587078&r2=587079&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
Mon Oct 22 06:02:47 2007
@@ -34,18 +34,22 @@
*/
public class ArchivaVersion
{
- public static String VERSION = "Unknown";
-
+ private static String version = null;
+
+ private ArchivaVersion()
+ {
+ }
+
public static String determineVersion( ClassLoader cloader )
{
- if ( VERSION != null )
+ if ( version != null )
{
- return VERSION;
+ return version;
}
/* This is the search order of modules to find the version.
*/
- String modules[] = new String[] {
+ String[] modules = new String[] {
"archiva-common",
"archiva-configuration",
"archiva-database",
@@ -83,8 +87,8 @@
String version = props.getProperty( "version" );
if ( StringUtils.isNotBlank( version ) )
{
- VERSION = version;
- return VERSION;
+ ArchivaVersion.version = version;
+ return this.version;
}
}
catch ( IOException e )
@@ -94,12 +98,17 @@
}
}
- return VERSION;
+ version = "<Unknown Version>";
+ return version;
}
private static URL findModulePom( ClassLoader cloader, String module )
{
- URL ret = cloader.getResource(
"/META-INF/maven/org.apache.maven.archiva/" + module + "/pom.properties" );
- return ret;
+ return cloader.getResource(
"/META-INF/maven/org.apache.maven.archiva/" + module + "/pom.properties" );
+ }
+
+ public static String getVersion()
+ {
+ return version;
}
}
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=587079&r1=587078&r2=587079&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Mon Oct 22 06:02:47 2007
@@ -24,8 +24,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
-<%@ page import="java.util.Calendar" %>
<%@ page import="org.apache.maven.archiva.web.startup.ArchivaVersion" %>
+<%@ page import="java.util.Calendar" %>
<html>
<head>
@@ -176,7 +176,7 @@
%>
<div id="footer">
<div class="xleft">
- Apache Archiva <%= ArchivaVersion.VERSION %>
+ Apache Archiva <%= ArchivaVersion.getVersion() %>
</div>
<div class="xright">
Copyright © <%= copyrightRange %> Apache Software Foundation
