Merge branch 'release/2.3.4.0'

wcm-io-devops · Dec 22, 2016 · d3f35e1 · d3f35e1
2 parents c477a60 + 93a0ca4
commit d3f35e1
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 44 deletions.
diff --git a/AEMManager/AemActions.cs b/AEMManager/AemActions.cs
@@ -324,9 +324,8 @@ public static void StopInstance(AemInstance pInstance) {
 
         pInstance.ConsoleOutputWindow.AppendConsoleLog("Shutting down instance...");
 
-        WebRequest request = pInstance.WebRequestCreate(shutdownUrl);
+        HttpWebRequest request = pInstance.WebRequestCreate(shutdownUrl);
         request.Method = "POST";
-        request.Timeout = 3000;
 
         request.GetResponse();
       }
@@ -586,9 +585,10 @@ public static BundleStatus GetCombinedBundleStatus(AemInstance pInstance) {
       try {
         mLog.Debug("Get bundle list from URL: " + bundleListUrl);
 
-        WebRequest request = pInstance.WebRequestCreate(bundleListUrl);
+        HttpWebRequest request = pInstance.WebRequestCreate(bundleListUrl);
         request.Method = "GET";
         request.Timeout = AEMManager.Properties.Settings.Default.BundleListTimeout;
+        request.ReadWriteTimeout = AEMManager.Properties.Settings.Default.BundleListTimeout;
 
         responseTimeStopwatch.Start();
         using (WebResponse response = request.GetResponse()) {

diff --git a/AEMManager/AemInstance.cs b/AEMManager/AemInstance.cs
@@ -803,14 +803,21 @@ public ConsoleWindow ConsoleOutputWindow {
     /// <param name="instance">AEM instance</param>
     /// <param name="url">URL</param>
     /// <returns></returns>
-    public WebRequest WebRequestCreate(string url) {
-      WebRequest request = WebRequest.Create(url);
+    public HttpWebRequest WebRequestCreate(string url) {
+      HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
 
       // "manual" preemptive authentication
       string authInfo = this.Username + ":" + this.Password;
       authInfo = Convert.ToBase64String(Encoding.Default.GetBytes(authInfo));
       request.Headers["Authorization"] = "Basic " + authInfo;
 
+      // default timeouts
+      request.Timeout = AEMManager.Properties.Settings.Default.HttpTimeout;
+      request.ReadWriteTimeout = AEMManager.Properties.Settings.Default.HttpTimeout;
+
+      // disable keep alive
+      request.KeepAlive = false;
+
       return request;
     }
 

diff --git a/AEMManager/AemInstanceDialog.Designer.cs b/AEMManager/AemInstanceDialog.Designer.cs
diff --git a/AEMManager/App.config b/AEMManager/App.config
@@ -43,24 +43,27 @@
 
   <applicationSettings>
     <AEMManager.Properties.Settings>
-      <setting name="TrayIconRefreshInterval" serializeAs="String">
-        <value>1000</value>
-      </setting>
-      <setting name="ProcessNameViaShortcut" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="BundleListTimeout" serializeAs="String">
-        <value>3000</value>
-      </setting>
-      <setting name="ReportStatusChangeTimeout" serializeAs="String">
-        <value>2000</value>
-      </setting>
-      <setting name="JProfilerPath" serializeAs="String">
-        <value>C:\Programme\jprofiler7\bin\windows</value>
-      </setting>
-      <setting name="JProfilerAgent" serializeAs="String">
-        <value>C:\Programme\jprofiler7\bin\agent.jar</value>
-      </setting>
+        <setting name="TrayIconRefreshInterval" serializeAs="String">
+            <value>1000</value>
+        </setting>
+        <setting name="ProcessNameViaShortcut" serializeAs="String">
+            <value>True</value>
+        </setting>
+        <setting name="ReportStatusChangeTimeout" serializeAs="String">
+            <value>2000</value>
+        </setting>
+        <setting name="JProfilerPath" serializeAs="String">
+            <value>C:\Programme\jprofiler7\bin\windows</value>
+        </setting>
+        <setting name="JProfilerAgent" serializeAs="String">
+            <value>C:\Programme\jprofiler7\bin\agent.jar</value>
+        </setting>
+        <setting name="BundleListTimeout" serializeAs="String">
+            <value>3000</value>
+        </setting>
+        <setting name="HttpTimeout" serializeAs="String">
+            <value>2000</value>
+        </setting>
     </AEMManager.Properties.Settings>
   </applicationSettings>
 

diff --git a/AEMManager/Properties/AssemblyInfo.cs b/AEMManager/Properties/AssemblyInfo.cs
@@ -29,8 +29,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.2.0")]
-[assembly: AssemblyFileVersion("2.3.2.0")]
+[assembly: AssemblyVersion("2.3.4.0")]
+[assembly: AssemblyFileVersion("2.3.4.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]
diff --git a/AEMManager/Properties/Settings.Designer.cs b/AEMManager/Properties/Settings.Designer.cs
diff --git a/AEMManager/Properties/Settings.settings b/AEMManager/Properties/Settings.settings
@@ -8,9 +8,6 @@
     <Setting Name="ProcessNameViaShortcut" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="BundleListTimeout" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">400</Value>
-    </Setting>
     <Setting Name="ReportStatusChangeTimeout" Type="System.Int32" Scope="Application">
       <Value Profile="(Default)">2000</Value>
     </Setting>
@@ -20,5 +17,11 @@
     <Setting Name="JProfilerAgent" Type="System.String" Scope="Application">
       <Value Profile="(Default)">C:\Programme\jprofiler7\bin\agent.jar</Value>
     </Setting>
+    <Setting Name="BundleListTimeout" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">3000</Value>
+    </Setting>
+    <Setting Name="HttpTimeout" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">2000</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AEMManager/SlingDavExServlet.cs b/AEMManager/SlingDavExServlet.cs
@@ -42,9 +42,8 @@ private bool IsDavExEnabled() {
       try {
         mLog.Debug("Get bundle list from URL: " + davExUrl);
 
-        WebRequest request = instance.WebRequestCreate(davExUrl);
+        HttpWebRequest request = instance.WebRequestCreate(davExUrl);
         request.Method = "GET";
-        request.Timeout = AEMManager.Properties.Settings.Default.BundleListTimeout;
 
         responseTimeStopwatch.Start();
         using (WebResponse response = request.GetResponse()) {
@@ -82,9 +81,8 @@ private void EnableDavEx() {
         ASCIIEncoding ascii = new ASCIIEncoding();
         byte[] postBytes = ascii.GetBytes(postData.ToString());
 
-        WebRequest request = instance.WebRequestCreate(configPostUrl);
+        HttpWebRequest request = instance.WebRequestCreate(configPostUrl);
         request.Method = "POST";
-        request.Timeout = AEMManager.Properties.Settings.Default.BundleListTimeout;
         request.ContentType = "application/x-www-form-urlencoded";
         request.ContentLength = postBytes.Length;
 

diff --git a/AEMManagerSetup/Product.wxs b/AEMManagerSetup/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29"
            Manufacturer="wcm.io"
-           Version="2.3.2.0">
+           Version="2.3.4.0">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />