From e839f7b3b2dd34a658ab776cc4142a20bfc66e59 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sat, 23 Nov 2024 14:08:45 +0100 Subject: [PATCH] Rename conlet. --- org.jdrupes.vmoperator.manager/build.gradle | 2 +- ...apes.webconsole.base.ConletComponentFactory | 1 - .../.checkstyle | 0 .../.eclipse-pmd | 0 .../.eslintignore | 0 .../.eslintrc.json | 0 .../.gitignore | 0 .../.settings/org.eclipse.buildship.core.prefs | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../build.gradle | 0 .../package.json | 0 ...apes.webconsole.base.ConletComponentFactory | 1 + .../vmmgmt/VmMgmt-l10nBundles.ftl.js | 0 .../vmoperator/vmmgmt/VmMgmt-preview.ftl.html | 4 ++-- .../vmoperator/vmmgmt/VmMgmt-view.ftl.html | 10 +++++----- .../jdrupes/vmoperator/vmmgmt}/l10n.properties | 2 +- .../vmoperator/vmmgmt}/l10n_de.properties | 2 +- .../vmoperator/vmmgmt}/l10n_en.properties | 0 .../rollup.config.mjs | 4 ++-- .../jdrupes/vmoperator/vmmgmt}/TimeSeries.java | 2 +- .../org/jdrupes/vmoperator/vmmgmt/VmMgmt.java | 14 +++++++------- .../vmoperator/vmmgmt/VmMgmtFactory.java | 10 +++++----- .../browser/ConditionalInputController.ts | 0 .../vmoperator/vmmgmt}/browser/CpuRamChart.ts | 0 .../vmoperator/vmmgmt}/browser/MemorySize.ts | 0 .../vmoperator/vmmgmt}/browser/TimeSeries.ts | 0 .../vmmgmt/browser/VmMgmt-functions.ts | 18 +++++++++--------- .../vmmgmt/browser/VmMgmt-style.scss | 8 ++++---- .../vmmgmt}/browser/l10nBundles-stub.d.ts | 0 .../vmoperator/vmmgmt}/package-info.java | 2 +- .../tsconfig.json | 2 +- settings.gradle | 2 +- 34 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 org.jdrupes.vmoperator.vmconlet/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.checkstyle (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.eclipse-pmd (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.eslintignore (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.eslintrc.json (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.gitignore (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.settings/org.eclipse.buildship.core.prefs (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/build.gradle (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/package.json (100%) create mode 100644 org.jdrupes.vmoperator.vmmgmt/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory rename org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-l10nBundles.ftl.js => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-l10nBundles.ftl.js (100%) rename org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-preview.ftl.html => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-preview.ftl.html (88%) rename org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-view.ftl.html (93%) rename {org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt}/l10n.properties (92%) rename {org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt}/l10n_de.properties (94%) rename {org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt}/l10n_en.properties (100%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/rollup.config.mjs (93%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/TimeSeries.java (98%) rename org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConlet.java => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmt.java (97%) rename org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConletFactory.java => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmtFactory.java (85%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/browser/ConditionalInputController.ts (100%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/browser/CpuRamChart.ts (100%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/browser/MemorySize.ts (100%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/browser/TimeSeries.ts (100%) rename org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-functions.ts => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts (93%) rename org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-style.scss => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-style.scss (91%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/browser/l10nBundles-stub.d.ts (100%) rename {org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet => org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt}/package-info.java (94%) rename {org.jdrupes.vmoperator.vmconlet => org.jdrupes.vmoperator.vmmgmt}/tsconfig.json (91%) diff --git a/org.jdrupes.vmoperator.manager/build.gradle b/org.jdrupes.vmoperator.manager/build.gradle index cefac0bbd..b581971c1 100644 --- a/org.jdrupes.vmoperator.manager/build.gradle +++ b/org.jdrupes.vmoperator.manager/build.gradle @@ -31,8 +31,8 @@ dependencies { runtimeOnly 'org.slf4j:slf4j-jdk14:[2.0.7,3)' runtimeOnly 'org.apache.logging.log4j:log4j-to-jul:2.20.0' + runtimeOnly project(':org.jdrupes.vmoperator.vmmgmt') runtimeOnly project(':org.jdrupes.vmoperator.vmaccess') - runtimeOnly project(':org.jdrupes.vmoperator.vmconlet') } application { diff --git a/org.jdrupes.vmoperator.vmconlet/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory b/org.jdrupes.vmoperator.vmconlet/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory deleted file mode 100644 index 5a22dc73e..000000000 --- a/org.jdrupes.vmoperator.vmconlet/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory +++ /dev/null @@ -1 +0,0 @@ -org.jdrupes.vmoperator.vmconlet.VmConletFactory diff --git a/org.jdrupes.vmoperator.vmconlet/.checkstyle b/org.jdrupes.vmoperator.vmmgmt/.checkstyle similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.checkstyle rename to org.jdrupes.vmoperator.vmmgmt/.checkstyle diff --git a/org.jdrupes.vmoperator.vmconlet/.eclipse-pmd b/org.jdrupes.vmoperator.vmmgmt/.eclipse-pmd similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.eclipse-pmd rename to org.jdrupes.vmoperator.vmmgmt/.eclipse-pmd diff --git a/org.jdrupes.vmoperator.vmconlet/.eslintignore b/org.jdrupes.vmoperator.vmmgmt/.eslintignore similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.eslintignore rename to org.jdrupes.vmoperator.vmmgmt/.eslintignore diff --git a/org.jdrupes.vmoperator.vmconlet/.eslintrc.json b/org.jdrupes.vmoperator.vmmgmt/.eslintrc.json similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.eslintrc.json rename to org.jdrupes.vmoperator.vmmgmt/.eslintrc.json diff --git a/org.jdrupes.vmoperator.vmconlet/.gitignore b/org.jdrupes.vmoperator.vmmgmt/.gitignore similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.gitignore rename to org.jdrupes.vmoperator.vmmgmt/.gitignore diff --git a/org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.buildship.core.prefs b/org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.buildship.core.prefs rename to org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.buildship.core.prefs diff --git a/org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.core.resources.prefs b/org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.core.resources.prefs rename to org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.core.resources.prefs diff --git a/org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.core.runtime.prefs b/org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.core.runtime.prefs rename to org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.core.runtime.prefs diff --git a/org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.jdt.ui.prefs b/org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/.settings/org.eclipse.jdt.ui.prefs rename to org.jdrupes.vmoperator.vmmgmt/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.jdrupes.vmoperator.vmconlet/build.gradle b/org.jdrupes.vmoperator.vmmgmt/build.gradle similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/build.gradle rename to org.jdrupes.vmoperator.vmmgmt/build.gradle diff --git a/org.jdrupes.vmoperator.vmconlet/package.json b/org.jdrupes.vmoperator.vmmgmt/package.json similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/package.json rename to org.jdrupes.vmoperator.vmmgmt/package.json diff --git a/org.jdrupes.vmoperator.vmmgmt/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory b/org.jdrupes.vmoperator.vmmgmt/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory new file mode 100644 index 000000000..d7d7c8d35 --- /dev/null +++ b/org.jdrupes.vmoperator.vmmgmt/resources/META-INF/services/org.jgrapes.webconsole.base.ConletComponentFactory @@ -0,0 +1 @@ +org.jdrupes.vmoperator.vmmgmt.VmMgmtFactory diff --git a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-l10nBundles.ftl.js b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-l10nBundles.ftl.js similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-l10nBundles.ftl.js rename to org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-l10nBundles.ftl.js diff --git a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-preview.ftl.html b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-preview.ftl.html similarity index 88% rename from org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-preview.ftl.html rename to org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-preview.ftl.html index 0c6aa3752..8c9970a2b 100644 --- a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-preview.ftl.html +++ b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-preview.ftl.html @@ -1,6 +1,6 @@ -
diff --git a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-view.ftl.html similarity index 93% rename from org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html rename to org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-view.ftl.html index 0af656b43..6b46faa75 100644 --- a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html +++ b/org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/VmMgmt-view.ftl.html @@ -1,7 +1,7 @@ -
-
+
+ class="table--basic--striped jdrupes-vmoperator-vmmgmt-view-table">
- + . */ -package org.jdrupes.vmoperator.vmconlet; +package org.jdrupes.vmoperator.vmmgmt; import java.time.Duration; import java.time.Instant; diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConlet.java b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmt.java similarity index 97% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConlet.java rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmt.java index 7244f566b..8395b4c54 100644 --- a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConlet.java +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmt.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.jdrupes.vmoperator.vmconlet; +package org.jdrupes.vmoperator.vmmgmt; import freemarker.core.ParseException; import freemarker.template.MalformedTemplateNameException; @@ -61,11 +61,11 @@ import org.jgrapes.webconsole.base.freemarker.FreeMarkerConlet; /** - * The Class VmConlet. + * The Class {@link VmMgmt}. */ @SuppressWarnings({ "PMD.DataflowAnomalyAnalysis", "PMD.CouplingBetweenObjects" }) -public class VmConlet extends FreeMarkerConlet { +public class VmMgmt extends FreeMarkerConlet { private static final Set MODES = RenderMode.asSet( RenderMode.Preview, RenderMode.View); @@ -88,7 +88,7 @@ public static class Update extends Event { * sends the event to */ @SuppressWarnings("PMD.ConstructorCallsOverridableMethod") - public VmConlet(Channel componentChannel) { + public VmMgmt(Channel componentChannel) { super(componentChannel); setPeriodicRefresh(Duration.ofMinutes(1), () -> new Update()); } @@ -115,7 +115,7 @@ public void onConsoleReady(ConsoleReady event, ConsoleConnection channel) .addRenderMode(RenderMode.Preview) .addScript(new ScriptResource().setScriptType("module") .setScriptUri(event.renderSupport().conletResource( - type(), "VmConlet-functions.js")))); + type(), "VmMgmt-functions.js")))); } @Override @@ -133,7 +133,7 @@ protected Set doRenderConlet(RenderConletRequestBase event, boolean sendVmInfos = false; if (event.renderAs().contains(RenderMode.Preview)) { Template tpl - = freemarkerConfig().getTemplate("VmConlet-preview.ftl.html"); + = freemarkerConfig().getTemplate("VmMgmt-preview.ftl.html"); channel.respond(new RenderConlet(type(), conletId, processTemplate(event, tpl, fmModel(event, channel, conletId, conletState))) @@ -150,7 +150,7 @@ protected Set doRenderConlet(RenderConletRequestBase event, } if (event.renderAs().contains(RenderMode.View)) { Template tpl - = freemarkerConfig().getTemplate("VmConlet-view.ftl.html"); + = freemarkerConfig().getTemplate("VmMgmt-view.ftl.html"); channel.respond(new RenderConlet(type(), conletId, processTemplate(event, tpl, fmModel(event, channel, conletId, conletState))) diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConletFactory.java b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmtFactory.java similarity index 85% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConletFactory.java rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmtFactory.java index d77ceb659..922f93802 100644 --- a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/VmConletFactory.java +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/VmMgmtFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.jdrupes.vmoperator.vmconlet; +package org.jdrupes.vmoperator.vmmgmt; import java.util.Map; import java.util.Optional; @@ -25,9 +25,9 @@ import org.jgrapes.webconsole.base.ConletComponentFactory; /** - * The factory service for {@link VmConlet}s. + * The factory service for {@link VmMgmt}s. */ -public class VmConletFactory implements ConletComponentFactory { +public class VmMgmtFactory implements ConletComponentFactory { /* * (non-Javadoc) @@ -36,7 +36,7 @@ public class VmConletFactory implements ConletComponentFactory { */ @Override public Class componentType() { - return VmConlet.class; + return VmMgmt.class; } /* @@ -48,7 +48,7 @@ public Class componentType() { @Override public Optional create(Channel componentChannel, Map properties) { - return Optional.of(new VmConlet(componentChannel)); + return Optional.of(new VmMgmt(componentChannel)); } } diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/ConditionalInputController.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/ConditionalInputController.ts similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/ConditionalInputController.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/ConditionalInputController.ts diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/CpuRamChart.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/CpuRamChart.ts similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/CpuRamChart.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/CpuRamChart.ts diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/MemorySize.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/MemorySize.ts similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/MemorySize.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/MemorySize.ts diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/TimeSeries.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/TimeSeries.ts similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/TimeSeries.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/TimeSeries.ts diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-functions.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts similarity index 93% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-functions.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts index 01bd8976f..78f58510d 100644 --- a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-functions.ts +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-functions.ts @@ -27,19 +27,19 @@ import { formatMemory, parseMemory } from "./MemorySize"; import CpuRamChart from "./CpuRamChart"; import ConditionlInputController from "./ConditionalInputController"; -import "./VmConlet-style.scss"; +import "./VmMgmt-style.scss"; // For global access declare global { interface Window { - orgJDrupesVmOperatorVmConlet: { + orgJDrupesVmOperatorVmMgmt: { initPreview?: (previewDom: HTMLElement, isUpdate: boolean) => void, initView?: (viewDom: HTMLElement, isUpdate: boolean) => void } } } -window.orgJDrupesVmOperatorVmConlet = {}; +window.orgJDrupesVmOperatorVmMgmt = {}; const vmInfos = reactive(new Map()); const vmSummary = reactive({ @@ -64,7 +64,7 @@ const shortDateTime = (time: Date) => { const chartData = new TimeSeries(2); const chartDateUpdate = ref(null); -window.orgJDrupesVmOperatorVmConlet.initPreview = (previewDom: HTMLElement, +window.orgJDrupesVmOperatorVmMgmt.initPreview = (previewDom: HTMLElement, _isUpdate: boolean) => { const app = createApp({ setup(_props: object) { @@ -98,7 +98,7 @@ window.orgJDrupesVmOperatorVmConlet.initPreview = (previewDom: HTMLElement, app.mount(previewDom); }; -window.orgJDrupesVmOperatorVmConlet.initView = (viewDom: HTMLElement, +window.orgJDrupesVmOperatorVmMgmt.initView = (viewDom: HTMLElement, _isUpdate: boolean) => { const app = createApp({ setup(_props: object) { @@ -174,7 +174,7 @@ window.orgJDrupesVmOperatorVmConlet.initView = (viewDom: HTMLElement, app.mount(viewDom); }; -JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", +JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmmgmt.VmMgmt", // eslint-disable-next-line @typescript-eslint/no-explicit-any "updateVm", function(_conletId: string, vmDefinition: any) { // Add some short-cuts for table controller @@ -194,12 +194,12 @@ JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", vmInfos.set(vmDefinition.name, vmDefinition); }); -JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", +JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmmgmt.VmMgmt", "removeVm", function(_conletId: string, vmName: string) { vmInfos.delete(vmName); }); -JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", +JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmmgmt.VmMgmt", // eslint-disable-next-line @typescript-eslint/no-explicit-any "summarySeries", function(_conletId: string, series: any[]) { chartData.clear(); @@ -210,7 +210,7 @@ JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", chartDateUpdate.value = new Date(); }); -JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmconlet.VmConlet", +JGConsole.registerConletFunction("org.jdrupes.vmoperator.vmmgmt.VmMgmt", // eslint-disable-next-line @typescript-eslint/no-explicit-any "updateSummary", function(_conletId: string, summary: any) { chartData.push(new Date(), summary.usedCpus, Number(summary.usedRam)); diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-style.scss b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-style.scss similarity index 91% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-style.scss rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-style.scss index a5658e960..e02fe24f8 100644 --- a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/VmConlet-style.scss +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/VmMgmt-style.scss @@ -20,7 +20,7 @@ * Conlet specific styles. */ -.jdrupes-vmoperator-vmconlet-preview { +.jdrupes-vmoperator-vmmgmt-preview { form { float: right; padding: 0.15em 0.3em; @@ -37,7 +37,7 @@ } } -.jdrupes-vmoperator-vmconlet-view-search { +.jdrupes-vmoperator-vmmgmt-view-search { display: flex; justify-content: flex-end; @@ -46,7 +46,7 @@ } } -.jdrupes-vmoperator-vmconlet-view-table { +.jdrupes-vmoperator-vmmgmt-view-table { td { vertical-align: top; @@ -94,7 +94,7 @@ } } -.jdrupes-vmoperator-vmconlet-view-action-list { +.jdrupes-vmoperator-vmmgmt-view-action-list { white-space: nowrap; [role=button] { diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/l10nBundles-stub.d.ts b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/l10nBundles-stub.d.ts similarity index 100% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/browser/l10nBundles-stub.d.ts rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/browser/l10nBundles-stub.d.ts diff --git a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/package-info.java b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/package-info.java similarity index 94% rename from org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/package-info.java rename to org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/package-info.java index 2cbbfa749..c39c19343 100644 --- a/org.jdrupes.vmoperator.vmconlet/src/org/jdrupes/vmoperator/vmconlet/package-info.java +++ b/org.jdrupes.vmoperator.vmmgmt/src/org/jdrupes/vmoperator/vmmgmt/package-info.java @@ -16,4 +16,4 @@ * along with this program. If not, see . */ -package org.jdrupes.vmoperator.vmconlet; \ No newline at end of file +package org.jdrupes.vmoperator.vmmgmt; \ No newline at end of file diff --git a/org.jdrupes.vmoperator.vmconlet/tsconfig.json b/org.jdrupes.vmoperator.vmmgmt/tsconfig.json similarity index 91% rename from org.jdrupes.vmoperator.vmconlet/tsconfig.json rename to org.jdrupes.vmoperator.vmmgmt/tsconfig.json index 5fb2dd764..96c4072be 100644 --- a/org.jdrupes.vmoperator.vmconlet/tsconfig.json +++ b/org.jdrupes.vmoperator.vmmgmt/tsconfig.json @@ -14,7 +14,7 @@ "aash-plugin": ["./build/unpacked/org/jgrapes/webconsole/provider/jgwcvuecomponents/aash-vue-components/lib/AashPlugin"], "jgconsole": ["./build/unpacked/org/jgrapes/webconsole/base/JGConsole"], "jgwc": ["./build/unpacked/org/jgrapes/webconsole/provider/jgwcvuecomponents/jgwc-vue-components/jgwc-components"], - "l10nBundles": ["./src/org/jdrupes/vmoperator/vmconlet/browser/l10nBundles-stub"], + "l10nBundles": ["./src/org/jdrupes/vmoperator/vmmgmt/browser/l10nBundles-stub"], "vue": ["./build/unpacked/org/jgrapes/webconsole/provider/vue/vue/vue"], "chartjs": ["./build/unpacked/org/jgrapes/webconsole/provider/chartjs/chart.js/auto/auto"] } diff --git a/settings.gradle b/settings.gradle index be8546d5f..4a3bfc89c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,7 @@ rootProject.name = 'VM-Operator' include 'org.jdrupes.vmoperator.manager' include 'org.jdrupes.vmoperator.manager.events' include 'org.jdrupes.vmoperator.vmaccess' -include 'org.jdrupes.vmoperator.vmconlet' +include 'org.jdrupes.vmoperator.vmmgmt' include 'org.jdrupes.vmoperator.runner.qemu' include 'org.jdrupes.vmoperator.common' include 'org.jdrupes.vmoperator.util'