diff --git a/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java b/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java index 3ad771eeeb..70d37dfb29 100644 --- a/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java +++ b/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java @@ -2,6 +2,7 @@ import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -13,7 +14,6 @@ import ubic.basecode.ontology.model.OntologyTerm; import ubic.gemma.core.ontology.FactorValueOntologyService; import ubic.gemma.core.ontology.providers.GemmaOntologyService; -import ubic.gemma.core.config.Settings; import ubic.gemma.web.util.EntityNotFoundException; import ubic.gemma.web.util.ServiceUnavailableException; @@ -40,12 +40,8 @@ public class OntologyController { private static final MediaType RDF_XML = MediaType.parseMediaType( "application/rdf+xml" ); - /** - * FIXME: use {@link org.springframework.beans.factory.annotation.Value} for injecting this, but I think injection - * is broken in controllers. See #1001 for - * details. - */ - private static final String hostUrl = Settings.getHostUrl(); + @Value("${gemma.hosturl}") + private String hostUrl; @Autowired private GemmaOntologyService gemmaOntologyService; diff --git a/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml b/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml index df66a21d29..a5032cce27 100644 --- a/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml +++ b/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml @@ -18,6 +18,13 @@ + + + + + +