Revert "ARTEMIS-3574 multiple bindings for embedded webserver"

This reverts commit 182334359c.

artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt

@@ -1,8 +1,6 @@
    <!-- The web server is only bound to localhost by default -->
-   <web path="web"${extra.web.attributes}>
+   <web bind="${web.protocol}://${http.host}:${http.port}" path="web"${extra.web.attributes}>
-       <binding uri="${web.protocol}://${http.host}:${http.port}">
+       <app url="activemq-branding" war="activemq-branding.war"/>
-           <app url="activemq-branding" war="activemq-branding.war"/>
+       <app url="artemis-plugin" war="artemis-plugin.war"/>
-           <app url="artemis-plugin" war="artemis-plugin.war"/>
+       <app url="console" war="console.war"/>
-           <app url="console" war="console.war"/>
-       </binding>
    </web>

artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java

@@ -254,9 +254,8 @@ public class ArtemisTest extends CliTestBase {
       assertTrue(bootstrapFile.exists());
       Document config = parseXml(bootstrapFile);
       Element webElem = (Element) config.getElementsByTagName("web").item(0);
-      Element bindingElem = (Element) webElem.getElementsByTagName("binding").item(0);
 
-      String bindAttr = bindingElem.getAttribute("uri");
+      String bindAttr = webElem.getAttribute("bind");
       String bindStr = "http://" + Create.HTTP_HOST + ":" + Create.HTTP_PORT;
 
       assertEquals(bindAttr, bindStr);
@@ -274,9 +273,8 @@ public class ArtemisTest extends CliTestBase {
       assertTrue(bootstrapFile.exists());
       config = parseXml(bootstrapFile);
       webElem = (Element) config.getElementsByTagName("web").item(0);
-      bindingElem = (Element) webElem.getElementsByTagName("binding").item(0);
 
-      bindAttr = bindingElem.getAttribute("uri");
+      bindAttr = webElem.getAttribute("bind");
       bindStr = "https://localhost:" + Create.HTTP_PORT;
       assertEquals(bindAttr, bindStr);
 
@@ -301,9 +299,8 @@ public class ArtemisTest extends CliTestBase {
 
       config = parseXml(bootstrapFile);
       webElem = (Element) config.getElementsByTagName("web").item(0);
-      bindingElem = (Element) webElem.getElementsByTagName("binding").item(0);
 
-      bindAttr = bindingElem.getAttribute("uri");
+      bindAttr = webElem.getAttribute("bind");
       bindStr = "https://localhost:" + Create.HTTP_PORT;
       assertEquals(bindAttr, bindStr);
 

artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BindingDTO.java

@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.dto;
-
-import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "binding")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class BindingDTO {
-
-   @XmlAttribute
-   public String uri;
-
-   @XmlElementRef
-   public List<AppDTO> apps;
-
-   @XmlAttribute
-   public Boolean clientAuth;
-
-   @XmlAttribute
-   public String passwordCodec;
-
-   @XmlAttribute
-   public String keyStorePath;
-
-   @XmlAttribute
-   public String trustStorePath;
-
-   @XmlAttribute
-   private String includedTLSProtocols;
-
-   @XmlAttribute
-   private String excludedTLSProtocols;
-
-   @XmlAttribute
-   private String includedCipherSuites;
-
-   @XmlAttribute
-   private String excludedCipherSuites;
-
-   @XmlAttribute
-   private String keyStorePassword;
-
-   @XmlAttribute
-   private String trustStorePassword;
-
-   public String getKeyStorePassword() throws Exception {
-      return getPassword(this.keyStorePassword);
-   }
-
-   private String getPassword(String password) throws Exception {
-      return PasswordMaskingUtil.resolveMask(password, this.passwordCodec);
-   }
-
-   public void setKeyStorePassword(String keyStorePassword) {
-      this.keyStorePassword = keyStorePassword;
-   }
-
-   public String getTrustStorePassword() throws Exception {
-      return getPassword(this.trustStorePassword);
-   }
-
-   public void setTrustStorePassword(String trustStorePassword) {
-      this.trustStorePassword = trustStorePassword;
-   }
-
-   public String[] getIncludedTLSProtocols() {
-      return unmarshalArray(includedTLSProtocols);
-   }
-
-   public void setIncludedTLSProtocols(String... protocols) {
-      includedTLSProtocols = marshalArray(protocols);
-   }
-
-   public String[] getExcludedTLSProtocols() {
-      return unmarshalArray(excludedTLSProtocols);
-   }
-
-   public void setExcludedTLSProtocols(String... protocols) {
-      excludedTLSProtocols = marshalArray(protocols);
-   }
-
-   public String[] getIncludedCipherSuites() {
-      return unmarshalArray(includedCipherSuites);
-   }
-
-   public void setIncludedCipherSuites(String... cipherSuites) {
-      includedCipherSuites = marshalArray(cipherSuites);
-   }
-
-   public String[] getExcludedCipherSuites() {
-      return unmarshalArray(excludedCipherSuites);
-   }
-
-   public void setExcludedCipherSuites(String... cipherSuites) {
-      excludedCipherSuites = marshalArray(cipherSuites);
-   }
-
-   private String[] unmarshalArray(String text) {
-      if (text == null) {
-         return null;
-      }
-
-      return text.split(",");
-   }
-
-   private String marshalArray(String[] array) {
-      if (array == null || (array.length == 1 && array[0] == null)) {
-         return null;
-      }
-
-      return String.join(",", array);
-   }
-}

artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java

@@ -16,75 +16,61 @@
  */
 package org.apache.activemq.artemis.dto;
 
+import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Collections;
 import java.util.List;
 
 @XmlRootElement(name = "web")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class WebServerDTO extends ComponentDTO {
 
-   @Deprecated
    @XmlAttribute
    public String bind;
 
    @XmlAttribute(required = true)
    public String path;
 
-   @Deprecated
    @XmlAttribute
    public Boolean clientAuth;
 
-   @Deprecated
    @XmlAttribute
    public String passwordCodec;
 
-   @Deprecated
    @XmlAttribute
    public String keyStorePath;
 
-   @Deprecated
    @XmlAttribute
    public String trustStorePath;
 
    @XmlAttribute
    public String customizer;
 
-   @XmlElementRef
-   private List<BindingDTO> bindings;
-
-   @Deprecated
    @XmlElementRef
    public List<AppDTO> apps;
 
    @XmlElementRef(required = false)
    public RequestLogDTO requestLog;
 
-   @Deprecated
    @XmlAttribute
    private String keyStorePassword;
 
-   @Deprecated
    @XmlAttribute
    private String trustStorePassword;
 
-   @Deprecated
    @XmlAttribute
    private String includedTLSProtocols;
 
-   @Deprecated
    @XmlAttribute
    private String excludedTLSProtocols;
 
-   @Deprecated
    @XmlAttribute
    private String includedCipherSuites;
 
-   @Deprecated
    @XmlAttribute
    private String excludedCipherSuites;
 
@@ -92,35 +78,71 @@ public class WebServerDTO extends ComponentDTO {
       componentClassName = "org.apache.activemq.artemis.component.WebServerComponent";
    }
 
-   public List<BindingDTO> getBindings() {
+   public String getKeyStorePassword() throws Exception {
-      if (bindings == null || bindings.isEmpty()) {
+      return getPassword(this.keyStorePassword);
-         return Collections.singletonList(convertToBindingDTO());
+   }
+
+   private String getPassword(String password) throws Exception {
+      return PasswordMaskingUtil.resolveMask(password, this.passwordCodec);
+   }
+
+   public void setKeyStorePassword(String keyStorePassword) {
+      this.keyStorePassword = keyStorePassword;
+   }
+
+   public String getTrustStorePassword() throws Exception {
+      return getPassword(this.trustStorePassword);
+   }
+
+   public void setTrustStorePassword(String trustStorePassword) {
+      this.trustStorePassword = trustStorePassword;
+   }
+
+   private String[] unmarshalArray(String text) {
+      if (text == null) {
+         return null;
       }
-      return bindings;
+
+      return text.split(",");
    }
 
-   public void setBindings(List<BindingDTO> bindings) {
+   private String marshalArray(String[] array) {
-      this.bindings = bindings;
+      if (array == null) {
+         return null;
+      }
+
+      return String.join(",", array);
    }
 
-   private BindingDTO convertToBindingDTO() {
+   public String[] getIncludedTLSProtocols() {
-      BindingDTO bindingDTO = new BindingDTO();
+      return unmarshalArray(includedTLSProtocols);
-      bindingDTO.uri = bind;
-      bindingDTO.apps = apps;
-      bindingDTO.clientAuth = clientAuth;
-      bindingDTO.passwordCodec = passwordCodec;
-      bindingDTO.keyStorePath = keyStorePath;
-      bindingDTO.setKeyStorePassword(keyStorePassword);
-      bindingDTO.trustStorePath = trustStorePath;
-      bindingDTO.setTrustStorePassword(trustStorePassword);
-      bindingDTO.setIncludedTLSProtocols(includedTLSProtocols);
-      bindingDTO.setExcludedTLSProtocols(excludedTLSProtocols);
-      bindingDTO.setIncludedCipherSuites(includedCipherSuites);
-      bindingDTO.setExcludedCipherSuites(excludedCipherSuites);
-      return bindingDTO;
    }
 
-   public BindingDTO getDefaultBinding() {
+   public void setIncludedTLSProtocols(String... protocols) {
-      return getBindings().get(0);
+      includedTLSProtocols = marshalArray(protocols);
+   }
+
+   public String[] getExcludedTLSProtocols() {
+      return unmarshalArray(excludedTLSProtocols);
+   }
+
+   public void setExcludedTLSProtocols(String... protocols) {
+      excludedTLSProtocols = marshalArray(protocols);
+   }
+
+   public String[] getIncludedCipherSuites() {
+      return unmarshalArray(includedCipherSuites);
+   }
+
+   public void setIncludedCipherSuites(String... cipherSuites) {
+      includedCipherSuites = marshalArray(cipherSuites);
+   }
+
+   public String[] getExcludedCipherSuites() {
+      return unmarshalArray(excludedCipherSuites);
+   }
+
+   public void setExcludedCipherSuites(String... cipherSuites) {
+      excludedCipherSuites = marshalArray(cipherSuites);
    }
 }

artemis-dto/src/test/java/org/apache/activemq/artemis/dto/test/BindingDTOTest.java

@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.dto.test;
-
-import org.apache.activemq.artemis.dto.BindingDTO;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class BindingDTOTest extends Assert {
-
-   @Test
-   public void testDefault() {
-      BindingDTO binding = new BindingDTO();
-
-      Assert.assertNull(binding.getIncludedTLSProtocols());
-      Assert.assertNull(binding.getExcludedTLSProtocols());
-      Assert.assertNull(binding.getIncludedCipherSuites());
-      Assert.assertNull(binding.getExcludedCipherSuites());
-   }
-
-   @Test
-   public void testValues() {
-      BindingDTO binding = new BindingDTO();
-
-      binding.setIncludedTLSProtocols("TLSv1.2");
-      Assert.assertArrayEquals(new String[] {"TLSv1.2"}, binding.getIncludedTLSProtocols());
-
-      binding.setExcludedTLSProtocols("TLSv1,TLSv1.1");
-      Assert.assertArrayEquals(new String[] {"TLSv1", "TLSv1.1"}, binding.getExcludedTLSProtocols());
-
-      binding.setIncludedCipherSuites( "^SSL_.*$");
-      Assert.assertArrayEquals(new String[] {"^SSL_.*$"}, binding.getIncludedCipherSuites());
-
-      binding.setExcludedCipherSuites( "^.*_(MD5|SHA|SHA1)$,^TLS_RSA_.*$,^.*_NULL_.*$,^.*_anon_.*$");
-      Assert.assertArrayEquals(new String[] {"^.*_(MD5|SHA|SHA1)$", "^TLS_RSA_.*$", "^.*_NULL_.*$", "^.*_anon_.*$"}, binding.getExcludedCipherSuites());
-   }
-
-   @Test
-   public void testEmptyValues() {
-      BindingDTO binding = new BindingDTO();
-
-      binding.setIncludedTLSProtocols("");
-      Assert.assertArrayEquals(new String[] {""}, binding.getIncludedTLSProtocols());
-
-      binding.setExcludedTLSProtocols("");
-      Assert.assertArrayEquals(new String[] {""}, binding.getExcludedTLSProtocols());
-
-      binding.setIncludedCipherSuites("");
-      Assert.assertArrayEquals(new String[] {""}, binding.getIncludedCipherSuites());
-
-      binding.setExcludedCipherSuites("");
-      Assert.assertArrayEquals(new String[] {""}, binding.getExcludedCipherSuites());
-   }
-
-   @Test
-   public void testNullValues() {
-      BindingDTO binding = new BindingDTO();
-
-      binding.setIncludedTLSProtocols(null);
-      Assert.assertNull(binding.getIncludedTLSProtocols());
-
-      binding.setExcludedTLSProtocols(null);
-      Assert.assertNull(binding.getExcludedTLSProtocols());
-
-      binding.setIncludedCipherSuites(null);
-      Assert.assertNull(binding.getIncludedCipherSuites());
-
-      binding.setExcludedCipherSuites(null);
-      Assert.assertNull(binding.getExcludedCipherSuites());
-   }
-}

artemis-dto/src/test/java/org/apache/activemq/artemis/dto/test/WebServerDTOTest.java

@@ -16,95 +16,70 @@
  */
 package org.apache.activemq.artemis.dto.test;
 
-import org.apache.activemq.artemis.dto.BindingDTO;
 import org.apache.activemq.artemis.dto.WebServerDTO;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Collections;
+public class WebServerDTOTest extends Assert {
-import java.util.List;
-
-public class WebServerDTOTest {
 
    @Test
-   public void testDefault() throws Exception {
+   public void testDefault() {
       WebServerDTO webServer = new WebServerDTO();
 
-      Assert.assertNotNull(webServer.getBindings());
+      Assert.assertNull(webServer.getIncludedTLSProtocols());
-      Assert.assertEquals(1, webServer.getBindings().size());
+      Assert.assertNull(webServer.getExcludedTLSProtocols());
-      Assert.assertNotNull(webServer.getDefaultBinding());
+      Assert.assertNull(webServer.getIncludedCipherSuites());
-
+      Assert.assertNull(webServer.getExcludedCipherSuites());
-      BindingDTO defaultBinding = webServer.getDefaultBinding();
-      Assert.assertNull(defaultBinding.uri);
-      Assert.assertNull(defaultBinding.apps);
-      Assert.assertNull(defaultBinding.clientAuth);
-      Assert.assertNull(defaultBinding.passwordCodec);
-      Assert.assertNull(defaultBinding.keyStorePath);
-      Assert.assertNull(defaultBinding.trustStorePath);
-      Assert.assertNull(defaultBinding.getIncludedTLSProtocols());
-      Assert.assertNull(defaultBinding.getExcludedTLSProtocols());
-      Assert.assertNull(defaultBinding.getIncludedCipherSuites());
-      Assert.assertNull(defaultBinding.getExcludedCipherSuites());
-      Assert.assertNull(defaultBinding.getKeyStorePassword());
-      Assert.assertNull(defaultBinding.getTrustStorePassword());
    }
 
    @Test
-   public void testWebServerConfig() {
+   public void testValues() {
       WebServerDTO webServer = new WebServerDTO();
-      webServer.bind = "http://localhost:0";
 
-      Assert.assertNotNull(webServer.getBindings());
+      webServer.setIncludedTLSProtocols("TLSv1.2");
-      Assert.assertEquals(1, webServer.getBindings().size());
+      Assert.assertArrayEquals(new String[] {"TLSv1.2"}, webServer.getIncludedTLSProtocols());
-      Assert.assertNotNull(webServer.getDefaultBinding());
+
-      Assert.assertEquals("http://localhost:0", webServer.getDefaultBinding().uri);
+      webServer.setExcludedTLSProtocols("TLSv1,TLSv1.1");
+      Assert.assertArrayEquals(new String[] {"TLSv1", "TLSv1.1"}, webServer.getExcludedTLSProtocols());
+
+      webServer.setIncludedCipherSuites( "^SSL_.*$");
+      Assert.assertArrayEquals(new String[] {"^SSL_.*$"}, webServer.getIncludedCipherSuites());
+
+      webServer.setExcludedCipherSuites( "^.*_(MD5|SHA|SHA1)$,^TLS_RSA_.*$,^.*_NULL_.*$,^.*_anon_.*$");
+      Assert.assertArrayEquals(new String[] {"^.*_(MD5|SHA|SHA1)$", "^TLS_RSA_.*$", "^.*_NULL_.*$", "^.*_anon_.*$"}, webServer.getExcludedCipherSuites());
    }
 
    @Test
-   public void testWebServerWithBinding() {
+   public void testEmptyValues() {
-      BindingDTO binding = new BindingDTO();
-      binding.uri = "http://localhost:0";
-
       WebServerDTO webServer = new WebServerDTO();
-      webServer.setBindings(Collections.singletonList(binding));
 
-      Assert.assertNotNull(webServer.getBindings());
+      webServer.setIncludedTLSProtocols("");
-      Assert.assertEquals(1, webServer.getBindings().size());
+      Assert.assertArrayEquals(new String[] {""}, webServer.getIncludedTLSProtocols());
-      Assert.assertNotNull(webServer.getDefaultBinding());
+
-      Assert.assertEquals("http://localhost:0", webServer.getDefaultBinding().uri);
+      webServer.setExcludedTLSProtocols("");
+      Assert.assertArrayEquals(new String[] {""}, webServer.getExcludedTLSProtocols());
+
+      webServer.setIncludedCipherSuites("");
+      Assert.assertArrayEquals(new String[] {""}, webServer.getIncludedCipherSuites());
+
+      webServer.setExcludedCipherSuites("");
+      Assert.assertArrayEquals(new String[] {""}, webServer.getExcludedCipherSuites());
    }
 
    @Test
-   public void testWebServerWithMultipleBindings() {
+   public void testNullValues() {
-      BindingDTO binding1 = new BindingDTO();
-      binding1.uri = "http://localhost:0";
-      BindingDTO binding2 = new BindingDTO();
-      binding2.uri = "http://localhost:1";
-
       WebServerDTO webServer = new WebServerDTO();
-      webServer.setBindings(List.of(binding1, binding2));
 
-      Assert.assertNotNull(webServer.getBindings());
+      webServer.setIncludedTLSProtocols(null);
-      Assert.assertEquals(2, webServer.getBindings().size());
+      Assert.assertNull(webServer.getIncludedTLSProtocols());
-      Assert.assertNotNull(webServer.getDefaultBinding());
+
-      Assert.assertEquals("http://localhost:0", webServer.getDefaultBinding().uri);
+      webServer.setExcludedTLSProtocols(null);
-      Assert.assertEquals("http://localhost:0", webServer.getBindings().get(0).uri);
+      Assert.assertNull(webServer.getExcludedTLSProtocols());
-      Assert.assertEquals("http://localhost:1", webServer.getBindings().get(1).uri);
+
+      webServer.setIncludedCipherSuites(null);
+      Assert.assertNull(webServer.getIncludedCipherSuites());
+
+      webServer.setExcludedCipherSuites(null);
+      Assert.assertNull(webServer.getExcludedCipherSuites());
    }
-
-   @Test
-   public void testWebServerConfigAndBinding() {
-      BindingDTO binding = new BindingDTO();
-      binding.uri = "http://localhost:0";
-
-      WebServerDTO webServer = new WebServerDTO();
-      webServer.bind = "http://localhost:1";
-      webServer.setBindings(Collections.singletonList(binding));
-
-      Assert.assertNotNull(webServer.getBindings());
-      Assert.assertEquals(1, webServer.getBindings().size());
-      Assert.assertNotNull(webServer.getDefaultBinding());
-      Assert.assertEquals("http://localhost:0", webServer.getDefaultBinding().uri);
-   }
-
 }

artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java

@@ -16,14 +16,25 @@
  */
 package org.apache.activemq.artemis.component;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Locale;
+
 import org.apache.activemq.artemis.ActiveMQWebLogger;
 import org.apache.activemq.artemis.components.ExternalComponent;
 import org.apache.activemq.artemis.dto.AppDTO;
-import org.apache.activemq.artemis.dto.BindingDTO;
 import org.apache.activemq.artemis.dto.ComponentDTO;
 import org.apache.activemq.artemis.dto.WebServerDTO;
 import org.eclipse.jetty.security.DefaultAuthenticatorFactory;
 import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.NCSARequestLog;
@@ -42,16 +53,6 @@ import org.eclipse.jetty.webapp.WebAppContext;
 import org.jboss.logging.Logger;
 
 import javax.servlet.DispatcherType;
-import java.io.File;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
 
 public class WebServerComponent implements ExternalComponent {
 
@@ -60,17 +61,19 @@ public class WebServerComponent implements ExternalComponent {
    private Server server;
    private HandlerList handlers;
    private WebServerDTO webServerConfig;
-   private final List<String> consoleUrls = new ArrayList<>();
+   private URI uri;
-   private final List<String> jolokiaUrls = new ArrayList<>();
+   private String consoleUrl;
    private List<WebAppContext> webContexts;
-   private ServerConnector[] connectors;
+   private ServerConnector connector;
    private Path artemisHomePath;
    private Path temporaryWarDir;
 
    @Override
    public void configure(ComponentDTO config, String artemisInstance, String artemisHome) throws Exception {
       webServerConfig = (WebServerDTO) config;
+      uri = new URI(webServerConfig.bind);
       server = new Server();
+      String scheme = uri.getScheme();
 
       HttpConfiguration httpConfiguration = new HttpConfiguration();
 
@@ -82,63 +85,49 @@ public class WebServerComponent implements ExternalComponent {
          }
       }
 
-      List<BindingDTO> bindings = webServerConfig.getBindings();
+      if ("https".equals(scheme)) {
-      connectors = new ServerConnector[bindings.size()];
+         SslContextFactory.Server sslFactory = new SslContextFactory.Server();
-      String[] virtualHosts = new String[bindings.size()];
+         sslFactory.setKeyStorePath(webServerConfig.keyStorePath == null ? artemisInstance + "/etc/keystore.jks" : webServerConfig.keyStorePath);
+         sslFactory.setKeyStorePassword(webServerConfig.getKeyStorePassword() == null ? "password" : webServerConfig.getKeyStorePassword());
+         String[] ips = sslFactory.getIncludeProtocols();
 
-      for (int i = 0; i < bindings.size(); i++) {
+         if (webServerConfig.getIncludedTLSProtocols() != null) {
-         BindingDTO binding = bindings.get(i);
+            sslFactory.setIncludeProtocols(webServerConfig.getIncludedTLSProtocols());
-         URI uri = new URI(binding.uri);
+         }
-         String scheme = uri.getScheme();
+         if (webServerConfig.getExcludedTLSProtocols() != null) {
-         ServerConnector connector;
+            sslFactory.setExcludeProtocols(webServerConfig.getExcludedTLSProtocols());
-
+         }
-         if ("https".equals(scheme)) {
+         if (webServerConfig.getIncludedCipherSuites() != null) {
-            SslContextFactory.Server sslFactory = new SslContextFactory.Server();
+            sslFactory.setIncludeCipherSuites(webServerConfig.getIncludedCipherSuites());
-            sslFactory.setKeyStorePath(binding.keyStorePath == null ? artemisInstance + "/etc/keystore.jks" : binding.keyStorePath);
+         }
-            sslFactory.setKeyStorePassword(binding.getKeyStorePassword() == null ? "password" : binding.getKeyStorePassword());
+         if (webServerConfig.getExcludedCipherSuites() != null) {
-
+            sslFactory.setExcludeCipherSuites(webServerConfig.getExcludedCipherSuites());
-            if (binding.getIncludedTLSProtocols() != null) {
+         }
-               sslFactory.setIncludeProtocols(binding.getIncludedTLSProtocols());
+         if (webServerConfig.clientAuth != null) {
-            }
+            sslFactory.setNeedClientAuth(webServerConfig.clientAuth);
-            if (binding.getExcludedTLSProtocols() != null) {
+            if (webServerConfig.clientAuth) {
-               sslFactory.setExcludeProtocols(binding.getExcludedTLSProtocols());
+               sslFactory.setTrustStorePath(webServerConfig.trustStorePath);
-            }
+               sslFactory.setTrustStorePassword(webServerConfig.getTrustStorePassword());
-            if (binding.getIncludedCipherSuites() != null) {
+            }
-               sslFactory.setIncludeCipherSuites(binding.getIncludedCipherSuites());
-            }
-            if (binding.getExcludedCipherSuites() != null) {
-               sslFactory.setExcludeCipherSuites(binding.getExcludedCipherSuites());
-            }
-            if (binding.clientAuth != null) {
-               sslFactory.setNeedClientAuth(binding.clientAuth);
-               if (binding.clientAuth) {
-                  sslFactory.setTrustStorePath(binding.trustStorePath);
-                  sslFactory.setTrustStorePassword(binding.getTrustStorePassword());
-               }
-            }
-
-            SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslFactory, "HTTP/1.1");
-
-            httpConfiguration.addCustomizer(new SecureRequestCustomizer());
-            httpConfiguration.setSendServerVersion(false);
-            HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfiguration);
-
-            connector = new ServerConnector(server, sslConnectionFactory, httpFactory);
-
-         } else {
-            httpConfiguration.setSendServerVersion(false);
-            ConnectionFactory connectionFactory = new HttpConnectionFactory(httpConfiguration);
-            connector = new ServerConnector(server, connectionFactory);
          }
-         connector.setPort(uri.getPort());
-         connector.setHost(uri.getHost());
-         connector.setName("Connector-" + i);
 
-         connectors[i] = connector;
+         SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslFactory, "HTTP/1.1");
-         virtualHosts[i] = "@Connector-" + i;
+
+         httpConfiguration.addCustomizer(new SecureRequestCustomizer());
+         httpConfiguration.setSendServerVersion(false);
+         HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfiguration);
+
+         connector = new ServerConnector(server, sslConnectionFactory, httpFactory);
+
+      } else {
+         httpConfiguration.setSendServerVersion(false);
+         ConnectionFactory connectionFactory = new HttpConnectionFactory(httpConfiguration);
+         connector = new ServerConnector(server, connectionFactory);
       }
+      connector.setPort(uri.getPort());
+      connector.setHost(uri.getHost());
 
-      server.setConnectors(connectors);
+      server.setConnectors(new Connector[]{connector});
 
       handlers = new HandlerList();
 
@@ -151,22 +140,18 @@ public class WebServerComponent implements ExternalComponent {
          Files.createDirectories(temporaryWarDir);
       }
 
-      for (int i = 0; i < bindings.size(); i++) {
+      if (webServerConfig.apps != null && webServerConfig.apps.size() > 0) {
-         BindingDTO binding = bindings.get(i);
+         webContexts = new ArrayList<>();
-         if (binding.apps != null && binding.apps.size() > 0) {
+         for (AppDTO app : webServerConfig.apps) {
-            webContexts = new ArrayList<>();
+            Path dirToUse = homeWarDir;
-            for (AppDTO app : binding.apps) {
+            if (new File(instanceWarDir.toFile().toString() + File.separator + app.war).exists()) {
-               Path dirToUse = homeWarDir;
+               dirToUse = instanceWarDir;
-               if (new File(instanceWarDir.toFile().toString() + File.separator + app.war).exists()) {
+            }
-                  dirToUse = instanceWarDir;
+            WebAppContext webContext = deployWar(app.url, app.war, dirToUse);
-               }
+            webContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
-               WebAppContext webContext = deployWar(app.url, app.war, dirToUse, virtualHosts[i]);
+            webContexts.add(webContext);
-               webContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
+            if (app.war.startsWith("console")) {
-               webContexts.add(webContext);
+               consoleUrl = webServerConfig.bind + "/" + app.url;
-               if (app.war.startsWith("console")) {
-                  consoleUrls.add(binding.uri + "/" + app.url);
-                  jolokiaUrls.add(binding.uri + "/" + app.url + "/jolokia");
-               }
             }
          }
       }
@@ -180,7 +165,6 @@ public class WebServerComponent implements ExternalComponent {
       homeContext.setContextPath("/");
       homeContext.setResourceBase(homeWarDir.toString());
       homeContext.setHandler(homeResourceHandler);
-      homeContext.setVirtualHosts(virtualHosts);
       homeContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
 
       ResourceHandler instanceResourceHandler = new ResourceHandler();
@@ -192,7 +176,6 @@ public class WebServerComponent implements ExternalComponent {
       instanceContext.setContextPath("/");
       instanceContext.setResourceBase(instanceWarDir.toString());
       instanceContext.setHandler(instanceResourceHandler);
-      instanceContext.setVirtualHosts(virtualHosts);
       homeContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
 
       DefaultHandler defaultHandler = new DefaultHandler();
@@ -280,15 +263,12 @@ public class WebServerComponent implements ExternalComponent {
       }
       cleanupTmp();
       server.start();
+      ActiveMQWebLogger.LOGGER.webserverStarted(webServerConfig.bind);
 
-      String bindings = webServerConfig.getBindings()
+      if (consoleUrl != null) {
-            .stream()
+         ActiveMQWebLogger.LOGGER.jolokiaAvailable(consoleUrl + "/jolokia");
-            .map(binding -> binding.uri)
+         ActiveMQWebLogger.LOGGER.consoleAvailable(consoleUrl);
-            .collect(Collectors.joining(", "));
+      }
-      ActiveMQWebLogger.LOGGER.webserverStarted(bindings);
-
-      ActiveMQWebLogger.LOGGER.jolokiaAvailable(String.join(", ", jolokiaUrls));
-      ActiveMQWebLogger.LOGGER.consoleAvailable(String.join(", ", consoleUrls));
    }
 
    public void internalStop() throws Exception {
@@ -344,19 +324,11 @@ public class WebServerComponent implements ExternalComponent {
    /**
     * @return started server's port number; useful if it was specified as 0 (to use a random port)
     */
-   @Deprecated
    public int getPort() {
-      return getPort(0);
+      return (connector != null) ? connector.getLocalPort() : -1;
    }
 
-   public int getPort(int connectorIndex) {
+   private WebAppContext deployWar(String url, String warFile, Path warDirectory) throws IOException {
-      if (connectorIndex < connectors.length) {
-         return connectors[connectorIndex].getLocalPort();
-      }
-      return -1;
-   }
-
-   private WebAppContext deployWar(String url, String warFile, Path warDirectory, String virtualHost) {
       WebAppContext webapp = new WebAppContext();
       if (url.startsWith("/")) {
          webapp.setContextPath(url);
@@ -375,8 +347,6 @@ public class WebServerComponent implements ExternalComponent {
       // https://github.com/eclipse/jetty.project/commit/7e91d34177a880ecbe70009e8f200d02e3a0c5dd
       webapp.getSecurityHandler().setAuthenticatorFactory(new DefaultAuthenticatorFactory());
 
-      webapp.setVirtualHosts(new String[]{virtualHost});
-
       handlers.addHandler(webapp);
       return webapp;
    }

artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java

@@ -27,7 +27,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
@@ -63,7 +62,6 @@ import org.apache.activemq.artemis.component.WebServerComponent;
 import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport;
 import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.dto.AppDTO;
-import org.apache.activemq.artemis.dto.BindingDTO;
 import org.apache.activemq.artemis.dto.BrokerDTO;
 import org.apache.activemq.artemis.dto.WebServerDTO;
 import org.apache.activemq.artemis.utils.ThreadLeakCheckRule;
@@ -116,10 +114,8 @@ public class WebServerComponentTest extends Assert {
    }
 
    private void internalSimpleServer(boolean useCustomizer) throws Exception {
-      BindingDTO bindingDTO = new BindingDTO();
-      bindingDTO.uri = "http://localhost:0";
       WebServerDTO webServerDTO = new WebServerDTO();
-      webServerDTO.setBindings(Collections.singletonList(bindingDTO));
+      webServerDTO.bind = "http://localhost:0";
       webServerDTO.path = "webapps";
       if (useCustomizer) {
          webServerDTO.customizer = TestCustomizer.class.getName();
@@ -166,10 +162,8 @@ public class WebServerComponentTest extends Assert {
 
    @Test
    public void testComponentStopBehavior() throws Exception {
-      BindingDTO bindingDTO = new BindingDTO();
-      bindingDTO.uri = "http://localhost:0";
       WebServerDTO webServerDTO = new WebServerDTO();
-      webServerDTO.setBindings(Collections.singletonList(bindingDTO));
+      webServerDTO.bind = "http://localhost:0";
       webServerDTO.path = "webapps";
       WebServerComponent webServerComponent = new WebServerComponent();
       Assert.assertFalse(webServerComponent.isStarted());
@@ -212,22 +206,20 @@ public class WebServerComponentTest extends Assert {
 
    @Test
    public void simpleSecureServer() throws Exception {
-      BindingDTO bindingDTO = new BindingDTO();
+      WebServerDTO webServerDTO = new WebServerDTO();
-      bindingDTO.uri = "https://localhost:0";
+      webServerDTO.bind = "https://localhost:0";
-      bindingDTO.keyStorePath = "./src/test/resources/server.keystore";
+      webServerDTO.path = "webapps";
-      bindingDTO.setKeyStorePassword("password");
+      webServerDTO.keyStorePath = "./src/test/resources/server.keystore";
+      webServerDTO.setKeyStorePassword("password");
       if (System.getProperty("java.vendor").contains("IBM")) {
          //By default on IBM Java 8 JVM, org.eclipse.jetty.util.ssl.SslContextFactory doesn't include TLSv1.2
          // while it excludes all TLSv1 and TLSv1.1 cipher suites.
-         bindingDTO.setIncludedTLSProtocols("TLSv1.2");
+         webServerDTO.setIncludedTLSProtocols("TLSv1.2");
          // Remove excluded cipher suites matching the prefix `SSL` because the names of the IBM Java 8 JVM cipher suites
          // have the prefix `SSL` while the `DEFAULT_EXCLUDED_CIPHER_SUITES` of org.eclipse.jetty.util.ssl.SslContextFactory
          // includes "^SSL_.*$". So all IBM JVM cipher suites are excluded by SslContextFactory using the `DEFAULT_EXCLUDED_CIPHER_SUITES`.
-         bindingDTO.setExcludedCipherSuites(Arrays.stream(new SslContextFactory.Server().getExcludeCipherSuites()).filter(s -> !Pattern.matches(s, "SSL_")).toArray(String[]::new));
+         webServerDTO.setExcludedCipherSuites(Arrays.stream(new SslContextFactory.Server().getExcludeCipherSuites()).filter(s -> !Pattern.matches(s, "SSL_")).toArray(String[]::new));
       }
-      WebServerDTO webServerDTO = new WebServerDTO();
-      webServerDTO.setBindings(Collections.singletonList(bindingDTO));
-      webServerDTO.path = "webapps";
 
       WebServerComponent webServerComponent = new WebServerComponent();
       Assert.assertFalse(webServerComponent.isStarted());
@@ -238,10 +230,10 @@ public class WebServerComponentTest extends Assert {
       // Make the connection attempt.
 
       SSLContext context = new SSLSupport()
-         .setKeystorePath(bindingDTO.keyStorePath)
+         .setKeystorePath(webServerDTO.keyStorePath)
-         .setKeystorePassword(bindingDTO.getKeyStorePassword())
+         .setKeystorePassword(webServerDTO.getKeyStorePassword())
-         .setTruststorePath(bindingDTO.keyStorePath)
+         .setTruststorePath(webServerDTO.keyStorePath)
-         .setTruststorePassword(bindingDTO.getKeyStorePassword())
+         .setTruststorePassword(webServerDTO.getKeyStorePassword())
          .createContext();
 
       SSLEngine engine = context.createSSLEngine();
@@ -287,25 +279,23 @@ public class WebServerComponentTest extends Assert {
 
    @Test
    public void simpleSecureServerWithClientAuth() throws Exception {
-      BindingDTO bindingDTO = new BindingDTO();
+      WebServerDTO webServerDTO = new WebServerDTO();
-      bindingDTO.uri = "https://localhost:0";
+      webServerDTO.bind = "https://localhost:0";
-      bindingDTO.keyStorePath = "./src/test/resources/server.keystore";
+      webServerDTO.path = "webapps";
-      bindingDTO.setKeyStorePassword("password");
+      webServerDTO.keyStorePath = "./src/test/resources/server.keystore";
-      bindingDTO.clientAuth = true;
+      webServerDTO.setKeyStorePassword("password");
-      bindingDTO.trustStorePath = "./src/test/resources/server.keystore";
+      webServerDTO.clientAuth = true;
-      bindingDTO.setTrustStorePassword("password");
+      webServerDTO.trustStorePath = "./src/test/resources/server.keystore";
+      webServerDTO.setTrustStorePassword("password");
       if (System.getProperty("java.vendor").contains("IBM")) {
          //By default on IBM Java 8 JVM, org.eclipse.jetty.util.ssl.SslContextFactory doesn't include TLSv1.2
          // while it excludes all TLSv1 and TLSv1.1 cipher suites.
-         bindingDTO.setIncludedTLSProtocols("TLSv1.2");
+         webServerDTO.setIncludedTLSProtocols("TLSv1.2");
          // Remove excluded cipher suites matching the prefix `SSL` because the names of the IBM Java 8 JVM cipher suites
          // have the prefix `SSL` while the `DEFAULT_EXCLUDED_CIPHER_SUITES` of org.eclipse.jetty.util.ssl.SslContextFactory
          // includes "^SSL_.*$". So all IBM JVM cipher suites are excluded by SslContextFactory using the `DEFAULT_EXCLUDED_CIPHER_SUITES`.
-         bindingDTO.setExcludedCipherSuites(Arrays.stream(new SslContextFactory.Server().getExcludeCipherSuites()).filter(s -> !Pattern.matches(s, "SSL_")).toArray(String[]::new));
+         webServerDTO.setExcludedCipherSuites(Arrays.stream(new SslContextFactory.Server().getExcludeCipherSuites()).filter(s -> !Pattern.matches(s, "SSL_")).toArray(String[]::new));
       }
-      WebServerDTO webServerDTO = new WebServerDTO();
-      webServerDTO.setBindings(Collections.singletonList(bindingDTO));
-      webServerDTO.path = "webapps";
 
       WebServerComponent webServerComponent = new WebServerComponent();
       Assert.assertFalse(webServerComponent.isStarted());
@@ -316,10 +306,10 @@ public class WebServerComponentTest extends Assert {
       // Make the connection attempt.
 
       SSLContext context = new SSLSupport()
-         .setKeystorePath(bindingDTO.keyStorePath)
+         .setKeystorePath(webServerDTO.keyStorePath)
-         .setKeystorePassword(bindingDTO.getKeyStorePassword())
+         .setKeystorePassword(webServerDTO.getKeyStorePassword())
-         .setTruststorePath(bindingDTO.trustStorePath)
+         .setTruststorePath(webServerDTO.trustStorePath)
-         .setTruststorePassword(bindingDTO.getTrustStorePassword())
+         .setTruststorePassword(webServerDTO.getTrustStorePassword())
          .createContext();
 
       SSLEngine engine = context.createSSLEngine();
@@ -368,7 +358,7 @@ public class WebServerComponentTest extends Assert {
       XmlBrokerFactoryHandler xmlHandler = new XmlBrokerFactoryHandler();
       BrokerDTO broker = xmlHandler.createBroker(bootstrap.toURI(), brokerHome.getAbsolutePath(), brokerHome.getAbsolutePath(), brokerHome.toURI());
       assertNotNull(broker.web);
-      assertNull(broker.web.getDefaultBinding().passwordCodec);
+      assertNull(broker.web.passwordCodec);
    }
 
    @Test
@@ -380,8 +370,8 @@ public class WebServerComponentTest extends Assert {
       XmlBrokerFactoryHandler xmlHandler = new XmlBrokerFactoryHandler();
       BrokerDTO broker = xmlHandler.createBroker(bootstrap.toURI(), brokerHome.getAbsolutePath(), brokerHome.getAbsolutePath(), brokerHome.toURI());
       assertNotNull(broker.web);
-      assertEquals(keyPassword, broker.web.getDefaultBinding().getKeyStorePassword());
+      assertEquals(keyPassword, broker.web.getKeyStorePassword());
-      assertEquals(trustPassword, broker.web.getDefaultBinding().getTrustStorePassword());
+      assertEquals(trustPassword, broker.web.getTrustStorePassword());
    }
 
    @Test
@@ -393,44 +383,24 @@ public class WebServerComponentTest extends Assert {
       XmlBrokerFactoryHandler xmlHandler = new XmlBrokerFactoryHandler();
       BrokerDTO broker = xmlHandler.createBroker(bootstrap.toURI(), brokerHome.getAbsolutePath(), brokerHome.getAbsolutePath(), brokerHome.toURI());
       assertNotNull(broker.web);
-      assertNotNull("password codec not picked up!", broker.web.getDefaultBinding().passwordCodec);
+      assertNotNull("password codec not picked up!", broker.web.passwordCodec);
 
-      assertEquals(keyPassword, broker.web.getDefaultBinding().getKeyStorePassword());
+      assertEquals(keyPassword, broker.web.getKeyStorePassword());
-      assertEquals(trustPassword, broker.web.getDefaultBinding().getTrustStorePassword());
+      assertEquals(trustPassword, broker.web.getTrustStorePassword());
-   }
-
-   @Test
-   public void testOldConfigurationStyle() throws Exception {
-      final String keyPassword = "keypass";
-      final String trustPassword = "trustpass";
-
-      File bootstrap = new File("./target/test-classes/bootstrap_web_old_config.xml");
-      File brokerHome = new File("./target");
-      XmlBrokerFactoryHandler xmlHandler = new XmlBrokerFactoryHandler();
-      BrokerDTO broker = xmlHandler.createBroker(bootstrap.toURI(), brokerHome.getAbsolutePath(), brokerHome.getAbsolutePath(), brokerHome.toURI());
-      assertNotNull(broker.web);
-      assertNotNull("password codec not picked up!", broker.web.getDefaultBinding().passwordCodec);
-
-      assertEquals("http://localhost:8161", broker.web.getDefaultBinding().uri);
-      assertEquals(keyPassword, broker.web.getDefaultBinding().getKeyStorePassword());
-      assertEquals(trustPassword, broker.web.getDefaultBinding().getTrustStorePassword());
    }
 
    @Test
    public void testServerCleanupBeforeStart() throws Exception {
       final String warName = "simple-app.war";
       createTestWar(warName);
-
+      WebServerDTO webServerDTO = new WebServerDTO();
+      webServerDTO.bind = "http://localhost:0";
+      webServerDTO.path = "";
+      webServerDTO.apps = new ArrayList<>();
       AppDTO app = new AppDTO();
       app.url = "simple-app/";
       app.war = warName;
-      BindingDTO bindingDTO = new BindingDTO();
+      webServerDTO.apps.add(app);
-      bindingDTO.uri = "http://localhost:0";
-      bindingDTO.apps = new ArrayList<>();
-      bindingDTO.apps.add(app);
-      WebServerDTO webServerDTO = new WebServerDTO();
-      webServerDTO.setBindings(Collections.singletonList(bindingDTO));
-      webServerDTO.path = "";
       WebServerComponent webServerComponent = new WebServerComponent();
       Assert.assertFalse(webServerComponent.isStarted());
       testedComponents.add(webServerComponent);

artemis-web/src/test/resources/bootstrap_secure_web.xml

@@ -25,10 +25,8 @@
    <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
 
    <!-- The web server is only bound to localhost by default -->
-   <web path="web">
+   <web bind="https://localhost:8443" path="web" keyStorePassword="ENC(-5a2376c61c668aaf)" trustStorePassword="ENC(3d617352d12839eb71208edf41d66b34)">
-      <binding uri="https://localhost:8443" keyStorePassword="ENC(-5a2376c61c668aaf)" trustStorePassword="ENC(3d617352d12839eb71208edf41d66b34)">
+       <app url="activemq-branding" war="activemq-branding.war"/>
-         <app url="activemq-branding" war="activemq-branding.war"/>
-      </binding>
    </web>
 
 

artemis-web/src/test/resources/bootstrap_web.xml

@@ -25,10 +25,8 @@
    <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
 
    <!-- The web server is only bound to localhost by default -->
-   <web path="web">
+   <web bind="http://localhost:8161" path="web">
-      <binding uri="http://localhost:8161">
+       <app url="activemq-branding" war="activemq-branding.war"/>
-         <app url="activemq-branding" war="activemq-branding.war"/>
-      </binding>
    </web>
 
 

artemis-web/src/test/resources/bootstrap_web_codec.xml

@@ -25,10 +25,8 @@
    <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
 
    <!-- The web server is only bound to localhost by default -->
-   <web path="web">
+   <web bind="https://localhost:8443" path="web" passwordCodec="org.apache.activemq.artemis.utils.MaskPasswordResolvingTest$SimplePasswordCodec" keyStorePassword="ENC(youneverknow)" trustStorePassword="ENC(youcanguess)">
-       <binding uri="https://localhost:8443" passwordCodec="org.apache.activemq.artemis.utils.MaskPasswordResolvingTest$SimplePasswordCodec" keyStorePassword="ENC(youneverknow)" trustStorePassword="ENC(youcanguess)">
+       <app url="console" war="console.war"/>
-           <app url="console" war="console.war"/>
-       </binding>
    </web>
 
 

artemis-web/src/test/resources/bootstrap_web_old_config.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements. See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License. You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<broker xmlns="http://activemq.org/schema">
-
-   <jaas-security domain="activemq"/>
-
-   <!-- artemis.URI.instance is parsed from artemis.instance by the CLI startup.
-        This is to avoid situations where you could have spaces or special characters on this URI -->
-   <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
-
-   <!-- The web server is only bound to localhost by default -->
-   <web path="web" bind="http://localhost:8161"  passwordCodec="org.apache.activemq.artemis.utils.MaskPasswordResolvingTest$SimplePasswordCodec" keyStorePassword="ENC(youneverknow)" trustStorePassword="ENC(youcanguess)">
-      <app url="activemq-branding" war="activemq-branding.war"/>
-   </web>
-
-
-</broker>
-

docs/user-manual/en/masking-passwords.md

@@ -224,12 +224,10 @@ You can also set the `passwordCodec` attribute if you want to use a password
 codec other than the default one. For example
 
 ```xml
-<web path="web">
+<web bind="https://localhost:8443" path="web" 
-    <binding uri="https://localhost:8443" 
+     keyStorePassword="ENC(-5a2376c61c668aaf)"
-             keyStorePassword="ENC(-5a2376c61c668aaf)"
+     trustStorePassword="ENC(3d617352d12839eb71208edf41d66b34)">
-             trustStorePassword="ENC(3d617352d12839eb71208edf41d66b34)">
+    <app url="activemq-branding" war="activemq-branding.war"/>
-        <app url="activemq-branding" war="activemq-branding.war"/>
-    </binding>
 </web>
 ```
 

docs/user-manual/en/security.md

@@ -1363,10 +1363,8 @@ documentation via an embedded server. By default the web access is plain HTTP.
 It is configured in `bootstrap.xml`:
 
 ```xml
-<web path="web">
+<web bind="http://localhost:8161" path="web">
-    <binding uri="http://localhost:8161">
+    <app url="console" war="console.war"/>
-        <app url="console" war="console.war"/>
-    </binding> 
 </web>
 ```
 
@@ -1374,12 +1372,11 @@ Alternatively you can edit the above configuration to enable secure access
 using HTTPS protocol. e.g.:
 
 ```xml
-<web path="web">
+<web bind="https://localhost:8443"
-    <binding uri="https://localhost:8443"
+    path="web"
-             keyStorePath="${artemis.instance}/etc/keystore.jks"
+    keyStorePath="${artemis.instance}/etc/keystore.jks"
-             keyStorePassword="password">
+    keyStorePassword="password">
-        <app url="jolokia" war="jolokia-war-1.3.5.war"/>
+    <app url="jolokia" war="jolokia-war-1.3.5.war"/>
-    </binding>
 </web>
 ```
 
@@ -1428,15 +1425,14 @@ keytool -storetype pkcs12 -keystore client-truststore.p12 -storepass securepass
 - Enable secure access using HTTPS protocol with client authentication,
 use the truststore file created in the previous step to set the trustStorePath and trustStorePassword:
 ```xml
-<web path="web">
+<web bind="https://localhost:8443"
-    <binding uri="https://localhost:8443"
+    path="web"
-             keyStorePath="${artemis.instance}/etc/server-keystore.p12"
+    keyStorePath="${artemis.instance}/etc/server-keystore.p12"
-             keyStorePassword="password"
+    keyStorePassword="password"
-             clientAuth="true"
+    clientAuth="true"
-             trustStorePath="${artemis.instance}/etc/client-truststore.p12"
+    trustStorePath="${artemis.instance}/etc/client-truststore.p12"
-             trustStorePassword="password">
+    trustStorePassword="password">
-        <app url="jolokia" war="jolokia-war-1.3.5.war"/>
+    <app url="jolokia" war="jolokia-war-1.3.5.war"/>
-    </binding>
 </web>
 ```
 

docs/user-manual/en/using-server.md

@@ -457,12 +457,10 @@ The `bootstrap.xml` file is very simple. Let's take a look at an example:
 
    <server configuration="file:/path/to/broker.xml"/>
 
-   <web path="web">
+   <web bind="http://localhost:8161" path="web">
-      <binding uri="http://localhost:8161">
+      <app url="activemq-branding" war="activemq-branding.war"/>
-         <app url="activemq-branding" war="activemq-branding.war"/>
+      <app url="artemis-plugin" war="artemis-plugin.war"/>
-         <app url="artemis-plugin" war="artemis-plugin.war"/>
+      <app url="console" war="console.war"/>
-         <app url="console" war="console.war"/>
-      </binding>
    </web>
 </broker>
 ```

docs/user-manual/en/web-server.md

@@ -12,28 +12,21 @@ The embedded Jetty instance is configured in `etc/bootstrap.xml` via the `web`
 element, e.g.:
 
 ```xml
-<web path="web">
+<web bind="http://localhost:8161" path="web">
-   <binding uri="http://localhost:8161">
+   <app url="activemq-branding" war="activemq-branding.war"/>
-      <app url="activemq-branding" war="activemq-branding.war"/>
+   <app url="artemis-plugin" war="artemis-plugin.war"/>
-      <app url="artemis-plugin" war="artemis-plugin.war"/>
+   <app url="console" war="console.war"/>
-      <app url="console" war="console.war"/>
-   </binding>
 </web>
 ```
 
 The `web` element has the following attributes:
 
+- `bind` The protocol to use (i.e. `http` or `https`) as well as the host and
+  port on which to listen.
 - `path` The name of the subdirectory in which to find the web application
   archives (i.e. WAR files). This is a subdirectory of the broker's home or
   instance directory.
 - `customizer` The name of customizer class to load.
-
-The `web` element should contain at least one `binding` element to configure how 
-clients can connect to the web-server. A `binding` element has the following
-attributes:
-
-- `uri` The protocol to use (i.e. `http` or `https`) as well as the host and
-  port on which to listen. This attribute is required.
 - `clientAuth` Whether or not clients should present an SSL certificate when
   they connect. Only applicable when using `https`.
 - `passwordCodec` The custom coded to use for unmasking the `keystorePassword`
@@ -58,8 +51,8 @@ attributes:
 - `excludedCipherSuites` A comma seperated list of excluded cipher suites.
   Only applicable when using `https`.
 
-Each web application should be defined in an `app` element inside an `binding` element.
+Each web application should be defined in an `app` element. The `app` element
-The `app` element has the following attributes:
+has the following attributes:
 
 - `url` The context to use for the web application.
 - `war` The name of the web application archive on disk.
@@ -89,12 +82,10 @@ instance. Default values are based on this implementation.
 Here is an example configuration:
 
 ```xml
-<web path="web">
+<web bind="http://localhost:8161" path="web">
-   <binding uri="http://localhost:8161">
+   <app url="activemq-branding" war="activemq-branding.war"/>
-      <app url="activemq-branding" war="activemq-branding.war"/>
+   <app url="artemis-plugin" war="artemis-plugin.war"/>
-      <app url="artemis-plugin" war="artemis-plugin.war"/>
+   <app url="console" war="console.war"/>
-      <app url="console" war="console.war"/>
-   </binding>
    <request-log filename="${artemis.instance}/log/http-access-yyyy_MM_dd.log" append="true" extended="true"/>
 </web>
 ```
@@ -108,11 +99,9 @@ customizer to handle `X-Forwarded` headers.
 Set the `customizer` attribute via the `web` element to enable the [`ForwardedRequestCustomizer`](https://www.eclipse.org/jetty/javadoc/current/org/eclipse/jetty/server/ForwardedRequestCustomizer.html) customizer, ie:
 
 ```xml
-<web path="web" customizer="org.eclipse.jetty.server.ForwardedRequestCustomizer">
+<web bind="http://localhost:8161" path="web" customizer="org.eclipse.jetty.server.ForwardedRequestCustomizer">
-   <binding uri="http://localhost:8161">
+   <app url="activemq-branding" war="activemq-branding.war"/>
-      <app url="activemq-branding" war="activemq-branding.war"/>
+   <app url="artemis-plugin" war="artemis-plugin.war"/>
-      <app url="artemis-plugin" war="artemis-plugin.war"/>
+   <app url="console" war="console.war"/>
-      <app url="console" war="console.war"/>
-   </binding>
 </web>
 ```

examples/features/standard/camel/camel-broker/src/main/resources/activemq/server0/bootstrap.xml

@@ -22,11 +22,9 @@
 
    <server configuration="${artemis.URI.instance}/etc/broker.xml"/>
 
-   <web path="web">
+   <web bind="http://localhost:8080" path="web">
-      <binding uri="http://localhost:8080">
+      <!-- ${war} is defined in the example's pom.xml -->
-         <!-- ${war} is defined in the example's pom.xml -->
+      <app url="camel" war="WARFILE"/>
-         <app url="camel" war="WARFILE"/>
-      </binding>
    </web>
 </broker>
 

examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/readme.md

@@ -126,8 +126,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/came
 6) Edit `$ARTEMIS_INSTANCE/etc/bootstrap.xml` so that the embedded web broker runs on a different port that the 5.x broker (e.g. 8162):
 
 ```xml
-<web path="web">
+<web bind="http://localhost:8162" path="web">
-  <binding uri="http://localhost:8162"/>
 ```
 
 ## Testing

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java

@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -35,7 +34,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ServiceComponent;
 import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
 import org.apache.activemq.artemis.dto.AppDTO;
-import org.apache.activemq.artemis.dto.BindingDTO;
 import org.apache.activemq.artemis.dto.WebServerDTO;
 import org.apache.activemq.artemis.tests.util.Wait;
 import org.junit.Assert;
@@ -164,15 +162,13 @@ public class ReplicatedFailoverTest extends FailoverTest {
                os.close();
             }
          });
+         WebServerDTO wdto = new WebServerDTO();
          AppDTO appDTO = new AppDTO();
          appDTO.war = "console.war";
          appDTO.url = "console";
-         BindingDTO bindingDTO = new BindingDTO();
+         wdto.apps = new ArrayList<AppDTO>();
-         bindingDTO.uri = "http://localhost:0";
+         wdto.apps.add(appDTO);
-         bindingDTO.apps = new ArrayList<AppDTO>();
+         wdto.bind = "http://localhost:0";
-         bindingDTO.apps.add(appDTO);
-         WebServerDTO wdto = new WebServerDTO();
-         wdto.setBindings(Collections.singletonList(bindingDTO));
          wdto.path = "console";
          WebServerComponent webServerComponent = new WebServerComponent();
          webServerComponent.configure(wdto, ".", ".");

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/quorum/PluggableQuorumNettyNoGroupNameReplicatedFailoverTest.java

@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -36,7 +35,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.NodeManager;
 import org.apache.activemq.artemis.core.server.ServiceComponent;
 import org.apache.activemq.artemis.dto.AppDTO;
-import org.apache.activemq.artemis.dto.BindingDTO;
 import org.apache.activemq.artemis.dto.WebServerDTO;
 import org.apache.activemq.artemis.quorum.MutableLong;
 import org.apache.activemq.artemis.quorum.file.FileBasedPrimitiveManager;
@@ -129,6 +127,7 @@ public class PluggableQuorumNettyNoGroupNameReplicatedFailoverTest extends Failo
 
    @Test
    public void testReplicatedFailbackBackupFromLiveBackToBackup() throws Exception {
+
       InetSocketAddress address = new InetSocketAddress("127.0.0.1", 8787);
       HttpServer httpServer = HttpServer.create(address, 100);
       httpServer.start();
@@ -144,15 +143,13 @@ public class PluggableQuorumNettyNoGroupNameReplicatedFailoverTest extends Failo
                os.close();
             }
          });
+         WebServerDTO wdto = new WebServerDTO();
          AppDTO appDTO = new AppDTO();
          appDTO.war = "console.war";
          appDTO.url = "console";
-         BindingDTO bindingDTO = new BindingDTO();
+         wdto.apps = new ArrayList<AppDTO>();
-         bindingDTO.uri = "http://localhost:0";
+         wdto.apps.add(appDTO);
-         bindingDTO.apps = new ArrayList<AppDTO>();
+         wdto.bind = "http://localhost:0";
-         bindingDTO.apps.add(appDTO);
-         WebServerDTO wdto = new WebServerDTO();
-         wdto.setBindings(Collections.singletonList(bindingDTO));
          wdto.path = "console";
          WebServerComponent webServerComponent = new WebServerComponent();
          webServerComponent.configure(wdto, ".", ".");

tests/smoke-tests/src/main/resources/containerService/bootstrap.xml

@@ -26,12 +26,10 @@
    <server configuration="file:/var/lib/artemis-instance/./etc//broker.xml"/>
 
    <!-- The web server is only bound to localhost by default -->
-   <web path="web">
+   <web bind="http://localhost:8161" path="web">
-      <binding uri="http://localhost:8161">
+       <app url="activemq-branding" war="activemq-branding.war"/>
-         <app url="activemq-branding" war="activemq-branding.war"/>
+       <app url="artemis-plugin" war="artemis-plugin.war"/>
-         <app url="artemis-plugin" war="artemis-plugin.war"/>
+       <app url="console" war="console.war"/>
-         <app url="console" war="console.war"/>
-      </binding>
    </web>