NEW - bug 237140: remove deprecated code from Bugzilla

https://bugs.eclipse.org/bugs/show_bug.cgi?id=237140

27 files changed, 31 insertions, 31 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
index 2160cc8df..9547e6aa4 100644
--- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
 Bundle-ClassPath: bugzilla-test.jar
-Export-Package: com.eclipse.mylyn.bugzilla.deprecated,
+Export-Package: org.eclipse.mylyn.bugzilla.deprecated,
  org.eclipse.mylyn.bugzilla.tests;x-internal:=true,
  org.eclipse.mylyn.bugzilla.tests.headless;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/AttachmentPartSource.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/AttachmentPartSource.java
index 83af78998..64fc146b3 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/AttachmentPartSource.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/AttachmentPartSource.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaAttributeFactory.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaAttributeFactory.java
index 8b6407453..b701e4e9e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaAttributeFactory.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaAttributeFactory.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareInput.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareInput.java
index 033c86f7f..fc6a1ae49 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareInput.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareInput.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareEditorInput;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareNode.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareNode.java
index fce84659a..a1e4253b3 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareNode.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareNode.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareStructureCreator.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareStructureCreator.java
index 2c6977a2b..d980e8135 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareStructureCreator.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaCompareStructureCreator.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.compare.structuremergeviewer.IStructureComparator;
 import org.eclipse.compare.structuremergeviewer.IStructureCreator;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaRepositoryQuery.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaRepositoryQuery.java
index e2d14de0e..5a433a27b 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaRepositoryQuery.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaRepositoryQuery.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaStackTraceDuplicateDetector.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaStackTraceDuplicateDetector.java
index 5c6124554..d5785e806 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaStackTraceDuplicateDetector.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaStackTraceDuplicateDetector.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTask.java
index 50e4bebd1..234b634b5 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTask.java
@@ -8,7 +8,7 @@
 /*
  * Created on 14-Jan-2005
  */
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditor.java
index b786c6e22..c8a880165 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditor.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorFactory.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorFactory.java
index e56367f62..be2089485 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorFactory.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorFactory.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractRepositoryTaskEditor;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorInput.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorInput.java
index fed9bdabd..f00bc7c20 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorInput.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskEditorInput.java
@@ -8,7 +8,7 @@
 /*
  * Created on 1-Feb-2005
  */
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskListFactory.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskListFactory.java
index c57496004..082390a40 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskListFactory.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/BugzillaTaskListFactory.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/DummySearchHitProvider.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/DummySearchHitProvider.java
index 500d4afa9..d53b2ee70 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/DummySearchHitProvider.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/DummySearchHitProvider.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/DuplicateDetetionTest.java
index 947c14aa3..024263d26 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/DuplicateDetetionTest.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/NewBugWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/NewBugWizardTest.java
index f1fbb126d..fed6d08a0 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/NewBugWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/NewBugWizardTest.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import junit.framework.TestCase;
 
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/NewBugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/NewBugzillaTaskEditor.java
index aa42ff0a2..d62f94b9e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/NewBugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/NewBugzillaTaskEditor.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/TaskListStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/TaskListStandaloneTest.java
index 85dd02200..513a66feb 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/com/eclipse/mylyn/bugzilla/deprecated/TaskListStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/deprecated/TaskListStandaloneTest.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package com.eclipse.mylyn.bugzilla.deprecated;
+package org.eclipse.mylyn.bugzilla.deprecated;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
index 1bb1ae37a..f758410ba 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
@@ -10,11 +10,11 @@ package org.eclipse.mylyn.bugzilla.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.mylyn.bugzilla.deprecated.DuplicateDetetionTest;
+import org.eclipse.mylyn.bugzilla.deprecated.TaskListStandaloneTest;
 import org.eclipse.mylyn.bugzilla.tests.headless.BugzillaQueryTest;
 import org.eclipse.mylyn.bugzilla.tests.headless.BugzillaTaskHistoryTest;
 
-import com.eclipse.mylyn.bugzilla.deprecated.DuplicateDetetionTest;
-import com.eclipse.mylyn.bugzilla.deprecated.TaskListStandaloneTest;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
index cd5dee88b..42d4f716d 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java
@@ -13,6 +13,7 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
@@ -22,7 +23,6 @@ import org.eclipse.mylyn.internal.tasks.ui.deprecated.TaskFactory;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
 
 /**
  * @author Rob Elves
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
index 5e2e36a5d..08e6caf0e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
@@ -12,6 +12,8 @@ import java.util.Set;
 
 import junit.framework.TestCase;
 
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
@@ -23,8 +25,6 @@ import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
index d89090e28..3a5adacea 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
@@ -13,6 +13,8 @@ import java.util.Date;
 
 import junit.framework.TestCase;
 
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
@@ -25,8 +27,6 @@ import org.eclipse.mylyn.internal.tasks.core.deprecated.TaskComment;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
index 149ce77e2..900fbfb88 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
@@ -10,6 +10,7 @@ package org.eclipse.mylyn.bugzilla.tests;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
@@ -17,7 +18,6 @@ import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
index c4cbb2cc6..c42e58d06 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
@@ -12,6 +12,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
 import org.eclipse.mylyn.context.tests.support.TestUtil;
 import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
@@ -25,7 +26,6 @@ import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskData;
 import org.eclipse.mylyn.tasks.core.data.TaskMapper;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
 
 /**
  * @author Rob Elves
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
index 8129ff3f9..5e5e51302 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
@@ -10,13 +10,13 @@ package org.eclipse.mylyn.bugzilla.tests;
 
 import junit.framework.TestCase;
 
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 
 /**
  * @author Mik Kersten
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index 45b6cd66b..ce8594dae 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -10,6 +10,7 @@ package org.eclipse.mylyn.bugzilla.tests;
 
 import junit.framework.TestCase;
 
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.tasks.core.deprecated.AbstractLegacyRepositoryConnector;
@@ -25,7 +26,6 @@ import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaAttributeFactory;
 
 /**
  * @author Jeff Pound
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
index d21670c06..4c8612a53 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
@@ -10,6 +10,8 @@ package org.eclipse.mylyn.bugzilla.tests;
 
 import junit.framework.TestCase;
 
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
+import org.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotification;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
@@ -20,8 +22,6 @@ import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotification;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
 
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaRepositoryQuery;
-import com.eclipse.mylyn.bugzilla.deprecated.BugzillaTask;
 
 /**
  * @author Rob Elves