Modified: maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java (original) +++ maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java Wed Feb 20 23:31:33 2008 @@ -22,12 +22,13 @@ import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.updater.DatabaseUpdater; import org.apache.maven.archiva.scheduled.tasks.DatabaseTask; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; import org.codehaus.plexus.taskqueue.execution.TaskExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ArchivaDatabaseTaskExecutor @@ -40,9 +41,10 @@ * role-hint="database-update" */ public class ArchivaDatabaseUpdateTaskExecutor - extends AbstractLogEnabled implements TaskExecutor, Initializable { + private Logger log = LoggerFactory.getLogger( ArchivaDatabaseUpdateTaskExecutor.class ); + /** * @plexus.requirement role-hint="jdo" */ @@ -51,7 +53,7 @@ public void initialize() throws InitializationException { - getLogger().info( "Initialized " + this.getClass().getName() ); + log.info( "Initialized " + this.getClass().getName() ); } public void executeTask( Task task ) @@ -59,12 +61,12 @@ { DatabaseTask dbtask = (DatabaseTask) task; - getLogger().info( "Executing task from queue with job name: " + dbtask.getName() ); + log.info( "Executing task from queue with job name: " + dbtask.getName() ); long time = System.currentTimeMillis(); try { - getLogger().info( "Task: Updating unprocessed artifacts" ); + log.info( "Task: Updating unprocessed artifacts" ); databaseUpdater.updateAllUnprocessed(); } catch ( ArchivaDatabaseException e ) @@ -74,7 +76,7 @@ try { - getLogger().info( "Task: Updating processed artifacts" ); + log.info( "Task: Updating processed artifacts" ); databaseUpdater.updateAllProcessed(); } catch ( ArchivaDatabaseException e ) @@ -84,6 +86,6 @@ time = System.currentTimeMillis() - time; - getLogger().info( "Finished database task in " + time + "ms." ); + log.info( "Finished database task in " + time + "ms." ); } }
Modified: maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java (original) +++ maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java Wed Feb 20 23:31:33 2008 @@ -19,26 +19,26 @@ * under the License. */ +import java.util.List; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.database.ArchivaDAO; -import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics; import org.apache.maven.archiva.model.RepositoryContentStatistics; import org.apache.maven.archiva.repository.RepositoryException; import org.apache.maven.archiva.repository.scanner.RepositoryScanStatistics; import org.apache.maven.archiva.repository.scanner.RepositoryScanner; import org.apache.maven.archiva.scheduled.tasks.RepositoryTask; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; import org.codehaus.plexus.taskqueue.execution.TaskExecutor; - -import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ArchivaRepositoryScanningTaskExecutor @@ -51,9 +51,10 @@ * role-hint="repository-scanning" */ public class ArchivaRepositoryScanningTaskExecutor - extends AbstractLogEnabled implements TaskExecutor, Initializable { + private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class ); + /** * @plexus.requirement role-hint="jdo" */ @@ -74,7 +75,7 @@ public void initialize() throws InitializationException { - getLogger().info( "Initialized " + this.getClass().getName() ); + log.info( "Initialized " + this.getClass().getName() ); } public void executeTask( Task task ) @@ -87,7 +88,7 @@ throw new TaskExecutionException("Unable to execute RepositoryTask with blank repository Id."); } - getLogger().info( "Executing task from queue with job name: " + repoTask.getName() ); + log.info( "Executing task from queue with job name: " + repoTask.getName() ); try { @@ -105,7 +106,7 @@ RepositoryScanStatistics stats = repoScanner.scan( arepo, sinceWhen ); - getLogger().info( "Finished repository task: " + stats.toDump( arepo ) ); + log.info( "Finished repository task: " + stats.toDump( arepo ) ); // I hate jpox and modello RepositoryContentStatistics dbstats = new RepositoryContentStatistics(); Modified: maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaStandardRolesCheck.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaStandardRolesCheck.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaStandardRolesCheck.java (original) +++ maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaStandardRolesCheck.java Wed Feb 20 23:31:33 2008 @@ -19,11 +19,12 @@ * under the License. */ -import org.codehaus.plexus.logging.AbstractLogEnabled; +import java.util.List; + import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.system.check.EnvironmentCheck; - -import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ArchivaStandardRolesCheck tests for the existance of expected / standard roles and permissions. @@ -35,9 +36,10 @@ * role-hint="required-roles" */ public class ArchivaStandardRolesCheck - extends AbstractLogEnabled implements EnvironmentCheck { + private Logger log = LoggerFactory.getLogger( ArchivaStandardRolesCheck.class ); + /** * @plexus.requirement role-hint="cached" */ @@ -61,7 +63,7 @@ ArchivaRoleConstants.REGISTERED_USER_ROLE, ArchivaRoleConstants.USER_ADMINISTRATOR_ROLE }; - getLogger().info( "Checking the existance of required roles." ); + log.info( "Checking the existance of required roles." ); for ( String roleName : expectedRoles ) { @@ -85,7 +87,7 @@ ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS, "archiva-guest" }; - getLogger().info( "Checking the existance of required operations." ); + log.info( "Checking the existance of required operations." ); for ( String operation : expectedOperations ) { Modified: maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/SecurityStartup.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/SecurityStartup.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/SecurityStartup.java (original) +++ maven/archiva/trunk/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/SecurityStartup.java Wed Feb 20 23:31:33 2008 @@ -19,23 +19,24 @@ * under the License. */ +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.apache.commons.collections.CollectionUtils; import org.apache.maven.archiva.common.ArchivaException; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.UserAssignment; import org.codehaus.plexus.redback.system.check.EnvironmentCheck; import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.RegistryListener; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * SecurityStartup @@ -46,9 +47,10 @@ * @plexus.component role="org.apache.maven.archiva.security.SecurityStartup" */ public class SecurityStartup - extends AbstractLogEnabled implements RegistryListener { + private Logger log = LoggerFactory.getLogger( SecurityStartup.class ); + /** * @plexus.requirement */ @@ -104,7 +106,7 @@ } catch ( RbacManagerException e ) { - getLogger().warn( + log.warn( "Unable to add role [" + ArchivaRoleConstants.toRepositoryObserverRoleName( repoId ) + "] to " + principal + " user.", e ); } @@ -129,7 +131,7 @@ } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } } } @@ -145,7 +147,7 @@ } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } } } @@ -164,7 +166,7 @@ for ( Entry<String, EnvironmentCheck> entry : checkers.entrySet() ) { EnvironmentCheck check = entry.getValue(); - getLogger().info( "Running Environment Check: " + entry.getKey() ); + log.info( "Running Environment Check: " + entry.getKey() ); check.validateEnvironment( violations ); } @@ -183,7 +185,7 @@ msg.append( "\n" ); msg.append( "======================================================================" ); - getLogger().fatalError( msg.toString() ); + log.error( msg.toString() ); throw new ArchivaException( "Unable to initialize Redback Security Environment, [" + violations.size() + "] violation(s) encountered, See log for details." ); Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java Wed Feb 20 23:31:33 2008 @@ -23,7 +23,6 @@ import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.interceptor.Interceptor; import org.apache.maven.archiva.configuration.ArchivaConfiguration; -import org.codehaus.plexus.logging.AbstractLogEnabled; import javax.servlet.ServletContext; @@ -35,7 +34,6 @@ * role-hint="configurationInterceptor" */ public class ConfigurationInterceptor - extends AbstractLogEnabled implements Interceptor { /** Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java Wed Feb 20 23:31:33 2008 @@ -21,9 +21,10 @@ import org.apache.maven.archiva.common.ArchivaException; import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ArchivaStartup - the startup of all archiva features in a deterministic order. @@ -36,7 +37,6 @@ * role-hint="default" */ public class ArchivaStartup - extends AbstractLogEnabled implements Initializable { /** @@ -57,7 +57,7 @@ public void initialize() throws InitializationException { - Banner.display( getLogger(), ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) ); + Banner.display( ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) ); try { Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java Wed Feb 20 23:31:33 2008 @@ -19,14 +19,13 @@ * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - 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; + /** * Banner * @@ -38,7 +37,6 @@ * role-hint="default" */ public class Banner - extends AbstractLogEnabled { public static String encode( String raw ) { @@ -224,15 +222,15 @@ return injectVersion( decode( encodedBanner ), version ); } - public static void display( Logger logger, String version ) + public static void display( String version ) { String banner = getBanner( version ); - logger.info( StringUtils.repeat( "_", 25 ) + "\n" + banner ); + LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 25 ) + "\n" + banner ); } public void initialize() throws InitializationException { - Banner.display( getLogger(), ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) ); + Banner.display( ArchivaVersion.determineVersion( this.getClass().getClassLoader() ) ); } } Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ResolverFactoryInit.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ResolverFactoryInit.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ResolverFactoryInit.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ResolverFactoryInit.java Wed Feb 20 23:31:33 2008 @@ -23,7 +23,6 @@ import org.apache.maven.archiva.database.project.ProjectModelToDatabaseListener; import org.apache.maven.archiva.repository.project.ProjectModelResolver; import org.apache.maven.archiva.repository.project.ProjectModelResolverFactory; -import org.codehaus.plexus.logging.AbstractLogEnabled; /** * ResolverFactoryInit - Initialize the Resolver Factory, and hook it up to @@ -37,7 +36,6 @@ * role-hint="default" */ public class ResolverFactoryInit - extends AbstractLogEnabled { /** * @plexus.requirement role-hint="database" Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java Wed Feb 20 23:31:33 2008 @@ -19,13 +19,17 @@ * under the License. */ +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.apache.commons.collections.CollectionUtils; import org.apache.maven.archiva.common.ArchivaException; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.UserAssignment; @@ -34,11 +38,8 @@ import org.codehaus.plexus.redback.system.check.EnvironmentCheck; import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.RegistryListener; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ConfigurationSynchronization @@ -50,9 +51,10 @@ * role-hint="default" */ public class SecuritySynchronization - extends AbstractLogEnabled implements RegistryListener { + private Logger log = LoggerFactory.getLogger( SecuritySynchronization.class ); + /** * @plexus.requirement role-hint="default" */ @@ -112,7 +114,7 @@ catch ( RoleManagerException e ) { // Log error. - getLogger().error( "Unable to create roles for configured repositories: " + e.getMessage(), e ); + log.error( "Unable to create roles for configured repositories: " + e.getMessage(), e ); } } } @@ -145,7 +147,7 @@ for ( Entry<String, EnvironmentCheck> entry : checkers.entrySet() ) { EnvironmentCheck check = entry.getValue(); - getLogger().info( "Running Environment Check: " + entry.getKey() ); + log.info( "Running Environment Check: " + entry.getKey() ); check.validateEnvironment( violations ); } @@ -164,7 +166,7 @@ msg.append( "\n" ); msg.append( "======================================================================" ); - getLogger().fatalError( msg.toString() ); + log.error( msg.toString() ); throw new ArchivaException( "Unable to initialize Redback Security Environment, [" + violations.size() + "] violation(s) encountered, See log for details." ); @@ -198,7 +200,7 @@ } catch ( RbacManagerException e ) { - getLogger().warn( "Unable to add role [" + ArchivaRoleConstants.toRepositoryObserverRoleName( repoId ) + log.warn( "Unable to add role [" + ArchivaRoleConstants.toRepositoryObserverRoleName( repoId ) + "] to " + principal + " user.", e ); } } Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java Wed Feb 20 23:31:33 2008 @@ -19,15 +19,17 @@ * under the License. */ -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.maven.archiva.web.util.ContextUtils; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import java.io.IOException; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; -import java.io.IOException; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.maven.archiva.web.util.ContextUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * CopyPasteSnippet @@ -37,8 +39,9 @@ * @plexus.component role="org.apache.maven.archiva.web.tags.CopyPasteSnippet" */ public class CopyPasteSnippet - extends AbstractLogEnabled { + private Logger log = LoggerFactory.getLogger( CopyPasteSnippet.class ); + public static final String PRE = "pre"; public static final String TOGGLE = "toggle"; @@ -53,7 +56,7 @@ if ( o == null ) { buf.append( "Error generating snippet." ); - getLogger().error( "Unable to generate snippet for null object." ); + log.error( "Unable to generate snippet for null object." ); } else if ( o instanceof ManagedRepositoryConfiguration ) { Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java?rev=629704&r1=629703&r2=629704&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java Wed Feb 20 23:31:33 2008 @@ -19,6 +19,12 @@ * under the License. */ +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +import javax.servlet.jsp.PageContext; + import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.ArchivaException; import org.apache.maven.archiva.dependency.DependencyGraphFactory; @@ -34,15 +40,10 @@ import org.apache.maven.archiva.model.DependencyScope; import org.apache.maven.archiva.model.Keys; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -import javax.servlet.jsp.PageContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * DependencyTree @@ -53,9 +54,10 @@ * @plexus.component role="org.apache.maven.archiva.web.tags.DependencyTree" */ public class DependencyTree - extends AbstractLogEnabled implements Initializable { + private Logger log = LoggerFactory.getLogger( DependencyTree.class ); + /** * @plexus.requirement * role="org.apache.maven.archiva.dependency.graph.DependencyGraphBuilder" @@ -121,7 +123,7 @@ { String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) + "]: groupId is blank."; - getLogger().error( emsg ); + log.error( emsg ); throw new ArchivaException( emsg ); } @@ -129,7 +131,7 @@ { String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) + "]: artifactId is blank."; - getLogger().error( emsg ); + log.error( emsg ); throw new ArchivaException( emsg ); } @@ -137,7 +139,7 @@ { String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) + "]: version is blank."; - getLogger().error( emsg ); + log.error( emsg ); throw new ArchivaException( emsg ); } @@ -249,7 +251,7 @@ catch ( GraphTaskException e ) { String emsg = "Unable to generate graph for [" + Keys.toKey( projectRef ) + "] : " + e.getMessage(); - getLogger().warn( emsg, e ); + log.warn( emsg, e ); throw new ArchivaException( emsg, e ); } }
