You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/20 00:21:59 UTC
svn commit: r586630 - in
/maven/archiva/trunk/archiva-web/archiva-webapp/src/main:
java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
webapp/WEB-INF/jsp/decorators/default.jsp
Author: joakime
Date: Fri Oct 19 15:21:54 2007
New Revision: 586630
URL: http://svn.apache.org/viewvc?rev=586630&view=rev
Log:
Adding version into footer
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=586630&r1=586629&r2=586630&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 Fri Oct 19 15:21:54 2007
@@ -34,8 +34,15 @@
*/
public class ArchivaVersion
{
+ public static String VERSION = "Unknown";
+
public static String determineVersion( ClassLoader cloader )
{
+ if ( VERSION != null )
+ {
+ return VERSION;
+ }
+
/* This is the search order of modules to find the version.
*/
String modules[] = new String[] {
@@ -60,7 +67,6 @@
"archiva-webapp",
"archiva-security",
"archiva-applet",
- "archiva-cli",
"archiva-xml-tools" };
for ( int i = 0; i < modules.length; i++ )
@@ -77,7 +83,8 @@
String version = props.getProperty( "version" );
if ( StringUtils.isNotBlank( version ) )
{
- return version;
+ VERSION = version;
+ return VERSION;
}
}
catch ( IOException e )
@@ -87,7 +94,7 @@
}
}
- return "Unknown";
+ return VERSION;
}
private static URL findModulePom( ClassLoader cloader, String module )
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=586630&r1=586629&r2=586630&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 Fri Oct 19 15:21:54 2007
@@ -25,6 +25,8 @@
<%@ 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" %>
+
<html>
<head>
<title>Apache Archiva \
@@ -173,8 +175,11 @@
}
%>
<div id="footer">
- <div class="xright">©
- Copyright © <%= copyrightRange %> Apache Software Foundation
+ <div class="xleft">
+ Apache Archiva <%= ArchivaVersion.VERSION %>
+ </div>
+ <div class="xright">
+ Copyright © <%= copyrightRange %> Apache Software Foundation
</div>
<div class="clear">