Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding version into footer 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@586630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-10-19 22:21:54 +00:00
parent 8ce5a7d4f9
commit e74ebe51b7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
View File

@ -34,8 +34,15 @@ import java.util.Properties;
*/ */
public class ArchivaVersion public class ArchivaVersion
{ {
public static String VERSION = "Unknown";
public static String determineVersion( ClassLoader cloader ) public static String determineVersion( ClassLoader cloader )
{ {
if ( VERSION != null )
{
return VERSION;
}
/* This is the search order of modules to find the version. /* This is the search order of modules to find the version.
*/ */
String modules[] = new String[] { String modules[] = new String[] {
@ -60,7 +67,6 @@ public class ArchivaVersion
"archiva-webapp", "archiva-webapp",
"archiva-security", "archiva-security",
"archiva-applet", "archiva-applet",
"archiva-cli",
"archiva-xml-tools" }; "archiva-xml-tools" };
for ( int i = 0; i < modules.length; i++ ) for ( int i = 0; i < modules.length; i++ )
@ -77,7 +83,8 @@ public class ArchivaVersion
String version = props.getProperty( "version" ); String version = props.getProperty( "version" );
if ( StringUtils.isNotBlank( version ) ) if ( StringUtils.isNotBlank( version ) )
{ {
return version; VERSION = version;
return VERSION;
} }
} }
catch ( IOException e ) catch ( IOException e )
@ -87,7 +94,7 @@ public class ArchivaVersion
} }
} }
return "Unknown"; return VERSION;
} }
private static URL findModulePom( ClassLoader cloader, String module ) private static URL findModulePom( ClassLoader cloader, String module )

9
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
View File

@ -25,6 +25,8 @@
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %> <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<%@ page import="java.util.Calendar" %> <%@ page import="java.util.Calendar" %>
<%@ page import="org.apache.maven.archiva.web.startup.ArchivaVersion" %>
<html> <html>
<head> <head>
<title>Apache Archiva \ <title>Apache Archiva \
@ -173,8 +175,11 @@
} }
%> %>
<div id="footer"> <div id="footer">
<div class="xright">&#169; <div class="xleft">
Copyright &copy; <%= copyrightRange %> Apache Software Foundation Apache Archiva <%= ArchivaVersion.VERSION %>
</div>
<div class="xright">
Copyright &#169; <%= copyrightRange %> Apache Software Foundation
</div> </div>
<div class="clear"> <div class="clear">