Merge branch 'release/2.4.1.0'

wcm-io-devops · Jun 19, 2024 · 63f7e0a · 63f7e0a
2 parents 0b61c68 + bae7bf9
commit 63f7e0a
Show file tree

Hide file tree

Showing 9 changed files with 215 additions and 196 deletions.
diff --git a/AEMManager/AemActions.cs b/AEMManager/AemActions.cs
@@ -185,7 +185,6 @@ private static string BuildCommandLineArguments(AemInstance pInstance) {
       // memory settings
       javaArgs.Add("-Xms" + pInstance.HeapMinSizeMb + "m");
       javaArgs.Add("-Xmx" + pInstance.HeapMaxSizeMb + "m");
-      javaArgs.Add("-XX:MaxPermSize=" + pInstance.MaxPermSizeMb + "m");
 
       // instance port
       if (pInstance.AemInstanceType == AemInstanceType.AEM54) {

diff --git a/AEMManager/AemInstance.cs b/AEMManager/AemInstance.cs
@@ -38,7 +38,6 @@ public class AemInstance {
     private bool mShowInTaskbar = true;
     private int mHeapMinSizeMb = DEFAULT_HEAP_MIN_MB;
     private int mHeapMaxSizeMb = DEFAULT_HEAP_MAX_MB;
-    private int mMaxPermSizeMb = DEFAULT_PERMSIZE_MB;
     private bool mJVMDebug = false;
     private int mDebugPort = 0;
     private bool mJProfiler = false;
@@ -260,15 +259,6 @@ public int HeapMaxSizeMb {
       }
     }
 
-    public int MaxPermSizeMb {
-      get {
-        return mMaxPermSizeMb;
-      }
-      set {
-        mMaxPermSizeMb = value;
-      }
-    }
-
     public bool JVMDebug {
       get {
         return mJVMDebug;
@@ -596,7 +586,6 @@ public AemInstance(RegistryKey pKey) {
       mShowInTaskbar = ((int)pKey.GetValue("ShowInTaskbar", mShowInTaskbar ? 1 : 0)) != 0;
       mHeapMinSizeMb = (int)pKey.GetValue("HeapMinSizeMb", mHeapMinSizeMb);
       mHeapMaxSizeMb = (int)pKey.GetValue("HeapMaxSizeMb", mHeapMaxSizeMb);
-      mMaxPermSizeMb = (int)pKey.GetValue("MaxPermSizeMb", mMaxPermSizeMb);
       mJVMDebug = ((int)pKey.GetValue("JVMDebug", mJVMDebug ? 1 : 0)) != 0;
       mDebugPort = (int)pKey.GetValue("DebugPort", mDebugPort);
       mJProfiler = ((int)pKey.GetValue("JProfiler", mJProfiler ? 1 : 0)) != 0;
@@ -642,7 +631,6 @@ public void Save() {
       key.SetValue("ShowInTaskbar", mShowInTaskbar ? 1 : 0);
       key.SetValue("HeapMinSizeMb", mHeapMinSizeMb);
       key.SetValue("HeapMaxSizeMb", mHeapMaxSizeMb);
-      key.SetValue("MaxPermSizeMb", mMaxPermSizeMb);
       key.SetValue("JVMDebug", mJVMDebug ? 1 : 0);
       key.SetValue("DebugPort", mDebugPort);
       key.SetValue("JProfiler", mJProfiler ? 1 : 0);
@@ -707,7 +695,6 @@ public AemInstance Clone() {
       clone.mShowInTaskbar = mShowInTaskbar;
       clone.mHeapMinSizeMb = mHeapMinSizeMb;
       clone.mHeapMaxSizeMb = mHeapMaxSizeMb;
-      clone.mMaxPermSizeMb = mMaxPermSizeMb;
       clone.mJVMDebug = mJVMDebug;
       clone.mDebugPort = mDebugPort;
       clone.mJProfiler = mJProfiler;

diff --git a/AEMManager/AemInstanceDialog.Designer.cs b/AEMManager/AemInstanceDialog.Designer.cs
diff --git a/AEMManager/AemInstanceDialog.cs b/AEMManager/AemInstanceDialog.cs
@@ -79,7 +79,6 @@ private void AemInstanceDialog_Load(object sender, EventArgs e) {
       txtCustomIconPath.Text = mInstance.CustomIconPath;
       txtHeapMinSizeMb.Text = mInstance.HeapMinSizeMb.ToString();
       txtHeapMaxSizeMb.Text = mInstance.HeapMaxSizeMb.ToString();
-      txtMaxPermSizeMb.Text = mInstance.MaxPermSizeMb.ToString();
       chkJVMDebug.Checked = mInstance.JVMDebug;
       txtDebugPort.Text = mInstance.DebugPort.ToString();
       txtDebugPort.Enabled = chkJVMDebug.Checked;
@@ -133,7 +132,6 @@ private void cmOK_Click(object sender, EventArgs e) {
       mInstance.Password = txtPassword.Text.Trim();
       mInstance.HeapMinSizeMb = ParseWithDefault(txtHeapMinSizeMb.Text, AemInstance.DEFAULT_HEAP_MIN_MB);
       mInstance.HeapMaxSizeMb = ParseWithDefault(txtHeapMaxSizeMb.Text, AemInstance.DEFAULT_HEAP_MAX_MB);
-      mInstance.MaxPermSizeMb = ParseWithDefault(txtMaxPermSizeMb.Text, AemInstance.DEFAULT_PERMSIZE_MB);
       mInstance.JVMDebug = chkJVMDebug.Checked;
       mInstance.DebugPort = ParseWithDefault(txtDebugPort.Text, 0);
       mInstance.JProfiler = chkJProfiler.Checked;

diff --git a/AEMManager/AemInstanceDialog.resx b/AEMManager/AemInstanceDialog.resx
@@ -112,24 +112,24 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="openFileDialogJar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="openFileDialogJar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="openFileDialogIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="openFileDialogIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>160, 17</value>
   </metadata>
-  <metadata name="openFileDialogJavaExecutable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="openFileDialogJavaExecutable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>306, 17</value>
   </metadata>
-  <metadata name="openFileDialogBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="openFileDialogBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>506, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>53</value>
   </metadata>
 </root>
diff --git a/AEMManager/InfoDialog.cs b/AEMManager/InfoDialog.cs
@@ -34,7 +34,7 @@ private void lblWebsite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
     private void lblLicenseLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
       System.Diagnostics.Process p = new System.Diagnostics.Process();
-      p.StartInfo.FileName = "http://www.apache.org/licenses/LICENSE-2.0";
+      p.StartInfo.FileName = "https://www.apache.org/licenses/LICENSE-2.0";
       p.Start();
     }
 

diff --git a/AEMManager/Properties/AssemblyInfo.cs b/AEMManager/Properties/AssemblyInfo.cs
@@ -28,8 +28,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.4.1.0")]
+[assembly: AssemblyFileVersion("2.4.1.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]
diff --git a/AEMManager/util/RegistryMigration.cs b/AEMManager/util/RegistryMigration.cs
@@ -122,7 +122,6 @@ private static void MigrateInstance(RegistryKey source, RegistryKey target) {
         "JProfiler",
         "JProfilerPort",
         "JVMDebug",
-        "MaxPermSizeMb",
         "OpenBrowser",
         "Port",
         "RemoteProcess",

diff --git a/AEMManagerSetup/Product.wxs b/AEMManagerSetup/Product.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Package Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29" Manufacturer="wcm.io" Version="2.4.0.0" InstallerVersion="200">
+	<Package Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29" Manufacturer="wcm.io" Version="2.4.1.0" InstallerVersion="200">
 
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />