Author: jdumay
Date: Mon Oct 27 01:58:03 2008
New Revision: 708112
URL: http://svn.apache.org/viewvc?rev=708112&view=rev
Log:
No reason why all the methods on this class should not be static
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.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/ArchivaStartup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java?rev=708112&r1=708111&r2=708112&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
Mon Oct 27 01:58:03 2008
@@ -46,14 +46,13 @@
ArchivaTaskScheduler taskScheduler = (ArchivaTaskScheduler)
wac.getBean(PlexusToSpringUtils.buildSpringId(ArchivaTaskScheduler.class));
TaskQueueExecutor databaseUpdateQueue = (TaskQueueExecutor)
wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class,
"database-update"));
TaskQueueExecutor repositoryScanningQueue = (TaskQueueExecutor)
wac.getBean(PlexusToSpringUtils.buildSpringId(TaskQueueExecutor.class,
"repository-scanning"));
- Banner banner = new Banner();
try
{
securitySync.startup();
resolverFactory.startup();
taskScheduler.startup();
- banner.display();
+ Banner.display();
}
catch ( ArchivaException e )
{
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=708112&r1=708111&r2=708112&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
Mon Oct 27 01:58:03 2008
@@ -23,7 +23,6 @@
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
-import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.slf4j.LoggerFactory;
/**
@@ -218,7 +217,7 @@
return injectVersion( decode( encodedBanner ), version );
}
- public void display()
+ public static void display()
{
String banner = getBanner( ArchivaVersion.determineVersion() );
LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_",
25 ) + "\n" + banner );