Skip to content

Commit 63f7e0a

Browse files
stefanseifertstefanseifert
committed
Merge branch 'release/2.4.1.0'
2 parents 0b61c68 + bae7bf9 commit 63f7e0a

File tree

9 files changed

+215
-196
lines changed

9 files changed

+215
-196
lines changed

‎AEMManager/AemActions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ private static string BuildCommandLineArguments(AemInstance pInstance) {
185185
// memory settings
186186
javaArgs.Add("-Xms" + pInstance.HeapMinSizeMb + "m");
187187
javaArgs.Add("-Xmx" + pInstance.HeapMaxSizeMb + "m");
188-
javaArgs.Add("-XX:MaxPermSize=" + pInstance.MaxPermSizeMb + "m");
189188

190189
// instance port
191190
if (pInstance.AemInstanceType == AemInstanceType.AEM54) {

‎AEMManager/AemInstance.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class AemInstance {
3838
private bool mShowInTaskbar = true;
3939
private int mHeapMinSizeMb = DEFAULT_HEAP_MIN_MB;
4040
private int mHeapMaxSizeMb = DEFAULT_HEAP_MAX_MB;
41-
private int mMaxPermSizeMb = DEFAULT_PERMSIZE_MB;
4241
private bool mJVMDebug = false;
4342
private int mDebugPort = 0;
4443
private bool mJProfiler = false;
@@ -260,15 +259,6 @@ public int HeapMaxSizeMb {
260259
}
261260
}
262261

263-
public int MaxPermSizeMb {
264-
get {
265-
return mMaxPermSizeMb;
266-
}
267-
set {
268-
mMaxPermSizeMb = value;
269-
}
270-
}
271-
272262
public bool JVMDebug {
273263
get {
274264
return mJVMDebug;
@@ -596,7 +586,6 @@ public AemInstance(RegistryKey pKey) {
596586
mShowInTaskbar = ((int)pKey.GetValue("ShowInTaskbar", mShowInTaskbar ? 1 : 0)) != 0;
597587
mHeapMinSizeMb = (int)pKey.GetValue("HeapMinSizeMb", mHeapMinSizeMb);
598588
mHeapMaxSizeMb = (int)pKey.GetValue("HeapMaxSizeMb", mHeapMaxSizeMb);
599-
mMaxPermSizeMb = (int)pKey.GetValue("MaxPermSizeMb", mMaxPermSizeMb);
600589
mJVMDebug = ((int)pKey.GetValue("JVMDebug", mJVMDebug ? 1 : 0)) != 0;
601590
mDebugPort = (int)pKey.GetValue("DebugPort", mDebugPort);
602591
mJProfiler = ((int)pKey.GetValue("JProfiler", mJProfiler ? 1 : 0)) != 0;
@@ -642,7 +631,6 @@ public void Save() {
642631
key.SetValue("ShowInTaskbar", mShowInTaskbar ? 1 : 0);
643632
key.SetValue("HeapMinSizeMb", mHeapMinSizeMb);
644633
key.SetValue("HeapMaxSizeMb", mHeapMaxSizeMb);
645-
key.SetValue("MaxPermSizeMb", mMaxPermSizeMb);
646634
key.SetValue("JVMDebug", mJVMDebug ? 1 : 0);
647635
key.SetValue("DebugPort", mDebugPort);
648636
key.SetValue("JProfiler", mJProfiler ? 1 : 0);
@@ -707,7 +695,6 @@ public AemInstance Clone() {
707695
clone.mShowInTaskbar = mShowInTaskbar;
708696
clone.mHeapMinSizeMb = mHeapMinSizeMb;
709697
clone.mHeapMaxSizeMb = mHeapMaxSizeMb;
710-
clone.mMaxPermSizeMb = mMaxPermSizeMb;
711698
clone.mJVMDebug = mJVMDebug;
712699
clone.mDebugPort = mDebugPort;
713700
clone.mJProfiler = mJProfiler;

‎AEMManager/AemInstanceDialog.Designer.cs‎

Lines changed: 204 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AEMManager/AemInstanceDialog.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ private void AemInstanceDialog_Load(object sender, EventArgs e) {
7979
txtCustomIconPath.Text = mInstance.CustomIconPath;
8080
txtHeapMinSizeMb.Text = mInstance.HeapMinSizeMb.ToString();
8181
txtHeapMaxSizeMb.Text = mInstance.HeapMaxSizeMb.ToString();
82-
txtMaxPermSizeMb.Text = mInstance.MaxPermSizeMb.ToString();
8382
chkJVMDebug.Checked = mInstance.JVMDebug;
8483
txtDebugPort.Text = mInstance.DebugPort.ToString();
8584
txtDebugPort.Enabled = chkJVMDebug.Checked;
@@ -133,7 +132,6 @@ private void cmOK_Click(object sender, EventArgs e) {
133132
mInstance.Password = txtPassword.Text.Trim();
134133
mInstance.HeapMinSizeMb = ParseWithDefault(txtHeapMinSizeMb.Text, AemInstance.DEFAULT_HEAP_MIN_MB);
135134
mInstance.HeapMaxSizeMb = ParseWithDefault(txtHeapMaxSizeMb.Text, AemInstance.DEFAULT_HEAP_MAX_MB);
136-
mInstance.MaxPermSizeMb = ParseWithDefault(txtMaxPermSizeMb.Text, AemInstance.DEFAULT_PERMSIZE_MB);
137135
mInstance.JVMDebug = chkJVMDebug.Checked;
138136
mInstance.DebugPort = ParseWithDefault(txtDebugPort.Text, 0);
139137
mInstance.JProfiler = chkJProfiler.Checked;

‎AEMManager/AemInstanceDialog.resx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,24 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="openFileDialogJar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
120+
<metadata name="openFileDialogJar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123-
<metadata name="openFileDialogIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
123+
<metadata name="openFileDialogIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124124
<value>160, 17</value>
125125
</metadata>
126-
<metadata name="openFileDialogJavaExecutable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
126+
<metadata name="openFileDialogJavaExecutable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127127
<value>306, 17</value>
128128
</metadata>
129-
<metadata name="openFileDialogBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
129+
<metadata name="openFileDialogBrowser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130130
<value>506, 17</value>
131131
</metadata>
132-
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
132+
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133133
<value>53</value>
134134
</metadata>
135135
</root>

‎AEMManager/InfoDialog.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void lblWebsite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
3434

3535
private void lblLicenseLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
3636
System.Diagnostics.Process p = new System.Diagnostics.Process();
37-
p.StartInfo.FileName = "http://www.apache.org/licenses/LICENSE-2.0";
37+
p.StartInfo.FileName = "https://www.apache.org/licenses/LICENSE-2.0";
3838
p.Start();
3939
}
4040

‎AEMManager/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
// Build Number
2929
// Revision
3030
//
31-
[assembly: AssemblyVersion("2.4.0.0")]
32-
[assembly: AssemblyFileVersion("2.4.0.0")]
31+
[assembly: AssemblyVersion("2.4.1.0")]
32+
[assembly: AssemblyFileVersion("2.4.1.0")]
3333

3434
// Configure log4net using the .config file
3535
[assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]

‎AEMManager/util/RegistryMigration.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ private static void MigrateInstance(RegistryKey source, RegistryKey target) {
122122
"JProfiler",
123123
"JProfilerPort",
124124
"JVMDebug",
125-
"MaxPermSizeMb",
126125
"OpenBrowser",
127126
"Port",
128127
"RemoteProcess",

‎AEMManagerSetup/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2-
<Package Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29" Manufacturer="wcm.io" Version="2.4.0.0" InstallerVersion="200">
2+
<Package Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29" Manufacturer="wcm.io" Version="2.4.1.0" InstallerVersion="200">
33

44

55
<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />

0 commit comments

Comments
 (0)