summaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorgjoranv <gv@yahoo-inc.com>2017-02-28 13:56:10 +0100
committergjoranv <gv@yahoo-inc.com>2017-02-28 13:58:10 +0100
commitd3f8f42ee6d974ab53d424473a9e898df51d66dc (patch)
tree4fcbcaedc2a4060ed6ce5ca59b912f84b1cba3be /config-model/src
parent0901091b4982b8207eb419577282c967f69a0dcf (diff)
Log deprecation warning for 'container.jdisc.config.http-server'.
VESPA-6505
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
index be92c00652f..98541d6ac7e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java
@@ -8,11 +8,15 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
import com.yahoo.vespa.model.container.http.ConnectorFactory;
import org.w3c.dom.Element;
+import java.util.logging.Logger;
+
/**
* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
* @since 5.21.0
*/
public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ConnectorFactory> {
+ private static final Logger log = Logger.getLogger(JettyConnectorBuilder.class.getName());
+
@Override
protected ConnectorFactory doBuild(AbstractConfigProducer ancestor, Element serverSpec) {
String name = XmlHelper.getIdString(serverSpec);
@@ -22,6 +26,8 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil
if (legacyServerConfig != null) {
String configName = legacyServerConfig.getAttribute("name");
if (!configName.equals("container.jdisc.config.http-server")) {
+ log.warning("The config 'container.jdisc.config.http-server' is deprecated and will be removed in a later version of Vespa."
+ + " Please use 'jdisc.http.connector' instead, see https://git.corp.yahoo.com/pages/vespa/documentation/documentation/jdisc/http-server-and-filters.html#configuring-jetty-server");
legacyServerConfig = null;
}
}