You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by br...@apache.org on 2021/10/28 10:03:54 UTC
[activemq-artemis] branch main updated: NO-JIRA Fix console mutual
ssl smoke test
This is an automated email from the ASF dual-hosted git repository.
brusdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new c54f335 NO-JIRA Fix console mutual ssl smoke test
c54f335 is described below
commit c54f335f620bdb5de75e2e3985996c9f344cfb48
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Wed Oct 27 23:07:44 2021 +0200
NO-JIRA Fix console mutual ssl smoke test
---
tests/smoke-tests/pom.xml | 15 ++++++++
.../servers/console-mutual-ssl/bootstrap.xml | 43 ----------------------
2 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 6759cbb..6aa9328 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -259,6 +259,21 @@
<noWeb>false</noWeb>
<instance>${basedir}/target/console-mutual-ssl</instance>
<configuration>${basedir}/target/classes/servers/console-mutual-ssl</configuration>
+ <args>
+ <arg>--http-host</arg>
+ <arg>localhost</arg>
+ <arg>--http-port</arg>
+ <arg>8443</arg>
+ <arg>--ssl-key</arg>
+ <arg>../../test-classes/server-keystore.p12</arg>
+ <arg>--ssl-key-password</arg>
+ <arg>securepass</arg>
+ <arg>--use-client-auth</arg>
+ <arg>--ssl-trust</arg>
+ <arg>../../test-classes/client-ca-truststore.p12</arg>
+ <arg>--ssl-trust-password</arg>
+ <arg>securepass</arg>
+ </args>
</configuration>
</execution>
<execution>
diff --git a/tests/smoke-tests/src/main/resources/servers/console-mutual-ssl/bootstrap.xml b/tests/smoke-tests/src/main/resources/servers/console-mutual-ssl/bootstrap.xml
deleted file mode 100644
index f597aa1..0000000
--- a/tests/smoke-tests/src/main/resources/servers/console-mutual-ssl/bootstrap.xml
+++ /dev/null
@@ -1,43 +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="file:/home/dbruscin/Workspace/temp/apache-artemis-2.19.0/broker-guest/etc//broker.xml"/>
-
- <!-- The web server is only bound to localhost by default -->
- <web bind="https://localhost:8443"
- path="web"
- keyStorePath="../../test-classes/server-keystore.p12"
- keyStorePassword="securepass"
- clientAuth="true"
- trustStorePath="../../test-classes/client-ca-truststore.p12"
- trustStorePassword="securepass">
- <app url="activemq-branding" war="activemq-branding.war"/>
- <app url="artemis-plugin" war="artemis-plugin.war"/>
- <app url="console" war="console.war"/>
- </web>
-
-
-</broker>
-