Adjust bundled mode

Author: hpehl

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           server-password: CENTRAL_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
-      - run: $MVN deploy -P op,os,prod,release
+      - run: $MVN deploy -P prod,op,feature-pack,standalone,os,release
         env:
           CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
           CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+
+- Add Galleon feature pack
+
 ## [0.1.2] - 2026-02-23
 
 ### Fixed

README.md

@@ -52,7 +52,7 @@ This will open a browser at http://localhost:1234.
 ## Standalone
 
 halOP can run on its own. In this mode halOP starts a local web server and serves the console on its own without being part of a
-WildFly installation. halOP is “just” a single-page application (SPA) without any server side dependencies. The only requirement
+WildFly installation. halOP is "just" a single-page application (SPA) without any server side dependencies. The only requirement
 is a management interface of a running WIldFly instance.
 
 ### Java
@@ -63,7 +63,7 @@ To build halOP as a standalone Java application, run
 mvn install -P prod,op,standalone
 ```
 
-This will package the transpiled HTML, CSS and JavaScript resources into a Quarkus-based HTTP server. To start it, run
+This will package the transpiled HTML, CSS, and JavaScript resources into a Quarkus-based HTTP server. To start it, run
 
 ```shell
 java -jar op/standalone/target/quarkus-app/quarkus-run.jar
@@ -82,8 +82,8 @@ mvn install -P prod,op,standalone,native -Dquarkus.native.container-build=false
 Please make sure that you have a recent version of GraalVM installed.
 See https://quarkus.io/guides/building-native-image#configuring-graalvm for details.
 
-Native binaries for Linux, macOS and Windows are also attached to every [release](https://github.com/hal/foundation/releases).
-Download the binary for your platform, make it executable and run it. Then open a browser at http://localhost:9090.
+Native binaries for Linux, macOS, and Windows are also attached to every [release](https://github.com/hal/foundation/releases).
+Download the binary for your platform, make it executable, and run it. Then open a browser at http://localhost:9090.
 
 To make the binary executable, you might need to run something like this:
 
@@ -113,6 +113,7 @@ halOP is also available as a feature pack that can be provisioned with [Galleon]
 3. `cd $TMPDIR/wildfly`
 4. Add a WildFly admin user with `bin/add-user.sh -u admin -p admin --silent`
 5. Start the server with `bin/standalone.sh --stability=experimental`
+6. Open http://localhost:9990/halop in your browser
 
 # halOS (HAL on OpenShift)
 

environment/src/main/java/org/jboss/hal/env/Endpoints.java

@@ -39,7 +39,7 @@ public void init(String url) {
         dmr = url + MANAGEMENT;
         logout = url + LOGOUT;
         upload = url + UPLOAD;
-        sameOrigin = url.isEmpty();
+        sameOrigin = location.origin.equals(url);
     }
 
     /** @return the endpoint used to execute management operations. */

op/console/package.json

@@ -13,8 +13,8 @@
     "start:server": "node server.js 1234 1235",
     "open:browser": "wait-on http://localhost:1234 && open http://localhost:1234",
     "watch": "concurrently \"npm run start:parcel\" \"npm run start:server\" \"npm run open:browser\"",
-    "prod:standalone": "parcel build src/web/index.html --dist-dir target/console",
-    "prod:feature-pack": "parcel build src/web/index.html --dist-dir target/console --public-url /halop"
+    "prod:feature-pack": "parcel build src/web/index.html --dist-dir target/feature-pack-resources --public-url /halop",
+    "prod:standalone": "parcel build src/web/index.html --dist-dir target/standalone-resources"
   },
   "dependencies": {
     "@patternfly-java/charts": "^0.0.13",

op/console/pom.xml

@@ -138,28 +138,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <!-- This is the phase j2cl:build uses -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <echo level="info" message="Environment"/>
-                                <echo level="info" message="environment.base: ${environment.base}"/>
-                                <echo level="info" message="environment.build: ${environment.build}"/>
-                                <echo level="info" message="environment.stability: ${environment.stability}"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.kie.j2cl.tools</groupId>
                 <artifactId>j2cl-maven-plugin</artifactId>
@@ -208,13 +186,23 @@
                         <artifactId>frontend-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>pnpm-run-prod</id>
+                                <id>pnpm-run-prod-feature-pack</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>corepack</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>pnpm run prod:feature-pack</arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>pnpm-run-prod-standalone</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>corepack</goal>
                                 </goals>
                                 <configuration>
-                                    <arguments>pnpm run ${npm.script}</arguments>
+                                    <arguments>pnpm run prod:standalone</arguments>
                                 </configuration>
                             </execution>
                         </executions>
@@ -224,14 +212,26 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>resources</id>
+                                <id>assemble-feature-pack</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/feature-pack.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>assemble-standalone</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
                                 <configuration>
                                     <descriptors>
-                                        <descriptor>src/assembly/resources.xml</descriptor>
+                                        <descriptor>src/assembly/standalone.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>

op/console/src/assembly/feature-pack.xml

@@ -0,0 +1,38 @@
+<!--
+
+     Copyright 2024 Red Hat
+
+     Licensed 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
+
+         https://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.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
+    <id>feature-pack-resources</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/feature-pack-resources</directory>
+            <outputDirectory>console</outputDirectory>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>${project.build.directory}/console/console.js</source>
+            <outputDirectory>console</outputDirectory>
+        </file>
+    </files>
+</assembly>

op/console/src/assembly/resources.xml op/console/src/assembly/standalone.xmlop/console/src/assembly/resources.xml renamed to op/console/src/assembly/standalone.xml

@@ -18,15 +18,21 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
-    <id>resources</id>
+    <id>standalone-resources</id>
     <formats>
         <format>jar</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/console</directory>
+            <directory>${project.build.directory}/standalone-resources</directory>
             <outputDirectory>console</outputDirectory>
         </fileSet>
     </fileSets>
-</assembly>
+    <files>
+        <file>
+            <source>${project.build.directory}/console/console.js</source>
+            <outputDirectory>console</outputDirectory>
+        </file>
+    </files>
+</assembly>

op/console/src/main/java/org/jboss/hal/op/Main.java

@@ -19,8 +19,6 @@
 import jakarta.inject.Inject;
 
 import org.jboss.elemento.router.PlaceManager;
-import org.jboss.hal.core.Notifications;
-import org.jboss.hal.env.Environment;
 import org.jboss.hal.op.bootstrap.Bootstrap;
 import org.jboss.hal.op.bootstrap.BootstrapError;
 import org.jboss.hal.op.endpoint.EndpointStorage;
@@ -39,10 +37,8 @@ public class Main {
 
     @Inject Bootstrap bootstrap;
     @Inject EndpointStorage endpointStorage;
-    @Inject Environment environment;
-    @Inject PlaceManager placeManager;
-    @Inject Notifications notifications;
     @Inject Navigation navigation;
+    @Inject PlaceManager placeManager;
 
     @GWT3EntryPoint
     public void onModuleLoad() {
@@ -53,7 +49,7 @@ public void onModuleLoad() {
     void init() {
         bootstrap.run().subscribe(context -> {
             if (context.isSuccessful()) {
-                insertFirst(document.body, skeleton(environment, endpointStorage, notifications, navigation));
+                insertFirst(document.body, skeleton(endpointStorage, navigation));
                 placeManager.start();
             } else {
                 BootstrapError error = context.pop(BootstrapError.UNKNOWN);

op/console/src/main/java/org/jboss/hal/op/bootstrap/SelectEndpoint.java

@@ -79,12 +79,24 @@ public Promise<FlowContext> apply(FlowContext context) {
                     return fail(context, NO_ENDPOINT_SPECIFIED, CONNECT_PARAMETER);
                 }
             } else {
-                return endpointModal(endpointStorage, false).open()
+                return endpointModal(endpointStorage, false)
+                        .open()
                         .then(endpoint -> connect(context, endpoint));
             }
         } else {
-            return endpointModal(endpointStorage, false).open()
-                    .then(endpoint -> connect(context, endpoint));
+            return Endpoint.ping(location.origin)
+                    .then(valid -> {
+                        if (valid) {
+                            return connect(context, Endpoint.origin());
+                        } else {
+                            return endpointModal(endpointStorage, false)
+                                    .open()
+                                    .then(endpoint -> connect(context, endpoint));
+                        }
+                    })
+                    .catch_(__ -> endpointModal(endpointStorage, false)
+                            .open()
+                            .then(endpoint -> connect(context, endpoint)));
         }
     }