summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-04-28 13:10:31 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:20 +0200
commit1291505d25cc1640fe87a9590982111bbeb6e27e (patch)
treed22929f7b86d4df60ff2025987040d842ab31ebf /config-model/src/test/java
parentdb974a2f5ef252ecab3da32c7b40e73a6d904024 (diff)
Remove 'jetty' attribute from container element
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java8
1 files changed, 4 insertions, 4 deletions
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>",