From 165917359a121bb8be60f6989cb69488b5f5154a Mon Sep 17 00:00:00 2001 From: James William Dumay Date: Mon, 27 Oct 2008 08:58:03 +0000 Subject: [PATCH] No reason why all the methods on this class should not be static git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@708112 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/web/startup/ArchivaStartup.java | 3 +-- .../main/java/org/apache/maven/archiva/web/startup/Banner.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java index de15ed86a..329667b44 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java @@ -46,14 +46,13 @@ public class ArchivaStartup 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 ) { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java index ea090e624..da272a24b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java @@ -23,7 +23,6 @@ import java.util.regex.Matcher; 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 @@ public class Banner 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 ); -- 2.39.5