Remove 'jetty' attribute from container element

3 files changed, 4 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index dd0d74aa1e8..8be949e226d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -165,7 +165,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         checkVersion(spec);
         checkTagName(spec, log);
-        checkDeprecatedAttributes(spec, log);
 
         ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
@@ -175,16 +174,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         model.setCluster(cluster);
     }
 
-    private void checkDeprecatedAttributes(Element spec, DeployLogger log) {
-        String version = spec.getAttribute("jetty");
-        if (!version.isEmpty()) {
-            log.logApplicationPackage(WARNING,
-                    "The 'jetty' attribute is deprecated and will be removed in Vespa 8. " +
-                            "It has no effect - Jetty is always enabled." +
-                            "Please remove the attribute from the 'container'/'jdisc' element in services.xml.");
-        }
-    }
-
     private ApplicationContainerCluster createContainerCluster(Element spec, ConfigModelContext modelContext) {
         return new VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainerCluster>() {
             @Override
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 3fdbff84f6d..d651beea4dc 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -2,7 +2,6 @@
 ContainerCluster = element container | jdisc {
     attribute version { "1.0" } &
     attribute id { xsd:NCName }? &
-    attribute jetty { xsd:boolean }? &
     Include* &
     ContainerServices &    
     DocumentBinding* &
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index 49c1783c187..6cd0fa18c3d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -126,7 +126,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void ssl_element_generates_connector_config_and_injects_provider_component() {
         Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0'>",
                 "    <http>",
                 "        <server port='9000' id='minimal'>",
                 "            <ssl>",
@@ -198,7 +198,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_tht_ssl_provider_configuration_configures_correct_config() {
         Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0'>",
                 "    <http>",
                 "        <server port='9000' id='ssl'>",
                 "            <ssl-provider class='com.yahoo.CustomSslProvider' bundle='mybundle'/>",
@@ -222,7 +222,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_container_factory_sees_same_config(){
         Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0'>",
                 "    <http>",
                 "        <server port='9000' id='ssl'>",
                 "            <ssl>",
@@ -243,7 +243,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     @Test
     public void verify_that_container_setup_additional_tls4443(){
         Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0' jetty='true'>",
+                "<container id='default' version='1.0'>",
                 "    <http>",
                 "        <server port='8080' id='ssl'>",
                 "            <ssl>",