diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/BackendConfiguration.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/BackendConfiguration.java index 2546eea937..cc2538033f 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/BackendConfiguration.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/BackendConfiguration.java @@ -35,13 +35,13 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.web.proxy.ProxyConfiguration; import sonia.scm.xml.XmlIntervalAdapter; //~--- JDK imports ------------------------------------------------------------ import java.io.File; -import java.net.URL; import java.util.Set; @@ -89,9 +89,9 @@ public class BackendConfiguration * * @return */ - public URL getNewsUrl() + public ProxyConfiguration getNewsConfiguration() { - return newsUrl; + return newsConfiguration; } /** @@ -138,85 +138,6 @@ public class BackendConfiguration return multithreaded; } - //~--- set methods ---------------------------------------------------------- - - /** - * Method description - * - * - * @param directories - */ - public void setDirectories(Set directories) - { - this.directories = directories; - } - - /** - * Method description - * - * - * @param excludes - */ - public void setExcludes(Set excludes) - { - this.excludes = excludes; - } - - /** - * Method description - * - * - * @param multithreaded - */ - public void setMultithreaded(boolean multithreaded) - { - this.multithreaded = multithreaded; - } - - /** - * Method description - * - * - * @param newsUrl - */ - public void setNewsUrl(URL newsUrl) - { - this.newsUrl = newsUrl; - } - - /** - * Method description - * - * - * @param repositories - */ - public void setRepositories(Set repositories) - { - this.repositories = repositories; - } - - /** - * Method description - * - * - * @param scannInterval - */ - public void setScannInterval(long scannInterval) - { - this.scannInterval = scannInterval; - } - - /** - * Method description - * - * - * @param trackingCode - */ - public void setTrackingCode(String trackingCode) - { - this.trackingCode = trackingCode; - } - //~--- fields --------------------------------------------------------------- /** Field description */ @@ -233,8 +154,8 @@ public class BackendConfiguration private boolean multithreaded = true; /** Field description */ - @XmlElement(name = "news-url") - private URL newsUrl; + @XmlElement(name = "news-settings") + private ProxyConfiguration newsConfiguration; /** Field description */ @XmlElement(name = "repository") diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/NewsProxyURLProvider.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/NewsProxyURLProvider.java index f83e64dac7..c765c681e0 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/NewsProxyURLProvider.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/NewsProxyURLProvider.java @@ -37,17 +37,18 @@ package sonia.scm.plugin; import com.google.inject.Inject; -import sonia.scm.web.proxy.ProxyURLProvider; +import sonia.scm.web.proxy.ProxyConfiguration; +import sonia.scm.web.proxy.ProxyConfigurationProvider; //~--- JDK imports ------------------------------------------------------------ -import java.net.URL; +import javax.servlet.http.HttpServletRequest; /** * * @author Sebastian Sdorra */ -public class NewsProxyURLProvider implements ProxyURLProvider +public class NewsProxyURLProvider implements ProxyConfigurationProvider { /** @@ -68,12 +69,14 @@ public class NewsProxyURLProvider implements ProxyURLProvider * Method description * * + * @param request + * * @return */ @Override - public URL getProxyURL() + public ProxyConfiguration getConfiguration(HttpServletRequest request) { - return configuration.getNewsUrl(); + return configuration.getNewsConfiguration(); } //~--- fields --------------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java index 54fe8e49f2..30ae00cf5e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java @@ -52,8 +52,6 @@ import sonia.scm.plugin.scanner.PluginScannerFactory; import sonia.scm.plugin.scanner.PluginScannerScheduler; import sonia.scm.plugin.scanner.TimerPluginScannerScheduler; import sonia.scm.util.Util; -import sonia.scm.web.proxy.ProxyServet; -import sonia.scm.web.proxy.ProxyURLProvider; //~--- JDK imports ------------------------------------------------------------ @@ -66,6 +64,8 @@ import java.util.HashMap; import java.util.Map; import javax.xml.bind.JAXB; +import sonia.scm.web.proxy.ProxyConfigurationProvider; +import sonia.scm.web.proxy.ProxyServlet; /** * @@ -147,8 +147,8 @@ public class ScmBackendModule extends ServletModule bind(UrlBuilderFactory.class); // news proxy - bind(ProxyURLProvider.class).to(NewsProxyURLProvider.class); - serve("/news*").with(ProxyServet.class); + bind(ProxyConfigurationProvider.class).to(NewsProxyURLProvider.class); + serve("/news*").with(ProxyServlet.class); Map params = new HashMap(); diff --git a/scm-plugin-backend/src/main/resources/logback.xml b/scm-plugin-backend/src/main/resources/logback.xml index ec39da526a..9f6c714a38 100644 --- a/scm-plugin-backend/src/main/resources/logback.xml +++ b/scm-plugin-backend/src/main/resources/logback.xml @@ -40,7 +40,7 @@ Purpose of the document follows. --> - +