426936: update Bugzilla instances to 4.4.2 and 4.5.2

Change-Id: I3d65f2f09dd3b1ddabc41b59a1f6817910a857f5
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=426936

5 files changed, 55 insertions, 14 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java
index bd024ae89..3c4227fae 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java
@@ -44,6 +44,8 @@ public class BugzillaVersion implements Comparable<BugzillaVersion>, Serializabl
 
 	public final static BugzillaVersion BUGZILLA_4_4 = new BugzillaVersion("4.4"); //$NON-NLS-1$
 
+	public final static BugzillaVersion BUGZILLA_4_5_2 = new BugzillaVersion("4.5.2"); //$NON-NLS-1$
+
 	public final static BugzillaVersion BUGZILLA_HEAD = new BugzillaVersion("4.5"); //$NON-NLS-1$
 
 	public final static BugzillaVersion MAX_VERSION = BUGZILLA_4_0;
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index 9e26a006d..86c8df56b 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -74,12 +74,37 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
     minor     => "4",
   }
 
+  bugzilla::site { "bugzilla-4.4.2":
+    major     => "4",
+    minor     => "4",
+  }
+
+bugzilla::site { "bugzilla-4.5.2":
+    major        => "4",
+    minor        => "5",
+    branch       => "trunk",
+    branchTag      => "bugzilla-4.5.2",
+    envdefault_rest => true,
+    envversion   => "4.5.2",
+  }
+  
+bugzilla::site { "bugzilla-rest-4.5.2":
+    major        => "4",
+    minor        => "5",
+    branch       => "trunk",
+    branchTag      => "bugzilla-4.5.2",
+    envdefault_rest => true,
+    rest_enabled => true,
+    envversion   => "4.5.2",
+    envinfo => "4.5.2, REST enabled"
+  }
+  
   bugzilla::site { "bugzilla-trunk":
     major       => "4",
     minor       => "5",
     branch      => "trunk",
     branchTag   => "trunk",
-    envversion   => "4.5.1+",
+    envversion   => "4.5.2+",
   }
 
 bugzilla::site { "bugzilla-rest-trunk":
@@ -87,9 +112,10 @@ bugzilla::site { "bugzilla-rest-trunk":
     minor        => "5",
     branch       => "trunk",
     branchTag    => "trunk",
-    envversion   => "4.5.1+",
+    envversion   => "4.5.2+",
     envdefault_rest => true,
     rest_enabled => true,
   }
 
+
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index 64fdf3e05..736f7110d 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -34,6 +34,7 @@ define bugzilla::site (
   $usebugaliases        = false,
   $clearMode            = $bugzilla::clearMode,
   $rest_enabled         = false,
+  $envinfo              = "",
   ) {
 
   include "bugzilla"
@@ -66,17 +67,22 @@ define bugzilla::site (
   }
   if $envinfo2 != "" {
     if $rest_enabled {
-      $envinfo = "$envinfo2, REST enabled"
+      $envinfo3 = "$envinfo2, REST enabled"
     } else {
-       $envinfo = "$envinfo2"
+       $envinfo3 = "$envinfo2"
     }
   } else {
     if $rest_enabled {
-      $envinfo = "REST enabled"
+      $envinfo3 = "REST enabled"
     } else {
-       $envinfo = ""
+       $envinfo3 = ""
     }
   }
+  if $envinfo != "" {
+      $envinfo_intern = $envinfo
+  } else {
+      $envinfo_intern = $envinfo3
+  }
   if $major == "3" {
     if $minor == "6" {
       $VersionCreateName = "name"
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index 627d943ff..bb46d7512 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -2,7 +2,7 @@
   "type": "<%= envtype %>",
   "url": "/<%= envid %>",
   "version": "<%= envversion %>",
-  "info": "<%= envinfo %>",
+  "info": "<%= envinfo_intern %>",
   "properties":{
 <% if @envdefault           %><% if propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %>
 <% if @custom_wf            %><% if propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf": "<%= custom_wf %>"<% end %>
@@ -18,7 +18,7 @@
   "type": "bugzillaREST",
   "url": "/<%= envid %>",
   "version": "<%= envversion %>",
-  "info": "<%= envinfo %>",
+  "info": "<%= envinfo_intern %>",
   <% propertyanz = 0 -%>
   "properties":{
 <% if @envdefault_rest      %><% if propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %>
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaAttachmentHandlerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaAttachmentHandlerTest.java
index e1ef531d7..11ed986fc 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaAttachmentHandlerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaAttachmentHandlerTest.java
@@ -32,6 +32,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaStatus;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
+import org.eclipse.mylyn.internal.bugzilla.core.BugzillaVersion;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;
 import org.eclipse.mylyn.internal.tasks.core.TaskTask;
@@ -259,9 +260,7 @@ public class BugzillaAttachmentHandlerTest extends AbstractBugzillaTest {
 					new NullProgressMonitor());
 			fail("never reach this!");
 		} catch (Exception e) {
-			assertEquals(
-					"file is empty:  The file you are trying to attach is empty, does not exist, or you don't have permission to read it.",
-					e.getMessage());
+			assertFileEmptyError(e);
 		}
 
 		taskData = BugzillaFixture.current().getTask(taskData.getTaskId(), client);
@@ -286,9 +285,7 @@ public class BugzillaAttachmentHandlerTest extends AbstractBugzillaTest {
 					new NullProgressMonitor());
 			fail("never reach this!");
 		} catch (Exception e) {
-			assertEquals(
-					"file is empty:  The file you are trying to attach is empty, does not exist, or you don't have permission to read it.",
-					e.getMessage());
+			assertFileEmptyError(e);
 		}
 
 		taskData = BugzillaFixture.current().getTask(taskData.getTaskId(), client);
@@ -314,6 +311,16 @@ public class BugzillaAttachmentHandlerTest extends AbstractBugzillaTest {
 		assertTrue(attachFile.delete());
 	}
 
+	private void assertFileEmptyError(Exception e) {
+		if (BugzillaFixture.current().getBugzillaVersion().compareTo(BugzillaVersion.BUGZILLA_4_5_2) >= 0) {
+			assertEquals("An unknown repository error has occurred: file is empty", e.getMessage());
+		} else {
+			assertEquals(
+					"file is empty:  The file you are trying to attach is empty, does not exist, or you don't have permission to read it.",
+					e.getMessage());
+		}
+	}
+
 	public void testAttachmentToken() throws Exception {
 		TaskData taskData = BugzillaFixture.current().createTask(PrivilegeLevel.USER, null, null);
 		assertNotNull(taskData);