New DevOps Toolbox Cluster

.github/workflows/main.yml

@@ -583,11 +583,11 @@ jobs:
       - name: ide/db.sql.editor
         run: ant $OPTS -f ide/db.sql.editor test
 
-      - name: ide/docker.api
-        run: ant $OPTS -f ide/docker.api test
+      - name: devops/docker.api
+        run: ant $OPTS -f devops/docker.api test
 
-      - name: ide/docker.ui
-        run: ant $OPTS -f ide/docker.ui test
+      - name: devops/docker.ui
+        run: ant $OPTS -f devops/docker.ui test
 
       - name: ide/editor.bookmarks
         run: ant $OPTS -f ide/editor.bookmarks test

devops/devops.kit/build.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project basedir="." default="build" name="devops/devops.kit">
+    <description>Builds, tests, and runs the project org.netbeans.modules.devops.kit</description>
+    <import file="../../nbbuild/templates/projectized.xml"/>
+</project>

devops/devops.kit/manifest.mf

@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module: org.netbeans.modules.devops.kit
+OpenIDE-Module-Display-Category: DevOps
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/devops/kit/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+

devops/devops.kit/nbproject/project.properties

@@ -0,0 +1,18 @@
+# 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.
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.release=17

devops/devops.kit/nbproject/project.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.netbeans.modules.devops.kit</code-name-base>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.docker.ui</code-name-base>
+                    <run-dependency>
+                        <release-version>0</release-version>
+                        <specification-version>1.27</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages/>
+        </data>
+    </configuration>
+</project>

devops/devops.kit/src/org/netbeans/modules/devops/kit/Bundle.properties

@@ -0,0 +1,21 @@
+# 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.
+OpenIDE-Module-Display-Category=DevOps Toolbox
+OpenIDE-Module-Long-Description=\
+    Docker Service integration
+OpenIDE-Module-Name=DevOps Toolbox
+OpenIDE-Module-Short-Description=DevOps Support for Infrastructure as Code Development.

ide/docker.api/build.xml → devops/docker.api/build.xml

@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="ide/docker.api">
+<project basedir="." default="build" name="devops/docker.api">
     <description>Builds, tests, and runs the project org.netbeans.modules.docker.api</description>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>

ide/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties → devops/docker.api/src/org/netbeans/modules/docker/resources/Bundle.properties

@@ -18,6 +18,6 @@
 #
 
 OpenIDE-Module-Name=Docker API
-OpenIDE-Module-Display-Category=Base IDE
+OpenIDE-Module-Display-Category=DevOps Toolbox
 OpenIDE-Module-Short-Description=Provides Docker API.
 OpenIDE-Module-Long-Description=Provides the API for management of Docker from the IDE.

ide/docker.ui/build.xml → devops/docker.ui/build.xml

@@ -20,7 +20,7 @@
 
 -->
 
-<project basedir="." default="build" name="ide/docker.ui">
+<project basedir="." default="build" name="devops/docker.ui">
     <description>Builds, tests, and runs the project org.netbeans.modules.docker.ui</description>
     <import file="../../nbbuild/templates/projectized.xml"/>
 </project>

ide/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties → devops/docker.ui/src/org/netbeans/modules/docker/ui/resources/Bundle.properties

@@ -18,6 +18,6 @@
 #
 
 OpenIDE-Module-Name=Docker UI
-OpenIDE-Module-Display-Category=Base IDE
+OpenIDE-Module-Display-Category=DevOps Toolbox
 OpenIDE-Module-Short-Description=Provides Docker UI integration.
 OpenIDE-Module-Long-Description=Provides UI widgets for management of the Docker from the IDE.

ergonomics/ide.ergonomics/devops.properties

@@ -0,0 +1,18 @@
+# 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.
+
+mainModule=org.netbeans.modules.devops.kit

ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureManager.java

@@ -219,7 +219,7 @@ private static synchronized Lookup featureTypesLookup() {
                 String bundleName = basename + "/Bundle.properties";
                 URL layer = FeatureManager.class.getResource(layerName);
                 URL bundle = FeatureManager.class.getResource(bundleName);
-                if (layer != null && bundle != null) {
+                if (bundle != null) {
                     FeatureInfo info;
                     try {
                         info = FeatureInfo.create(clusterName, layer, bundle);

ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/VerifyFullIDETest.java

@@ -103,8 +103,11 @@ public void testGetAllProjectTemplates() throws Exception {
         List<XMLFileSystem> all = new ArrayList<XMLFileSystem>();
 
         for (FeatureInfo fi : FeatureManager.features()) {
-            XMLFileSystem xfs = new XMLFileSystem(fi.getLayerURL());
-            all.add(xfs);
+            URL url = fi.getLayerURL();
+            if (url != null) {
+                XMLFileSystem xfs = new XMLFileSystem(url);
+                all.add(xfs);
+            }
         }
 
         MultiFileSystem mfs = new MultiFileSystem(all.toArray(new FileSystem[0]));

ide/editor.kit/src/org/netbeans/modules/editor/kit/Bundle.properties

@@ -19,4 +19,4 @@ OpenIDE-Module-Long-Description=\
     Editing support for various types of files: bat, diff, manifest, sh, css, html, images, Java Script, properties files, xml, etc. \
     Also contains various editor features, such as go to file, bookmarks, templates, error stripe, etc.
 OpenIDE-Module-Name=Editing Files
-OpenIDE-Module-Short-Description=Editting support for various types of files.
+OpenIDE-Module-Short-Description=Editing support for various types of files.

nb/ide.launcher/netbeans.clusters

@@ -38,6 +38,7 @@ harness
 cnd
 cndext
 cpplite
+devops
 dlight
 groovy
 extra

nbbuild/cluster.properties

@@ -25,6 +25,7 @@ clusters.config.release.list=\
         nb.cluster.apisupport,\
         nb.cluster.webcommon,\
         nb.cluster.php,\
+        nb.cluster.devops,\
         nb.cluster.groovy,\
         nb.cluster.enterprise,\
         nb.cluster.cpplite,\
@@ -80,6 +81,12 @@ clusters.config.rust.list=\
         nb.cluster.rust,\
         nb.cluster.nb
 
+clusters.config.devops.list=\
+        ${clusters.config.platform.list},\
+        nb.cluster.ide,\
+        nb.cluster.devops,\
+        nb.cluster.nb
+
 clusters.config.cpplite.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
@@ -307,9 +314,7 @@ nb.cluster.ide=\
         dlight.nativeexecution,\
         dlight.nativeexecution.nb,\
         dlight.terminal,\
-        docker.api,\
         docker.editor,\
-        docker.ui,\
         editor,\
         editor.actions,\
         editor.autosave,\
@@ -1362,3 +1367,13 @@ nb.cluster.javafx=\
         javafx2.samples,\
         javafx2.scenebuilder,\
         maven.htmlui
+
+nb.cluster.devops.dir=devops
+nb.cluster.devops.depends=\
+        nb.cluster.ide,\
+        nb.cluster.platform,\
+        nb.cluster.harness
+nb.cluster.devops=\
+        devops.kit,\
+        docker.api,\
+        docker.ui