This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new a30d8fef69 ARTEMIS-5835: update to artemis-console 1.5.0
a30d8fef69 is described below
commit a30d8fef6925df6f08b357e67686b652046b436e
Author: Robbie Gemmell <[email protected]>
AuthorDate: Tue Dec 23 12:23:34 2025 +0000
ARTEMIS-5835: update to artemis-console 1.5.0
Updates naming details relevant to ARTEMIS-5816 also.
---
artemis-console/pom.xml | 4 ++--
artemis-console/src/main/webapp/hawtconfig.json | 20 ++++++++++----------
artemis-distribution/pom.xml | 2 +-
artemis-pom/pom.xml | 4 ++--
pom.xml | 2 +-
.../artemis/tests/smoke/console/PageConstants.java | 7 ++++---
.../smoke/console/pages/jmx/ArtemisTreePage.java | 4 ++--
.../smoke/console/pages/jmx/AttributesPage.java | 2 ++
8 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/artemis-console/pom.xml b/artemis-console/pom.xml
index bf7bb7fd36..4e3593f033 100644
--- a/artemis-console/pom.xml
+++ b/artemis-console/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>org.apache.artemis</groupId>
<artifactId>artemis-console-war</artifactId>
<type>war</type>
</dependency>
@@ -86,7 +86,7 @@
</webResources>
<overlays>
<overlay>
- <groupId>org.apache.activemq</groupId>
+ <groupId>org.apache.artemis</groupId>
<artifactId>artemis-console-war</artifactId>
<excludes>
<exclude>WEB-INF/lib/guava*.jar</exclude>
diff --git a/artemis-console/src/main/webapp/hawtconfig.json
b/artemis-console/src/main/webapp/hawtconfig.json
index 59f79677b4..835f2796e5 100644
--- a/artemis-console/src/main/webapp/hawtconfig.json
+++ b/artemis-console/src/main/webapp/hawtconfig.json
@@ -2,24 +2,24 @@
"branding": {
"appName": "Artemis Console",
"showAppName": false,
- "appLogoUrl": "img/activemq.png",
- "companyLogoUrl": "img/activemq.png",
- "css": "css/activemq.css",
+ "appLogoUrl": "img/artemis.png",
+ "companyLogoUrl": "img/artemis.png",
+ "css": "css/artemis.css",
"favicon": "img/favicon.png"
},
"login": {
- "description": "Login page for ActiveMQ Artemis Console.",
+ "description": "Login page for Apache Artemis Console.",
"links": [
- { "url":
"https://activemq.apache.org/components/artemis/documentation/";, "text":
"Documentation" },
- { "url": "https://activemq.apache.org/";, "text": "Website" }
+ { "url": "https://artemis.apache.org/components/artemis/documentation/";,
"text": "Documentation" },
+ { "url": "https://artemis.apache.org/";, "text": "Website" }
]
},
"about": {
- "title": "ActiveMQ Artemis Management Console",
- "productInfo": [{"name": "ActiveMQ Artemis", "value":
"${project.version}"}],
+ "title": "Apache Artemis Management Console",
+ "productInfo": [{"name": "Apache Artemis", "value": "${project.version}"}],
"additionalInfo": "",
"copyright": " ",
- "imgSrc": "img/activemq.png"
+ "imgSrc": "img/artemis.png"
},
"disabledRoutes": []
-}
\ No newline at end of file
+}
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 791ca1d34b..356efc5933 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -156,7 +156,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.activemq</groupId>
+ <groupId>org.apache.artemis</groupId>
<artifactId>apache-artemis-console</artifactId>
<type>zip</type>
<classifier>bin</classifier>
diff --git a/artemis-pom/pom.xml b/artemis-pom/pom.xml
index a55d17c3a0..88d7d9ac60 100644
--- a/artemis-pom/pom.xml
+++ b/artemis-pom/pom.xml
@@ -232,14 +232,14 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>org.apache.artemis</groupId>
<artifactId>artemis-console-war</artifactId>
<type>war</type>
<version>${artemis-console-version}</version>
</dependency>
<!-- License: Apache 2.0 -->
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>org.apache.artemis</groupId>
<artifactId>apache-artemis-console</artifactId>
<version>${artemis-console-version}</version>
<type>zip</type>
diff --git a/pom.xml b/pom.xml
index 0fad49d6ee..afcf518d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported
</modular.jdk.surefire.arg>
<activemq-artemis-native-version>2.0.0</activemq-artemis-native-version>
- <artemis-console-version>1.3.0</artemis-console-version>
+ <artemis-console-version>1.5.0</artemis-console-version>
<karaf.version>4.4.8</karaf.version>
<pax.exam.version>4.14.0</pax.exam.version>
<commons.config.version>2.13.0</commons.config.version>
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java
index 9535ebabde..ce8abf4973 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/PageConstants.java
@@ -47,8 +47,8 @@ public class PageConstants {
public static final String COLUMN_ORIGINAL_QUEUE = "Original Queue";
- // Node prrefixes
- public static final String BROKER_NODE =
"org.apache.activemq.artemis-folder-0.0.0.0";
+ // Node prefixes
+ public static final String BROKER_NODE = "Broker0.0.0.0";
public static final String ADDRESS_NODE_SUFFIX = "folder-addresses-folder-";
@@ -73,7 +73,7 @@ public class PageConstants {
public static final By BUTTON_LOCATOR = By.tagName(BUTTON);
//Branding and Image locations
- public static final String DEFAULT_CONSOLE_LOGIN_BRAND_IMAGE =
"/img/activemq.png";
+ public static final String DEFAULT_CONSOLE_LOGIN_BRAND_IMAGE =
"/img/artemis.png";
public static final String DEFAULT_CONSOLE_NAME = "Artemis";
@@ -137,4 +137,5 @@ public class PageConstants {
public static final By BROKER_NODE_LOCATOR = By.id(BROKER_NODE);
+ public static final By BROKER_BUTTON_LOCATOR =
By.xpath("//button[contains(text(), 'Broker 0.0.0.0')]");
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/ArtemisTreePage.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/ArtemisTreePage.java
index 8f9092a032..7a7b9ae10e 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/ArtemisTreePage.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/ArtemisTreePage.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.BROKER_NODE_LOCATOR;
-import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.BUTTON_LOCATOR;
+import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.BROKER_BUTTON_LOCATOR;
import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.COLLAPSE_BUTTON;
import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.EXPAND_BUTTON;
import static
org.apache.activemq.artemis.tests.smoke.console.PageConstants.NODE_TITLE_LOCATOR;
@@ -56,7 +56,7 @@ public class ArtemisTreePage extends ConsolePage {
}
public AttributesPage selectBrokerNode() {
- WebElement element =
driver.findElement(BROKER_NODE_LOCATOR).findElement(BUTTON_LOCATOR);
+ WebElement element =
driver.findElement(BROKER_NODE_LOCATOR).findElement(BROKER_BUTTON_LOCATOR);
Actions actions = new Actions(driver);
actions.moveToElement(element).click().perform();
return new AttributesPage(driver);
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/AttributesPage.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/AttributesPage.java
index 05e0bfec83..16f978d4f6 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/AttributesPage.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/pages/jmx/AttributesPage.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.tests.smoke.console.pages.jmx;
+import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
@@ -40,6 +41,7 @@ public class AttributesPage extends ArtemisTreePage {
WebElement row = iterator.next();
List<WebElement> cols = row.findElements(TD_TAG_LOCATOR);
if (cols.size() == 2 && name.equals(cols.get(0).getText())) {
+ ((JavascriptExecutor)
driver).executeScript("arguments[0].scrollIntoView();", cols.get(0));
Actions actions = new Actions(driver);
actions.moveToElement(cols.get(0)).click().perform();
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
