From 2ff103ce5a37418f00c67227b582af6503d02f5d Mon Sep 17 00:00:00 2001 From: Jason Dillon Date: Wed, 17 Oct 2012 19:29:12 -0700 Subject: [PATCH] Drop initializable, use injection with default --- .../rest/IndexTemplatePlexusResource.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/nexus/nexus-rest-api/src/main/java/org/sonatype/nexus/rest/IndexTemplatePlexusResource.java b/nexus/nexus-rest-api/src/main/java/org/sonatype/nexus/rest/IndexTemplatePlexusResource.java index 9bb3bdac8a..ab951895bf 100644 --- a/nexus/nexus-rest-api/src/main/java/org/sonatype/nexus/rest/IndexTemplatePlexusResource.java +++ b/nexus/nexus-rest-api/src/main/java/org/sonatype/nexus/rest/IndexTemplatePlexusResource.java @@ -24,9 +24,6 @@ import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; -// FIXME: Kill these... -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.codehaus.plexus.util.StringUtils; import org.restlet.Context; import org.restlet.data.MediaType; @@ -51,8 +48,7 @@ @Singleton public class IndexTemplatePlexusResource extends AbstractPlexusResource - implements ManagedPlexusResource, - Initializable + implements ManagedPlexusResource { public static final String NAME = "indexTemplate"; @@ -64,7 +60,7 @@ public class IndexTemplatePlexusResource private Map bundles; @Inject - @Named( "${index.template.file}" ) + @Named( "${index.template.file:-templates/index.vm}" ) String templateFilename; public IndexTemplatePlexusResource() @@ -257,14 +253,4 @@ protected void evaluateIfNeeded( VelocityEngine engine, Map cont } } } - - public void initialize() - throws InitializationException - { - //Hasn't been interpolated - if ( "${index.template.file}".equals( templateFilename ) ) - { - templateFilename = "templates/index.vm"; - } - } }