You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/31 05:25:27 UTC
svn commit: r642863 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
Author: brett
Date: Sun Mar 30 20:25:25 2008
New Revision: 642863
URL: http://svn.apache.org/viewvc?rev=642863&view=rev
Log:
fix the version handling since the group ID change, and simplify in the process
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.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=642863&r1=642862&r2=642863&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 Mar 30 20:25:25 2008
@@ -20,6 +20,7 @@
*/
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.io.IOUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -47,65 +48,32 @@
return version;
}
- /* This is the search order of modules to find the version.
- @todo is this really necessary? Just use webapp?
- */
- String[] modules = new String[] {
- "archiva-common",
- "archiva-configuration",
- "archiva-database",
- "archiva-consumer-api",
- "archiva-core-consumers",
- "archiva-signature-consumers",
- "archiva-database-consumers",
- "archiva-lucene-consumers",
- "archiva-indexer",
- "archiva-model",
- "archiva-policies",
- "archiva-proxy",
- "archiva-report-manager",
- "archiva-artifact-reports",
- "archiva-project-reports",
- "archiva-metadata-reports",
- "archiva-repository-layer",
- "archiva-scheduled",
- "archiva-webapp",
- "archiva-security",
- "archiva-applet",
- "archiva-xml-tools" };
-
- for ( int i = 0; i < modules.length; i++ )
+ InputStream is = cloader.getResourceAsStream( "/META-INF/maven/org.apache.archiva/archiva-configuration/pom.properties" );
+ if ( is != null )
{
- String module = modules[i];
- URL pomurl = findModulePom( cloader, module );
- if ( pomurl != null )
+ try
{
- try
- {
- Properties props = new Properties();
- InputStream is = pomurl.openStream();
- props.load( is );
- String version = props.getProperty( "version" );
- if ( StringUtils.isNotBlank( version ) )
- {
- ArchivaVersion.version = version;
- return version;
- }
- }
- catch ( IOException e )
+ Properties props = new Properties();
+ props.load( is );
+ String version = props.getProperty( "version" );
+ if ( StringUtils.isNotBlank( version ) )
{
- /* do nothing */
+ ArchivaVersion.version = version;
+ return version;
}
}
+ catch ( IOException e )
+ {
+ /* do nothing */
+ }
+ finally
+ {
+ IOUtils.closeQuietly( is );
+ }
}
- version = "<Unknown Version>";
+ ArchivaVersion.version = "";
return version;
- }
-
- private static URL findModulePom( ClassLoader cloader, String module )
- {
- return cloader.getResource( "/META-INF/maven/org.apache.maven.archiva/" + module + "/pom.properties" );
}
public static String getVersion()