svn commit: r682269 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup: ArchivaVersion.java Banner.java

[oching]

Author: oching
Date: Sun Aug  3 23:34:41 2008
New Revision: 682269

URL: http://svn.apache.org/viewvc?rev=682269&view=rev
Log:
[MRM-895]
submitted by Mark Jeffrey
-no longer pass the class loader in ArchivaVersion.determineVersion()

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java?rev=682269&r1=682268&r2=682269&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
 Sun Aug  3 23:34:41 2008
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Properties;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+
 /**
  * ArchivaVersion 
  *
@@ -41,14 +41,15 @@
     {
     }
 
-    public static String determineVersion( ClassLoader cloader )
+    public static String determineVersion(  )
     {
         if ( version != null )
         {
             return version;
         }
         
-        InputStream is = cloader.getResourceAsStream( 
"/META-INF/maven/org.apache.archiva/archiva-configuration/pom.properties" );
+        InputStream is = ArchivaConfiguration.class.getResourceAsStream( 
"/META-INF/maven/org.apache.archiva/archiva-configuration/pom.properties" );
+        
         if ( is != null )
         {
             try

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java?rev=682269&r1=682268&r2=682269&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
 Sun Aug  3 23:34:41 2008
@@ -220,7 +220,7 @@
 
     public void display() 
     {
-        String banner = getBanner( ArchivaVersion.determineVersion( 
this.getClass().getClassLoader() ) );
-        LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 
25 ) + "\n" + banner );
+        String banner = getBanner( ArchivaVersion.determineVersion() );
+       LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 
25 ) + "\n" + banner );
     }
 }