NEW - bug 149624: [api] AbstractRepositoryTask repositoryUrl and task id should not be derived from handleIdentifier

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

64 files changed, 322 insertions, 398 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
index 20884e950..5d5282ab6 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
@@ -103,8 +103,6 @@ public class BugzillaClient {
 
 	private static final String KEY_SHORT_DESC = "short_desc";
 
-	// /////////////////////
-
 	// Pages with this string in the html occurr when login is required
 	private static final String LOGIN_REQUIRED = "goaheadandlogin=1";
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
index 72f106af0..9ebe6e69c 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTask.java
@@ -47,8 +47,6 @@ public class BugzillaTask extends AbstractRepositoryTask {
 	}
 
 	private void initTaskUrl(String taskId) {
-//		String taskId = RepositoryTaskHandleUtil.getTaskId(getHandleIdentifier());
-//		String repositoryUrl = getRepositoryUrl();
 		try {
 			String url = BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, Integer.parseInt(taskId));
 			if (url != null) {
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
index aa51d9d56..6acc369eb 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
@@ -48,7 +48,7 @@ public interface IBugzillaConstants {
 	
 	public static final String POST_INPUT_COMMENT = "comment";
 
-	public static final String POST_INPUT_DESCRIPTION = "description";
+	public static final String POST_INPUT_DESCRIPTION = "summary";
 	
 	public static final String POST_INPUT_DATA = "data";
 	
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java
index 6ee4ee939..99c3a739d 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java
@@ -33,7 +33,7 @@ public class SaxBugzillaQueryContentHandler extends DefaultHandler {
 	/** The bug id */
 	private String id;
 
-	/** The description of the bug */
+	/** The summary of the bug */
 	private String description = "";
 
 	/** The priority of the bug */
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index 71b6b0965..44243f51d 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -212,13 +212,13 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 	public void testUniqueTaskObjects() {
 		init222();
 		String repositoryURL = "repositoryURL";
-		BugzillaQueryHit hit1 = new BugzillaQueryHit(taskList, "description", "P1", repositoryURL, "1", null, "status");
+		BugzillaQueryHit hit1 = new BugzillaQueryHit(taskList, "summary", "P1", repositoryURL, "1", null, "status");
 		ITask task1 = hit1.getOrCreateCorrespondingTask();
 		assertNotNull(task1);
 		// taskList.renameTask(task1, "testing");
 		// task1.setDescription("testing");
 
-		BugzillaQueryHit hit1Twin = new BugzillaQueryHit(taskList, "description", "P1", repositoryURL, "1", null,
+		BugzillaQueryHit hit1Twin = new BugzillaQueryHit(taskList, "summary", "P1", repositoryURL, "1", null,
 				"status");
 		ITask task2 = hit1Twin.getOrCreateCorrespondingTask();
 		assertEquals(task1.getSummary(), task2.getSummary());
@@ -319,7 +319,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 		} catch (Exception e) {
 		}
 		// attachmentHandler.uploadAttachment(repository, task, comment,
-		// description, file, contentType, isPatch, proxySettings)
+		// summary, file, contentType, isPatch, proxySettings)
 		// assertFalse(attachmentHandler.uploadAttachment(attachment,
 		// repository.getUserName(), repository.getPassword(),
 		// Proxy.NO_PROXY));
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 1e1f1901a..db2bcda89 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
@@ -49,7 +49,7 @@ public class BugzillaTaskTest extends TestCase {
 	}
 
 	public void testCompletionDate() throws Exception {
-		BugzillaTask task = new BugzillaTask("repo", "1", "description", true);
+		BugzillaTask task = new BugzillaTask("repo", "1", "summary", true);
 		RepositoryTaskData report = new RepositoryTaskData(new BugzillaAttributeFactory(),
 				BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, "1");
 		task.setTaskData(report);
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 11daebc91..284f08c99 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
@@ -103,7 +103,7 @@ public class RepositoryReportFactoryTest extends TestCase {
 	// report.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
 	// assertEquals("Windows",
 	// report.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());
-	// // first comment (#0) is the description so this value is always 1
+	// // first comment (#0) is the summary so this value is always 1
 	// // greater
 	// // than what is shown on the report ui
 	// assertEquals(3, report.getComments().size());
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 e5866218a..e0444f871 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
@@ -31,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
  */
 public class TaskEditorTest extends TestCase {
 
-	private static final String DESCRIPTION = "description";
+	private static final String DESCRIPTION = "summary";
 
 	@Override
 	protected void setUp() throws Exception {
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 b7fd0521e..6eed61821 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
@@ -95,11 +95,11 @@ public class TaskListNotificationManagerTest extends TestCase {
 	}
 
 	public void testTaskListNotificationQueryIncoming() {
-		BugzillaQueryHit hit = new BugzillaQueryHit(null, "description", "priority", "https://bugs.eclipse.org/bugs", "1",
+		BugzillaQueryHit hit = new BugzillaQueryHit(null, "summary", "priority", "https://bugs.eclipse.org/bugs", "1",
 				null, "status");
 		assertFalse(hit.isNotified());
 		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery("https://bugs.eclipse.org/bugs", "queryUrl",
-				"description", "10", TasksUiPlugin.getTaskListManager().getTaskList());
+				"summary", "10", TasksUiPlugin.getTaskListManager().getTaskList());
 		query.addHit(hit);
 		TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
 		TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault()
@@ -111,12 +111,12 @@ public class TaskListNotificationManagerTest extends TestCase {
 	
 	public void testTaskListNotificationQueryIncomingRepeats() {
 		TasksUiPlugin.getTaskListManager().resetTaskList();
-		BugzillaQueryHit hit = new BugzillaQueryHit(null, "description", "priority", "https://bugs.eclipse.org/bugs", "1",
+		BugzillaQueryHit hit = new BugzillaQueryHit(null, "summary", "priority", "https://bugs.eclipse.org/bugs", "1",
 				null, "status");
 		String hitHandle = hit.getHandleIdentifier();
 		assertFalse(hit.isNotified());
 		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery("https://bugs.eclipse.org/bugs", "queryUrl",
-				"description", "10", TasksUiPlugin.getTaskListManager().getTaskList());		
+				"summary", "10", TasksUiPlugin.getTaskListManager().getTaskList());		
 		query.addHit(hit);
 		TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);		
 		TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault()
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
index d2af1a72d..7ec652f2e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
@@ -156,7 +156,7 @@ public class TaskListStandaloneTest extends TestCase {
 		externalizers.add(new BugzillaTaskExternalizer());
 		// make a query
 		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(IBugzillaConstants.TEST_BUGZILLA_222_URL,
-				"http://queryurl", "description", "-1", TasksUiPlugin.getTaskListManager().getTaskList());
+				"http://queryurl", "summary", "-1", TasksUiPlugin.getTaskListManager().getTaskList());
 
 		manager.getTaskList().addQuery(query);
 		manager.saveTaskList();
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
index 4a1be2d18..5ba75843a 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
@@ -110,7 +110,7 @@ public class BugzillaQueryTest extends TestCase {
 		QueryHitCollector collector = new QueryHitCollector(new TaskList());
 		BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector();
 		connector.init(taskList);
-		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "description",
+		BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "summary",
 				"-1", taskList);
 		connector.performQuery(query, repository, new NullProgressMonitor(), collector);
 		assertEquals(2, collector.getHits().size());
diff --git a/org.eclipse.mylyn.bugzilla.tests/temptasklist.xml b/org.eclipse.mylyn.bugzilla.tests/temptasklist-save.zip
index 14e39bc95..14e39bc95 100644
--- a/org.eclipse.mylyn.bugzilla.tests/temptasklist.xml
+++ b/org.eclipse.mylyn.bugzilla.tests/temptasklist-save.zip
diff --git a/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401227263.txt b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401227263.txt
new file mode 100644
index 000000000..bdf08de0f
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401227263.txt
@@ -0,0 +1 @@
+test file
\ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401474612.txt b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401474612.txt
new file mode 100644
index 000000000..bdf08de0f
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171401474612.txt
@@ -0,0 +1 @@
+test file
\ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.tests/test-attach-1171404403023.txt b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171404403023.txt
new file mode 100644
index 000000000..bdf08de0f
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.tests/test-attach-1171404403023.txt
@@ -0,0 +1 @@
+test file
\ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
index e04a710bc..399361669 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
@@ -33,9 +33,11 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer {
 
 	private static final String STATUS_NEW = "NEW";
 
-	private static final String TAG_BUGZILLA_QUERY_HIT = "Bugzilla" + KEY_QUERY_HIT;
+	private static final String TAG_BUGZILLA = "Bugzilla";
+	
+	private static final String TAG_BUGZILLA_QUERY_HIT = TAG_BUGZILLA + KEY_QUERY_HIT;
 
-	private static final String TAG_BUGZILLA_QUERY = "Bugzilla" + KEY_QUERY;
+	private static final String TAG_BUGZILLA_QUERY = TAG_BUGZILLA + KEY_QUERY;
 
 	private static final String TAG_BUGZILLA_CUSTOM_QUERY = "BugzillaCustom" + KEY_QUERY;
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java
index d70e4f06c..eff36714e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/StackTrace.java
@@ -86,7 +86,7 @@ public class StackTrace {
 	 * Get the Comment that this stack trace came from
 	 * 
 	 * @return Returns the Comment if it was a comment else a String if it was
-	 *         the description
+	 *         the summary
 	 */
 	public Object getComment() {
 		return comment;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebQueryHit.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebQueryHit.java
index 104a502f8..71b838b5f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebQueryHit.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebQueryHit.java
@@ -38,13 +38,13 @@ public class WebQueryHit extends AbstractQueryHit {
 
 	@Override
 	protected AbstractRepositoryTask createTask() {
-		return new WebTask(taskId, description, taskPrefix, repositoryUrl, WebTask.REPOSITORY_TYPE);
+		return new WebTask(taskId, summary, taskPrefix, repositoryUrl, WebTask.REPOSITORY_TYPE);
 	}
 	
-	@Override
-	public String getHandleIdentifier() {
-		return taskPrefix + getTaskId();
-	}
+//	@Override
+//	public String getHandleIdentifier() {
+//		return taskPrefix + getTaskId();
+//	}
 
 	public String getTaskPrefix() {
 		return this.taskPrefix;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java
index 3681a805a..26932a56e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java
@@ -50,8 +50,9 @@ public abstract class AbstractRepositoryTask extends Task {
 
 	protected IStatus status = null;
 
-	public AbstractRepositoryTask(String repositoryUrl, String taskId, String label, boolean newTask) {
-		super(null, label, newTask);
+	public AbstractRepositoryTask(String repositoryUrl, String taskId, String summary, boolean newTask) {
+		// NOTE: Repository tasks specify their own handle format.
+		super(null, summary, newTask);
 		this.repositoryUrl = repositoryUrl;
 		this.taskId = taskId;
 	}
@@ -93,14 +94,6 @@ public abstract class AbstractRepositoryTask extends Task {
 		return false;
 	}
 
-//	public static long getLastRefreshTimeInMinutes(Date lastRefresh) {
-//		Date timeNow = new Date();
-//		if (lastRefresh == null)
-//			lastRefresh = new Date();
-//		long timeDifference = (timeNow.getTime() - lastRefresh.getTime()) / 60000;
-//		return timeDifference;
-//	}
-
 	public boolean isSynchronizing() {
 		return currentlySynchronizing;
 	}
@@ -115,7 +108,6 @@ public abstract class AbstractRepositoryTask extends Task {
 	 */
 	public String getIdentifyingLabel() {
 		return taskId;
-//		return RepositoryTaskHandleUtil.getTaskId(handleIdentifier);
 	}
 
 	public boolean isDirty() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
index f47ca6bd5..7bd016f86 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractQueryHit.java
@@ -25,7 +25,7 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 
 	protected String repositoryUrl;
 
-	protected String description;
+	protected String summary;
 
 	protected String priority = PriorityLevel.getDefault().toString();
 
@@ -37,11 +37,11 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 
 	private AbstractRepositoryQuery parent;
 
-	protected AbstractQueryHit(TaskList taskList, String repositoryUrl, String description, String id) {
+	protected AbstractQueryHit(TaskList taskList, String repositoryUrl, String description, String taskId) {
 		this.taskList = taskList;
 		this.repositoryUrl = repositoryUrl;
-		this.description = description;
-		this.taskId = id;
+		this.summary = description;
+		this.taskId = taskId;
 	}
 
 	public AbstractRepositoryQuery getParent() {
@@ -64,7 +64,7 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 		if (task != null) {
 			return task.getSummary();
 		} else {
-			return description;
+			return summary;
 		}
 	}
 	
@@ -109,7 +109,7 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 		this.completed = completed;
 	}
 	
-	public String getHandleIdentifier() {
+	public final String getHandleIdentifier() {
 		if (task != null) {
 			return task.getHandleIdentifier();
 		}
@@ -173,8 +173,8 @@ public abstract class AbstractQueryHit implements ITaskListElement {
 		this.priority = priority;
 	}
 
-	public void setDescription(String description) {
-		this.description = description;
+	public void setSummary(String description) {
+		this.summary = description;
 	}
 
 	public void setHandleIdentifier(String id) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
index b225cbb62..431420f2f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
@@ -95,7 +95,7 @@ public abstract class AbstractRepositoryConnector {
 			IProgressMonitor monitor, QueryHitCollector resultCollector);
 
 	/**
-	 * The connector's description i.e. "JIRA (supports 3.3.1 and later)"
+	 * The connector's summary i.e. "JIRA (supports 3.3.1 and later)"
 	 */
 	public abstract String getLabel();
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
index 1465c6bbe..4d4125fa0 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
@@ -97,7 +97,7 @@ public abstract class AbstractRepositoryQuery extends AbstractTaskContainer {
 				hit.setCorrespondingTask((AbstractRepositoryTask) correspondingTask);
 			}
 		}		
-		// Always replace even if exists (may have new description etc.) 
+		// Always replace even if exists (may have new summary etc.) 
 		taskList.addQueryHit(hit);
 		
 		// TODO: this is meaningless since only one hit object exists now
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
index 3681a805a..26932a56e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
@@ -50,8 +50,9 @@ public abstract class AbstractRepositoryTask extends Task {
 
 	protected IStatus status = null;
 
-	public AbstractRepositoryTask(String repositoryUrl, String taskId, String label, boolean newTask) {
-		super(null, label, newTask);
+	public AbstractRepositoryTask(String repositoryUrl, String taskId, String summary, boolean newTask) {
+		// NOTE: Repository tasks specify their own handle format.
+		super(null, summary, newTask);
 		this.repositoryUrl = repositoryUrl;
 		this.taskId = taskId;
 	}
@@ -93,14 +94,6 @@ public abstract class AbstractRepositoryTask extends Task {
 		return false;
 	}
 
-//	public static long getLastRefreshTimeInMinutes(Date lastRefresh) {
-//		Date timeNow = new Date();
-//		if (lastRefresh == null)
-//			lastRefresh = new Date();
-//		long timeDifference = (timeNow.getTime() - lastRefresh.getTime()) / 60000;
-//		return timeDifference;
-//	}
-
 	public boolean isSynchronizing() {
 		return currentlySynchronizing;
 	}
@@ -115,7 +108,6 @@ public abstract class AbstractRepositoryTask extends Task {
 	 */
 	public String getIdentifyingLabel() {
 		return taskId;
-//		return RepositoryTaskHandleUtil.getTaskId(handleIdentifier);
 	}
 
 	public boolean isDirty() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
index f6c4b3805..4c8f7476e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
@@ -113,7 +113,7 @@ public abstract class AbstractTaskContainer implements ITaskListElement {
 	}
 	
 	/**
-	 * The handle for most containers is their description.  Override to specify a
+	 * The handle for most containers is their summary.  Override to specify a
 	 * different natural ordering.
 	 */
 	public int compareTo(ITaskListElement taskListElement) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
index 4861fb6dd..74dfe52c4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java
@@ -248,4 +248,8 @@ public class DateRangeActivityDelegate implements ITask {
 	public int compareTo(ITaskListElement taskListElement) {
 		return task.toString().compareTo(((Task)taskListElement).toString());
 	}
+
+	public void setDescription(String description) {
+		task.setDescription(description);
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeContainer.java
index 30dc1ae64..e6720f54b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeContainer.java
@@ -71,7 +71,7 @@ public class DateRangeContainer extends AbstractTaskContainer {
 		startDate.setTime(time);
 		endDate = new GregorianCalendar();
 		endDate.setTime(time2);
-		// this.description = description;
+		// this.description = summary;
 	}
 
 	public boolean includes(Calendar cal) {
@@ -198,7 +198,7 @@ public class DateRangeContainer extends AbstractTaskContainer {
 	}
 
 	/**
-	 * The handle for most containers is their description.  Override to specify a
+	 * The handle for most containers is their summary.  Override to specify a
 	 * different natural ordering.
 	 */
 	@Override
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
index b98e269e5..18775a57d 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
@@ -112,8 +112,6 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 
 	public static final String KEY_REMINDED = "Reminded";
 
-	// public static final String LABEL_AUTOMATIC = "<automatic>";
-
 	/**
 	 * This element holds the date stamp recorded upon last transition to a
 	 * synchronized state.
@@ -259,18 +257,20 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 		NodeList list = node.getChildNodes();
 		for (int i = 0; i < list.getLength(); i++) {
 			Node child = list.item(i);
-			boolean read = false;
 			try {
-				for (ITaskListExternalizer externalizer : delegateExternalizers) {
-					// LEGACY: categories used to contain tasks
-					if (externalizer.canReadTask(child)) {
-						externalizer.readTask(child, taskList, category, null);
-						read = true;
-					}
-				}
-				if (!read && canReadTask(child)) {
-					category.add(readTask(child, taskList, category, null));
-				}
+				// LEGACY: categories used to contain tasks?
+				category.add(readTask(child, taskList, category, null));
+//				boolean read = false;
+//				for (ITaskListExternalizer externalizer : delegateExternalizers) {
+//					// LEGACY: categories used to contain tasks
+//					if (externalizer.canReadTask(child)) {
+//						externalizer.createTask(child, taskList, category, null);
+//						read = true;
+//					}
+//				}
+//				if (!read && canReadTask(child)) {
+//					category.add(createTask(child, taskList, category, null));
+//				}
 			} catch (Throwable t) {
 				hasCaughtException = true;
 			}
@@ -280,54 +280,67 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 		}
 	}
 
+	/**
+	 * First tries to use a delegate externalizer to read, if none available, reads itself.
+	 */
+	public final ITask readTask(Node node, TaskList taskList, AbstractTaskContainer category, ITask parent) throws TaskExternalizationException {
+		ITask task = null;
+		String taskId = null;
+		String repositoryUrl = null;
+		String summary = "";
+		boolean alreadyRead = false;
+		
+		Element element = (Element)node;
+		if (element.hasAttribute(KEY_HANDLE)) {
+			String handle = element.getAttribute(KEY_HANDLE);
+			repositoryUrl = RepositoryTaskHandleUtil.getRepositoryUrl(handle);
+			taskId = RepositoryTaskHandleUtil.getTaskId(handle);
+		} else {
+			throw new TaskExternalizationException("Handle not stored for repository task");
+		}
+		if (element.hasAttribute(KEY_LABEL)) {
+			summary = element.getAttribute(KEY_LABEL);
+		} 
+		
+		for (ITaskListExternalizer externalizer : delegateExternalizers) {
+			if (!alreadyRead && externalizer.canReadTask(node)) {
+				task = externalizer.createTask(repositoryUrl, taskId, summary, element, taskList, category, parent);
+				alreadyRead = true;
+			}
+		}
+
+		if (!alreadyRead && this.canReadTask(node)) {
+			task = this.createTask(repositoryUrl, taskId, summary, element, taskList, category, parent);
+			alreadyRead = true;
+		}
+		if (task != null) {
+			readTaskInfo(task, taskList, element, parent, category);
+		}
+		return task;
+	}	
+	
 	public boolean canReadTask(Node node) {
 		return node.getNodeName().equals(getTaskTagName());
 	}
 
-	public ITask readTask(Node node, TaskList taskList, AbstractTaskContainer category, ITask parent)
+	/**
+	 * Override for connector-specific implementation
+	 */
+	public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskContainer category, ITask parent)
 			throws TaskExternalizationException {
-		Element element = (Element) node;
 		String handle;
-		String label;
 		if (element.hasAttribute(KEY_HANDLE)) {
 			handle = element.getAttribute(KEY_HANDLE);
 		} else {
 			throw new TaskExternalizationException("Handle not stored for task");
 		}
-		if (element.hasAttribute(KEY_LABEL)) {
-			label = element.getAttribute(KEY_LABEL);
-		} else {
-			label = "Description was corrupted in stored tasklist";
-		}
-
-		Task task = new Task(handle, label, false);
-		readTaskInfo(task, taskList, element, parent, category);
+		Task task = new Task(handle, summary, false);
 		return task;
 	}
 
-	protected void readTaskInfo(ITask task, TaskList taskList, Element element, ITask parent,
+	private void readTaskInfo(ITask task, TaskList taskList, Element element, ITask parent,
 			AbstractTaskContainer legacyCategory) throws TaskExternalizationException {
-
-		// TODO: move this
-		if (task instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask abstractTask = (AbstractRepositoryTask) task;
-			if (element.hasAttribute(KEY_HANDLE)) {
-				String handle = element.getAttribute(KEY_HANDLE);
-				String repositoryUrl = RepositoryTaskHandleUtil.getRepositoryUrl(handle);
-				String taskId = RepositoryTaskHandleUtil.getTaskId(handle);
-				abstractTask.setRepositoryUrl(repositoryUrl);
-				abstractTask.setTaskId(taskId);
-			} else {
-				throw new TaskExternalizationException("Handle not stored for repository task");
-			}
-			if (element.hasAttribute(KEY_LABEL)) {
-				String label = element.getAttribute(KEY_LABEL);
-				abstractTask.setDescription(label);
-			} else {
-				throw new TaskExternalizationException("Label not stored for repository task");
-			}
-		}
-
+		
 		String categoryHandle = null;
 		if (element.hasAttribute(KEY_CATEGORY)) {
 			categoryHandle = element.getAttribute(KEY_CATEGORY);
@@ -423,6 +436,13 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 		if (task instanceof AbstractRepositoryTask) {
 			AbstractRepositoryTask abstractTask = (AbstractRepositoryTask) task;
 			abstractTask.setCurrentlySynchronizing(false);
+			
+			if (element.hasAttribute(KEY_REPOSITORY_URL)) {
+				abstractTask.setRepositoryUrl(element.getAttribute(KEY_REPOSITORY_URL));
+			} else {
+				throw new TaskExternalizationException("Repository URL not stored for repository task");
+			}
+			
 			if (element.hasAttribute(KEY_LAST_MOD_DATE) && !element.getAttribute(KEY_LAST_MOD_DATE).equals("")) {
 				abstractTask.setLastSyncDateStamp(element.getAttribute(KEY_LAST_MOD_DATE));
 			}
@@ -466,6 +486,25 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 		}
 	}
 
+//	/**
+//	 * @return	task ID, or null if not found
+//	 */
+//	protected void readLegacyHandleFormat(ITask task, Element element) throws TaskExternalizationException {
+//		if (task instanceof AbstractRepositoryTask) {
+//			AbstractRepositoryTask abstractTask = (AbstractRepositoryTask) task;
+//			
+//			if (element.hasAttribute(KEY_HANDLE)) {
+//				String handle = element.getAttribute(KEY_HANDLE);
+//				String repositoryUrl = RepositoryTaskHandleUtil.getRepositoryUrl(handle);
+//				String taskId = RepositoryTaskHandleUtil.getTaskId(handle);
+//				abstractTask.setRepositoryUrl(repositoryUrl);
+//				abstractTask.setTaskId(taskId);
+//			} else {
+//				throw new TaskExternalizationException("Handle not stored for repository task");
+//			}
+//		}
+//	}
+
 	protected void readTaskData(AbstractRepositoryTask task) {
 		RepositoryTaskData data = taskDataManager.getRepositoryTaskData(task.getHandleIdentifier());
 		// RepositoryTaskData data =
@@ -571,27 +610,61 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 		}
 		parent.appendChild(node);
 		return node;
-		// return null;
 	}
 
 	public boolean canReadQueryHit(Node node) {
 		return false;
 	}
-
-	public void readQueryHit(Node node, TaskList tlist, AbstractRepositoryQuery query)
-			throws TaskExternalizationException {
-		// doesn't know how to read a query hit
+	
+	public final void readQueryHit(Element element, TaskList taskList, AbstractRepositoryQuery query)
+		throws TaskExternalizationException {
+		AbstractQueryHit hit = null;
+		String summary = "";
+		if (element.hasAttribute(KEY_NAME)) {
+			summary = element.getAttribute(KEY_NAME);
+		}
+		
+		if (element.hasAttribute(KEY_HANDLE)) {
+			String handle = element.getAttribute(KEY_HANDLE);
+			String repositoryUrl = RepositoryTaskHandleUtil.getRepositoryUrl(handle);
+			String taskId = RepositoryTaskHandleUtil.getTaskId(handle);
+			for (ITaskListExternalizer externalizer : delegateExternalizers) {
+				if (externalizer.canReadQueryHit((Node)element)) {
+					hit = externalizer.createQueryHit(repositoryUrl, taskId, summary, element, taskList, query);
+					break;
+				}
+			}		
+		} else {
+			throw new TaskExternalizationException("Handle not stored for repository task");
+		}
+		
+		if (hit != null) {
+			readQueryHitInfo(hit, taskList, query, element);
+		}
+	}
+	
+	/**
+	 * Subclasses should override.
+	 */
+	public AbstractQueryHit createQueryHit(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractRepositoryQuery query)
+		throws TaskExternalizationException {
+		// no default hit reading behavior
+		return null;
 	}
 
-	public void readQueryHitInfo(AbstractQueryHit hit, TaskList taskList, AbstractRepositoryQuery query, Element element)
+	private void readQueryHitInfo(AbstractQueryHit hit, TaskList taskList, AbstractRepositoryQuery query, Element element)
 			throws TaskExternalizationException {
-		if (element.hasAttribute(KEY_NAME)) {
-			hit.setDescription(element.getAttribute(KEY_NAME));
-		}
 		if (element.hasAttribute(KEY_PRIORITY)) {
 			hit.setPriority(element.getAttribute(KEY_PRIORITY));
 		}
 
+		if (element.hasAttribute(KEY_COMPLETE)
+				&& element.getAttribute(KEY_COMPLETE).compareTo(VAL_TRUE) == 0) {
+			hit.setCompleted(true);
+		} else {
+			hit.setCompleted(false);
+		}
+		
 		if (element.hasAttribute(KEY_NOTIFIED_INCOMING)
 				&& element.getAttribute(KEY_NOTIFIED_INCOMING).compareTo(VAL_TRUE) == 0) {
 			hit.setNotified(true);
@@ -599,14 +672,6 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 			hit.setNotified(false);
 		}
 
-		if (element.hasAttribute(KEY_HANDLE)) {
-			String handle = element.getAttribute(KEY_HANDLE);
-			hit.setRepositoryUrl(RepositoryTaskHandleUtil.getRepositoryUrl(handle));
-			hit.setTaskId(RepositoryTaskHandleUtil.getTaskId(handle));
-		} else {
-			throw new TaskExternalizationException("Handle not stored for bug report");
-		}
-
 		ITask correspondingTask = taskList.getTask(hit.getHandleIdentifier());
 		if (correspondingTask instanceof AbstractRepositoryTask) {
 			hit.setCorrespondingTask((AbstractRepositoryTask) correspondingTask);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
index b2c9fc776..8a65c1a11 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
@@ -85,4 +85,6 @@ public interface ITask extends ITaskListElement {
 	public abstract void setReminded(boolean reminded);
 
 	public abstract boolean isPastReminder();
+
+	public abstract void setDescription(String attribute);
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java
index 180711760..ed48bd3a7 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java
@@ -52,7 +52,7 @@ public interface ITaskListExternalizer {
 
 	public abstract boolean canReadTask(Node node);
 
-	public abstract ITask readTask(Node node, TaskList tlist, AbstractTaskContainer category, ITask parent)
+	public abstract ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList tlist, AbstractTaskContainer category, ITask parent)
 			throws TaskExternalizationException;
 
 	public abstract boolean canCreateElementFor(AbstractRepositoryQuery category);
@@ -69,6 +69,6 @@ public interface ITaskListExternalizer {
 
 	public abstract boolean canReadQueryHit(Node node);
 
-	public abstract void readQueryHit(Node node, TaskList tlist, AbstractRepositoryQuery query)
+	public abstract AbstractQueryHit createQueryHit(String repositoryUrl, String taskId, String summary, Element element, TaskList tlist, AbstractRepositoryQuery query)
 			throws TaskExternalizationException;
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
index 6b72af066..2cad6f7d5 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
@@ -259,7 +259,7 @@ public final class RepositoryTaskData extends AttributeContainer implements Seri
 	public RepositoryTaskAttribute getDescriptionAttribute() {
 		RepositoryTaskAttribute attribute = getAttribute(RepositoryTaskAttribute.DESCRIPTION);
 		// TODO: Remove the following after 1.0 release as we now just have a
-		// description attribute
+		// summary attribute
 		if (attribute == null) {
 			List<TaskComment> coms = this.getComments();
 			if (coms != null && coms.size() > 0) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
index d803433d7..09101a605 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
@@ -107,7 +107,7 @@ public class Task implements ITask {
 
 	private boolean hasReminded = false;
 
-	private String description;
+	private String summary;
 
 	private String priority = PriorityLevel.getDefault().toString();
 
@@ -140,12 +140,12 @@ public class Task implements ITask {
 
 	@Override
 	public String toString() {
-		return description;
+		return summary;
 	}
 
-	public Task(String handle, String label, boolean newTask) {
+	public Task(String handle, String summary, boolean newTask) {
 		this.handleIdentifier = handle;
-		this.description = label;
+		this.summary = summary;
 		if (newTask) {
 			creationDate = new Date();
 		}
@@ -155,10 +155,6 @@ public class Task implements ITask {
 		return handleIdentifier;
 	}
 
-//	public void setHandleIdentifier(String taskId) {
-//		this.handleIdentifier = taskId;
-//	}
-
 	public ITask getParent() {
 		return parent;
 	}
@@ -221,6 +217,9 @@ public class Task implements ITask {
 		this.priority = priority;
 	}
 
+	/**
+	 * TODO: consider removing
+	 */
 	public void setTaskUrl(String url) {
 		this.taskUrl = url;
 	}
@@ -282,7 +281,7 @@ public class Task implements ITask {
 	}
 
 	public String getSummary() {
-		return description;
+		return summary;
 	}
 
 	public boolean isLocal() {
@@ -319,8 +318,8 @@ public class Task implements ITask {
 		this.creationDate = date;
 	}
 
-	public void setDescription(String description) {
-		this.description = description;
+	public void setDescription(String summary) {
+		this.summary = summary;
 	}
 
 	public void setCompletionDate(Date completionDate) {
@@ -366,6 +365,6 @@ public class Task implements ITask {
 	}
 
 	public int compareTo(ITaskListElement taskListElement) {
-		return description.compareTo(((Task)taskListElement).description);
+		return summary.compareTo(((Task)taskListElement).summary);
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile b/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile
index 9280b4691..2ced879fe 100644
--- a/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile
+++ b/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile
@@ -1,120 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                      "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title>Locate attachment</title>
+public class BugzillaContextLabelProvider extends AbstractContextLabelProvider {
 
+	@Override
+	protected Image getImage(IMylarElement node) {
+		return TaskListImages.getImage(TaskListImages.TASK_REMOTE);
+	}
 
-<link rel="Top" href="http://mylar.eclipse.org/bugs222/">
-
-    
-
-    <script type="text/javascript">
-  <!--
-  
-  function initHelp() {}
-  // -->
-  </script>
-
-    <link href="skins/standard/global.css" rel="stylesheet" type="text/css">
-    <link href="skins/custom/global.css" rel="stylesheet" type="text/css">
-
-
-
-    
-
-  </head>
-
-
-
-  <body onload="document.forms['choose-id'].id.focus()"
-        class="mylar-eclipse-org-bugs222">
-
-
-<div id="banner">
-    <div class="intro"></div>
-      <p id="banner-name">
-        <span>This is Bugzilla</span>
-      </p>
-      <p id="banner-version">
-        <a href="http://www.bugzilla.org/"><span>Bugzilla</span></a>
-        <span>Version 2.22.1</span>
-      </p>
-    <div class="outro"></div>
-    </div>
-
-<div id="header">
-    <h1>Locate attachment</h1>
-
-
-</div>
-
-<form name="choose-id" method="get" action="attachment.cgi">
-  <p>Access an attachment by entering its ID into the form below:</p>
-  <p>Attachment ID: <input name="id" size="6">
-  <button name="action" value="edit">&nbsp;Edit&nbsp;</button>
-  <button name="action" value="view">View</button>
-  </p>
-</form>
-
-<form method="get" action="show_bug.cgi">
-  <p>Or, access it from the list of attachments in its associated bug report:</p>
-  <p>Bug ID: <input name="id" size="6">
-  <input type="submit" name="action" value="View">
-  </p>
-</form>
-<div id="footer">
-  <div class="intro"></div>
-
-
-
-
-<div id="useful-links">
-  <div id="links-actions">
-    <div class="label">Actions:</div>
-    <div class="links">
-        <a href="./">Home</a> | 
-        <a href="enter_bug.cgi">New</a> | 
-        <a href="query.cgi">Search</a> |
-        
-        <form action="buglist.cgi" method="get"
-              onsubmit="if (this.quicksearch.value == '')
-                        { alert('Please enter one or more search terms first.');
-                          return false; } return true;">
-            <input class="txt" type="text" name="quicksearch">
-            <input class="btn" type="submit" value="Find">
-        </form> |
-        
-        <a href="report.cgi">Reports</a> 
-        
-          | <a href="request.cgi">Requests</a>
-              
-        
-              | <a href="createaccount.cgi">New&nbsp;Account</a>
-            | <a href="index.cgi?GoAheadAndLogIn=1">Log&nbsp;In</a>
-    </div>
-  </div>
-      
-    
-
-    
-    
-  <div id="links-saved">
-    <div class="label">
-    </div>
-    <div class="links">
-
-    </div>
-  </div>
-
-  
-
-
-  
-</div>
-
-  <div class="outro"></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
+	@Override
+	protected Image getImage(IMylarRelation edge) {
+		return MylarImages.getImage(MylarBugsPlugin.EDGE_REF_BUGZILLA);
+	}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
index 744f3d168..e0e9efd8b 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
@@ -130,7 +130,7 @@ public class RepositorySettingsPageTest extends TestCase {
 		private Composite parent;
 
 		public MockRepositorySettingsPage(AbstractRepositoryConnectorUi repositoryUi) {
-			super("title", "description", repositoryUi);
+			super("title", "summary", repositoryUi);
 		}
 
 		@Override
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
index 9c1744ac8..0e524a651 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
@@ -24,7 +24,7 @@ import org.eclipse.mylar.tasks.core.TaskList;
 public class TableSorterTest extends TestCase {
 
 	public void testRootTaskSorting() {
-		TaskListTableSorter sorter = new TaskListTableSorter(null, "description");
+		TaskListTableSorter sorter = new TaskListTableSorter(null, "summary");
 		 		
 		Task task = new Task("1", "", true);
 		TaskCategory category = new TaskCategory("cat", new TaskList());
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
index b1c67a86c..65ce17a9e 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
@@ -271,12 +271,9 @@ public class TaskDataManagerTest extends TestCase {
 	// offlineTaskDataManager.put(taskData);
 	// offlineTaskDataManager.put(taskData);
 	// }
-	// System.err.println("done Building");
 	// offlineTaskDataManager.save();
-	// System.err.println("Saved");
 	// File file =
 	// TasksUiPlugin.getDefault().getOfflineReportsFilePath().toFile();
-	// System.err.println(file.length());
 	// offlineTaskDataManager.clear();
 	// offlineTaskDataManager.readOfflineData();
 	// assertNotNull(offlineTaskDataManager.getOldTaskData(AbstractRepositoryTask.getHandle(
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
index 814eaa607..893b0f335 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
@@ -79,6 +79,7 @@ public class TaskListManagerTest extends TestCase {
 		TasksUiPlugin.getTaskListManager().saveTaskList();
 		TasksUiPlugin.getRepositoryManager().removeRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
+		assertEquals(0, manager.getTaskList().getAllTasks().size());
 	}
 
 	public void testUniqueTaskID() {
@@ -115,6 +116,7 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(1, manager.getTaskList().getAllTasks().size());
 
 		manager.getTaskList().deleteTask(task);
+		assertEquals(0, manager.getTaskList().getAllTasks().size());
 		manager.saveTaskList();
 		assertEquals(0, manager.getTaskList().getAllTasks().size());
 
@@ -736,9 +738,9 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSyncState());
 
 		manager.getTaskList().reset();
-		MockQueryHit hit1 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "description", "1");
-		MockQueryHit hit2 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "description", "2");
-		MockRepositoryQuery query = new MockRepositoryQuery("description", manager.getTaskList());
+		MockQueryHit hit1 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "summary", "1");
+		MockQueryHit hit2 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "summary", "2");
+		MockRepositoryQuery query = new MockRepositoryQuery("summary", manager.getTaskList());
 		query.addHit(hit1);
 		query.addHit(hit2);
 
@@ -772,9 +774,9 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(RepositoryTaskSyncState.INCOMING, task2.getSyncState());
 
 		manager.getTaskList().reset();
-		MockQueryHit hit1 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "description", "1");
-		MockQueryHit hit2 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "description", "2");
-		MockRepositoryQuery query = new MockRepositoryQuery("description", manager.getTaskList());
+		MockQueryHit hit1 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "summary", "1");
+		MockQueryHit hit2 = new MockQueryHit(manager.getTaskList(), repositoryUrl, "summary", "2");
+		MockRepositoryQuery query = new MockRepositoryQuery("summary", manager.getTaskList());
 		query.addHit(hit1);
 		query.addHit(hit2);
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
index 2874542d5..5049c4817 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
@@ -31,9 +31,9 @@ public class TaskPlanningEditorTest extends TestCase {
 
 	private static final String MOCK_HANDLE = "handle";
 
-	private static final String DESCRIPTION = "description";
+	private static final String DESCRIPTION = "summary";
 
-	private static final String NEW_DESCRIPTION = "new description";
+	private static final String NEW_DESCRIPTION = "new summary";
 
 	@Override
 	protected void setUp() throws Exception {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java
index c18897f0c..f9c73f5e1 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java
@@ -24,7 +24,7 @@ public class MockQueryHit extends AbstractQueryHit {
 
 	@Override
 	protected AbstractRepositoryTask createTask() {
-		return new MockRepositoryTask(repositoryUrl, taskId);
+		return new MockRepositoryTask(repositoryUrl, taskId, taskId);
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
index a60202ec0..aedc146da 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
@@ -64,12 +64,9 @@ public class MockRepositoryExternalizer extends DelegatingTaskExternalizer {
 	}
 	
 	@Override
-	public ITask readTask(Node node, TaskList taskList, AbstractTaskContainer category, ITask parent)
+	public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskContainer category, ITask parent)
 			throws TaskExternalizationException {
-
-		Element element = (Element) node;
-		MockRepositoryTask task = new MockRepositoryTask(null);
-		readTaskInfo(task, taskList, element, parent, category);
+		MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, taskId, summary);
 		return task;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
index f35d6b21b..c005a8da1 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
@@ -21,11 +21,15 @@ public class MockRepositoryTask extends AbstractRepositoryTask {
 	private String ownerId;
 	
 	public MockRepositoryTask(String taskId) {
-		super(MockRepositoryConnector.REPOSITORY_URL, taskId, "label for " + taskId, true);
+		super(MockRepositoryConnector.REPOSITORY_URL, taskId, taskId, true);
 	}
 
 	public MockRepositoryTask(String repositoryUrl, String taskId) {
-		super(repositoryUrl, taskId, "label for " + taskId, true);
+		super(repositoryUrl, taskId, taskId, true);
+	}
+	
+	public MockRepositoryTask(String repositoryUrl, String taskId, String summary) {
+		super(repositoryUrl, taskId, summary, true);
 	}
 	
 	@Override
@@ -46,4 +50,9 @@ public class MockRepositoryTask extends AbstractRepositoryTask {
 		}
 	}
 
+	@Override
+	public String toString() {
+		return super.getHandleIdentifier();
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java
index 3889dbfee..c09f255e5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Shell;
  */
 public abstract class RetrieveTitleFromUrlJob extends Job implements TitleListener {
 
-	public static final String LABEL_TITLE = "Retrieving description from URL";
+	public static final String LABEL_TITLE = "Retrieving summary from URL";
 
 	private final static long MAX_WAIT_TIME_MILLIS = 1000 * 10; // (10 Seconds)
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
index cf7b0d3e5..8c93d1299 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
@@ -218,7 +218,7 @@ public class TaskSelectionDialog extends SelectionStatusDialog {
 					return taskHistory.indexOf(t1) - taskHistory.indexOf(t2);
 				}
 
-				// Both are not in task history; sort by description...
+				// Both are not in task history; sort by summary...
 				return labelProvider.getText(e1).compareTo(labelProvider.getText(e2));
 			}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
index acb9230ce..3ae348d7f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java
@@ -63,7 +63,7 @@ public class CategoryEditorInput implements IEditorInput {
 
 	public void setCategoryName(String description) {
 		TasksUiPlugin.getTaskListManager().getTaskList().renameContainer(category, description);
-//		category.setDescription(description);
+//		category.setDescription(summary);
 	}
 	
 	public void setUrl(String url) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
index 18911a865..9cec89933 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
@@ -380,10 +380,10 @@ public class TaskPlanningEditor extends TaskFormPage {
 	// editorComposite.setLayout(new GridLayout());
 	// editorComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
 	// createContent(editorComposite, toolkit);
-	// if (description != null &&
-	// NewLocalTaskAction.DESCRIPTION_DEFAULT.equals(description.getText())) {
-	// description.setSelection(0);
-	// description.setFocus();
+	// if (summary != null &&
+	// NewLocalTaskAction.DESCRIPTION_DEFAULT.equals(summary.getText())) {
+	// summary.setSelection(0);
+	// summary.setFocus();
 	// }
 	// }
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
index 927430330..e93a5d2ef 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java
@@ -17,7 +17,7 @@ import org.eclipse.mylar.internal.tasks.ui.views.TaskKeyComparator;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 
 /**
- * Sorts search results by description.
+ * Sorts search results by summary.
  * 
  * @author Rob Elves
  */
@@ -27,8 +27,8 @@ public class SearchResultSorterDescription extends ViewerSorter {
 
 	/**
 	 * Returns a negative, zero, or positive number depending on whether the
-	 * first bug's description goes before, is the same as, or goes after the
-	 * second element's description.
+	 * first bug's summary goes before, is the same as, or goes after the
+	 * second element's summary.
 	 * <p>
 	 * 
 	 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
index 548e17b43..63a1639b2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java
@@ -278,24 +278,28 @@ public class TaskListWriter {
 				for (int i = 0; i < list.getLength(); i++) {
 					Node child = list.item(i);
 					try {
-						boolean wasRead = false;
 						if (!child.getNodeName().endsWith(DelegatingTaskExternalizer.KEY_CATEGORY)
 								&& !child.getNodeName().endsWith(DelegatingTaskExternalizer.KEY_QUERY)) {
-							for (ITaskListExternalizer externalizer : externalizers) {
-								if (!wasRead && externalizer.canReadTask(child)) {
-									externalizer.readTask(child, taskList, null, null);
-									wasRead = true;
-								}
-							}
-
-							if (!wasRead && delagatingExternalizer.canReadTask(child)) {
-								delagatingExternalizer.readTask(child, taskList, null, null);
-								wasRead = true;
-							}
-
-							if (!wasRead) {
+							
+							ITask task = delagatingExternalizer.readTask(child, taskList, null, null);
+							if (task == null) {
 								orphanedTaskNodes.add(child);
 							}
+							
+//							boolean wasRead = false;
+//							for (ITaskListExternalizer externalizer : externalizers) {
+//								if (!wasRead && externalizer.canReadTask(child)) {
+//									externalizer.createTask(child, taskList, null, null);
+//									wasRead = true;
+//								}
+//							}
+//							if (!wasRead && delagatingExternalizer.canReadTask(child)) {
+//								delagatingExternalizer.createTask(child, taskList, null, null);
+//								wasRead = true;
+//							}
+//							if (!wasRead) {
+//								orphanedTaskNodes.add(child);
+//							}
 						}
 					} catch (Exception e) {
 						// TODO: Save orphans here too?
@@ -322,6 +326,15 @@ public class TaskListWriter {
 										wasRead = true;
 										taskList.internalAddQuery(query);
 									}
+									NodeList queryChildren = child.getChildNodes();
+									for (int ii = 0; i < queryChildren.getLength(); ii++) {
+										Node queryNode = queryChildren.item(ii);
+										try {
+											delagatingExternalizer.readQueryHit((Element)queryNode, taskList, query);
+										} catch (TaskExternalizationException e) {
+											hasCaughtException = true;
+										}
+									}
 									break;
 								}
 							}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java
index d32f37178..ed5685fb5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java
@@ -87,7 +87,7 @@ public class NewAttachmentPage extends WizardPage {
 	protected NewAttachmentPage(LocalAttachment att) {
 		super("AttachmentDetails");
 		setTitle("Attachment Details");
-		setMessage("Provide a description and verify the content type of the attachment.");
+		setMessage("Provide a summary and verify the content type of the attachment.");
 		attachment = att;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
index f05757496..1d2d43b10 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
@@ -75,7 +75,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 
 	private static final String ERROR_CREATING_BUG_REPORT = "Error creating bug report";
 
-	private static final String NO_STACK_MESSAGE = "Unable to locate a stack trace in the description text.\nDuplicate search currently only supports stack trace matching.";
+	private static final String NO_STACK_MESSAGE = "Unable to locate a stack trace in the summary text.\nDuplicate search currently only supports stack trace matching.";
 
 	protected Button searchForDuplicates;
 
@@ -302,7 +302,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 	}
 
 	/**
-	 * A listener for selection of the description textbox.
+	 * A listener for selection of the summary textbox.
 	 */
 	protected class DescriptionListener implements Listener {
 		public void handleEvent(Event event) {
@@ -460,7 +460,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
 					MessageDialog.openInformation(AbstractNewRepositoryTaskEditor.this.getSite().getShell(),
-							ERROR_CREATING_BUG_REPORT, "A description must be provided with new reports.");
+							ERROR_CREATING_BUG_REPORT, "A summary must be provided with new reports.");
 					descriptionTextViewer.getTextWidget().setFocus();
 					submitButton.setEnabled(true);
 					showBusy(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index 87e3b0ac7..5b528ef5a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -1620,7 +1620,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 	}
 
 	/**
-	 * A listener for selection of the description field.
+	 * A listener for selection of the summary field.
 	 */
 	protected class DescriptionListener implements Listener {
 		public void handleEvent(Event event) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java
index 453850a99..261e88cde 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java
@@ -236,7 +236,7 @@ public class RepositoryTaskOutlineNode implements IRepositoryTaskSelection {
 		RepositoryTaskOutlineNode comments = null;
 		for (Iterator<TaskComment> iter = bug.getComments().iterator(); iter.hasNext();) {
 			TaskComment taskComment = iter.next();
-			// first comment is the bug description
+			// first comment is the bug summary
 			if(taskComment.getNumber() == 0) continue;
 			if (comments == null) {
 				comments = new RepositoryTaskOutlineNode(bugId, bugServer, LABEL_COMMENTS, taskComment, bug
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java
index 518eacf03..b2c6c2225 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java
@@ -197,7 +197,7 @@ public class Trac09Client extends AbstractTracClient {
 							}
 						}
 					}
-					// TODO parse description
+					// TODO parse summary
 				}
 			}
 
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java
index 7bbb0edf0..93d77d0fc 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java
@@ -364,7 +364,7 @@ public class TracXmlRpcClient extends AbstractTracClient {
 	private TracComponent parseComponent(Map<?, ?> result) {
 		TracComponent component = new TracComponent((String) result.get("name"));
 		component.setOwner((String) result.get("owner"));
-		component.setDescription((String) result.get("description"));
+		component.setDescription((String) result.get("summary"));
 		return component;
 	}
 
@@ -372,14 +372,14 @@ public class TracXmlRpcClient extends AbstractTracClient {
 		TracMilestone milestone = new TracMilestone((String) result.get("name"));
 		milestone.setCompleted(TracUtils.parseDate((Integer) result.get("completed")));
 		milestone.setDue(TracUtils.parseDate((Integer) result.get("due")));
-		milestone.setDescription((String) result.get("description"));
+		milestone.setDescription((String) result.get("summary"));
 		return milestone;
 	}
 
 	private TracVersion parseVersion(Map<?, ?> result) {
 		TracVersion version = new TracVersion((String) result.get("name"));
 		version.setTime(TracUtils.parseDate((Integer) result.get("time")));
-		version.setDescription((String) result.get("description"));
+		version.setDescription((String) result.get("summary"));
 		return version;
 	}
 
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java
index 80e3adaa1..c291c5cfe 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java
@@ -33,7 +33,7 @@ public class TracTicket {
 	 * @author Steffen Pingel
 	 */
 	public enum Key {
-		CC("cc"), CHANGE_TIME("changetime"), COMPONENT("component"), DESCRIPTION("description"), ID("id"), KEYWORDS(
+		CC("cc"), CHANGE_TIME("changetime"), COMPONENT("component"), DESCRIPTION("summary"), ID("id"), KEYWORDS(
 				"keywords"), MILESTONE("milestone"), OWNER("owner"), PRIORITY("priority"), REPORTER("reporter"), RESOLUTION(
 				"resolution"), STATUS("status"), SEVERITY("severity"), SUMMARY("summary"), TIME("time"), TYPE("type"), VERSION(
 				"version");
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
index 8838bb48e..d8bb93ea0 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
@@ -75,7 +75,7 @@ public class RepositorySearchQueryTest extends TestCase {
 
 		TracSearch search = new TracSearch();
 		String queryUrl = repository.getUrl() + ITracClient.QUERY_URL + search.toUrl();
-		TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "description", null);
+		TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "summary", null);
 
 		SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager()
 				.getTaskList(), repository, query) {
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
index 38a8437dc..b6dd49f3e 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
@@ -124,7 +124,7 @@ public class TracAttachmentHandlerTest extends TestCase {
 		} finally {
 			out.close();
 		}
-		attachmentHandler.uploadAttachment(repository, task, "comment", "description", file, "", false);
+		attachmentHandler.uploadAttachment(repository, task, "comment", "summary", file, "", false);
 
 		ITracClient client = connector.getClientManager().getRepository(repository);
 		byte[] result = client.getAttachmentData(data.attachmentTicketId, file.getName());
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java
index 2ee96735d..444ce3e6f 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java
@@ -25,7 +25,7 @@ public class TracQueryHitTest extends TestCase {
 
 	public void testAttributes() {
 		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
-		TracQueryHit hit = new TracQueryHit(taskList, "url", "description", "123");
+		TracQueryHit hit = new TracQueryHit(taskList, "url", "summary", "123");
 		hit.setPriority("P1");
 		hit.setCompleted(true);
 		
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java
index a17f63605..75da280ed 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java
@@ -24,7 +24,7 @@ public class TracQueryTest extends TestCase {
 
 	private TracRepositoryQuery createQuery(String parameter) {
 		String url = "http://oss.steffenpingel.de/mylar-trac-connector";
-		return new TracRepositoryQuery(url, url + ITracClient.QUERY_URL + parameter, "description", null);
+		return new TracRepositoryQuery(url, url + ITracClient.QUERY_URL + parameter, "summary", null);
 	}
 		
 	public void testGetTracSearch() {
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index c39cc7c1f..328e8ae78 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -189,7 +189,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 		search.setOrderBy("id");
 
 		String queryUrl = url + ITracClient.QUERY_URL + search.toUrl();
-		TracRepositoryQuery query = new TracRepositoryQuery(url, queryUrl, "description", tasklist);
+		TracRepositoryQuery query = new TracRepositoryQuery(url, queryUrl, "summary", tasklist);
 
 		//MultiStatus queryStatus = new MultiStatus(TracUiPlugin.PLUGIN_ID, IStatus.OK, "Query result", null);
 		final List<AbstractQueryHit> result = new ArrayList<AbstractQueryHit>();
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java
index 0bad6ef83..4b394b3ee 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java
@@ -40,7 +40,7 @@ public class TracRepositoryQueryTest extends TestCase {
 
 		TracSearch search = new TracSearch();
 		String queryUrl = repository.getUrl() + ITracClient.QUERY_URL + search.toUrl();
-		TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "description", TasksUiPlugin.getTaskListManager().getTaskList());
+		TracRepositoryQuery query = new TracRepositoryQuery(repository.getUrl(), queryUrl, "summary", TasksUiPlugin.getTaskListManager().getTaskList());
 		TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query);
 
 		TracTask task = new TracTask(Constants.TEST_TRAC_096_URL, ""+123, "desc", true);
@@ -60,7 +60,7 @@ public class TracRepositoryQueryTest extends TestCase {
 		String repositoryUrl = "https://foo.bar/repo";
 		String parameterUrl = "&status=new&status=assigned&status=reopened&milestone=0.1";
 		String queryUrl = repositoryUrl + ITracClient.QUERY_URL + parameterUrl;
-		TracRepositoryQuery query = new TracRepositoryQuery(repositoryUrl, queryUrl, "description", TasksUiPlugin.getTaskListManager().getTaskList());
+		TracRepositoryQuery query = new TracRepositoryQuery(repositoryUrl, queryUrl, "summary", TasksUiPlugin.getTaskListManager().getTaskList());
 
 		TracSearch filterList = query.getTracSearch();
 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
index 61c5891e1..0f095b96e 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
@@ -194,7 +194,7 @@ public class TracXmlRpcTest extends TestCase {
 		int completed = (int) (System.currentTimeMillis() / 1000);
 
 		Map<String, Object> attributes = new Hashtable<String, Object>();
-		attributes.put("description", "description");
+		attributes.put("summary", "summary");
 		attributes.put("due", due);
 		attributes.put("completed", completed);
 
@@ -239,10 +239,10 @@ public class TracXmlRpcTest extends TestCase {
 		Map<String, Object> attributes = new Hashtable<String, Object>();
 		attributes.put("type", "task");
 		attributes.put("status", "closed");
-		int id = createTicket("summary", "description", attributes);
+		int id = createTicket("summary", "summary", attributes);
 
 		attributes.put("summary", "summary");
-		attributes.put("description", "description");
+		attributes.put("summary", "summary");
 
 		Object[] ticket = (Object[]) call("ticket.get", id);
 		assertTicketHasAttributes(attributes, id, ticket);
@@ -268,20 +268,20 @@ public class TracXmlRpcTest extends TestCase {
 		int id = createTicket("summaryäÖÜ", "ßßß", attributes);
 
 		attributes.put("summary", "summaryäÖÜ");
-		attributes.put("description", "ßßß");
+		attributes.put("summary", "ßßß");
 
 		Object[] ticket = (Object[]) call("ticket.get", id);
 		assertTicketHasAttributes(attributes, id, ticket);
 	}
 
 	public void testUpdateTicket() throws XmlRpcException, IOException {
-		int id = createTicket("summary", "description", new Hashtable<String, Object>());
+		int id = createTicket("summary", "summary", new Hashtable<String, Object>());
 
 		Map<String, Object> attributes = new Hashtable<String, Object>();
 		attributes.put("summary", "changed");
 		call("ticket.update", id, "my comment", attributes);
 
-		attributes.put("description", "description");
+		attributes.put("summary", "summary");
 
 		Object[] ticket = (Object[]) call("ticket.get", id);
 		Map<?, ?> values = (Map<?, ?>) ticket[3];
@@ -293,7 +293,7 @@ public class TracXmlRpcTest extends TestCase {
 	public void testTicketCustomFields() throws XmlRpcException, IOException {
 		Map<String, Object> attributes = new Hashtable<String, Object>();
 		attributes.put("custom_text_field", "myvalue");
-		int id = createTicket("summary", "description", attributes);
+		int id = createTicket("summary", "summary", attributes);
 
 		// check for default values
 		attributes.put("custom_checkbox_field", "1");
@@ -317,7 +317,7 @@ public class TracXmlRpcTest extends TestCase {
 	}
 
 	public void testGetChangeLog() throws XmlRpcException, IOException {
-		int id = createTicket("summary", "description", new Hashtable<String, Object>());
+		int id = createTicket("summary", "summary", new Hashtable<String, Object>());
 
 		Map<String, Object> attributes = new Hashtable<String, Object>();
 		attributes.put("summary", "changed");
@@ -344,20 +344,20 @@ public class TracXmlRpcTest extends TestCase {
 		Object[] ticket = (Object[]) ((Object[]) ret[0])[0];
 		Map<String, Object> attributes = new Hashtable<String, Object>();
 		attributes.put("summary", "summary1");
-		attributes.put("description", "description1");
+		attributes.put("summary", "description1");
 		assertTicketHasAttributes(attributes, id1, ticket);
 
 		ticket = (Object[]) ((Object[]) ret[1])[0];
 		attributes.clear();
 		attributes.put("summary", "summary2");
-		attributes.put("description", "description2");
+		attributes.put("summary", "description2");
 		assertTicketHasAttributes(attributes, id2, ticket);
 	}
 
 	public void testAttachment() throws XmlRpcException, IOException {
-		int id = createTicket("summary", "description", new Hashtable<String, Object>());
+		int id = createTicket("summary", "summary", new Hashtable<String, Object>());
 
-		String filename = (String) call("ticket.putAttachment", id, "attach.txt", "description", "data".getBytes(),
+		String filename = (String) call("ticket.putAttachment", id, "attach.txt", "summary", "data".getBytes(),
 				true);
 		// the returned filename may differ, since another ticket may have an
 		// attachment named "attach.txt"
@@ -367,7 +367,7 @@ public class TracXmlRpcTest extends TestCase {
 		assertEquals(1, ret.length);
 		Object[] attachment = (Object[]) ret[0];
 		assertEquals("attach.txt", attachment[0]);
-		assertEquals("description", attachment[1]);
+		assertEquals("summary", attachment[1]);
 		assertEquals(4, attachment[2]);
 		// date
 		assertEquals(username, attachment[4]);
@@ -393,7 +393,7 @@ public class TracXmlRpcTest extends TestCase {
 		data = new String(bytes);
 		assertEquals("newdata", data);
 
-		String filename3 = (String) call("ticket.putAttachment", id, "attach.txt", "description", "data".getBytes(),
+		String filename3 = (String) call("ticket.putAttachment", id, "attach.txt", "summary", "data".getBytes(),
 				false);
 		assertFalse("attach.txt".equals(filename3));
 		ret = (Object[]) call("ticket.listAttachments", id);
@@ -401,9 +401,9 @@ public class TracXmlRpcTest extends TestCase {
 	}
 
 	public void testDeleteAttachment() throws XmlRpcException, IOException {
-		int id = createTicket("summary", "description", new Hashtable<String, Object>());
+		int id = createTicket("summary", "summary", new Hashtable<String, Object>());
 
-		String filename = (String) call("ticket.putAttachment", id, "attach.txt", "description", "data".getBytes(),
+		String filename = (String) call("ticket.putAttachment", id, "attach.txt", "summary", "data".getBytes(),
 				true);
 
 		Object[] ret = (Object[]) call("ticket.listAttachments", id);
@@ -416,12 +416,12 @@ public class TracXmlRpcTest extends TestCase {
 	}
 
 	public void testDuplicateAttachment() throws XmlRpcException, IOException {
-		int id1 = createTicket("summary", "description", new Hashtable<String, Object>());
-		int id2 = createTicket("summary", "description", new Hashtable<String, Object>());
+		int id1 = createTicket("summary", "summary", new Hashtable<String, Object>());
+		int id2 = createTicket("summary", "summary", new Hashtable<String, Object>());
 
-		String filename1 = (String) call("ticket.putAttachment", id1, "attach.txt", "description", "data".getBytes(),
+		String filename1 = (String) call("ticket.putAttachment", id1, "attach.txt", "summary", "data".getBytes(),
 				true);
-		String filename2 = (String) call("ticket.putAttachment", id2, "attach.txt", "description", "data2".getBytes(),
+		String filename2 = (String) call("ticket.putAttachment", id2, "attach.txt", "summary", "data2".getBytes(),
 				true);
 		assertEquals("attach.txt", filename1);
 		assertEquals(filename1, filename2);
@@ -441,8 +441,8 @@ public class TracXmlRpcTest extends TestCase {
 			call("ticket.delete", (Integer) id);
 		}
 
-		int id1 = createTicket("foobarsum1", "description", new Hashtable<String, Object>());
-		int id2 = createTicket("foobaz sum2", "description", new Hashtable<String, Object>());
+		int id1 = createTicket("foobarsum1", "summary", new Hashtable<String, Object>());
+		int id2 = createTicket("foobaz sum2", "summary", new Hashtable<String, Object>());
 		int id3 = createTicket("foobarbaz3", "foobarbaz description3", new Hashtable<String, Object>());
 
 		ret = (Object[]) call("ticket.query", "summary=foobarsum1|foobaz sum2");
@@ -458,13 +458,13 @@ public class TracXmlRpcTest extends TestCase {
 		ret = (Object[]) call("ticket.query", "summary~=bar|baz");
 		assertEquals(3, ret.length);
 
-		ret = (Object[]) call("ticket.query", "description~=foobarbaz description3");
+		ret = (Object[]) call("ticket.query", "summary~=foobarbaz description3");
 		assertEquals(1, ret.length);
 		assertEquals(id3, ret[0]);
 	}
 
 	public void testQueryAll() throws XmlRpcException, IOException {
-		int id = createTicket("foo", "description", new Hashtable<String, Object>());
+		int id = createTicket("foo", "summary", new Hashtable<String, Object>());
 
 		Object[] ret = (Object[]) call("ticket.query", "order=id");
 		assertTrue(ret.length > 0);
@@ -492,15 +492,15 @@ public class TracXmlRpcTest extends TestCase {
 	}
 
 	public void testVersions() throws XmlRpcException, IOException {
-		internalTestComponent("ticket.version", "time", Integer.class, "description", String.class);
+		internalTestComponent("ticket.version", "time", Integer.class, "summary", String.class);
 	}
 
 	public void testComponents() throws XmlRpcException, IOException {
-		internalTestComponent("ticket.component", "owner", String.class, "description", String.class);
+		internalTestComponent("ticket.component", "owner", String.class, "summary", String.class);
 	}
 
 	public void testMilestones() throws XmlRpcException, IOException {
-		internalTestComponent("ticket.milestone", "due", Integer.class, "completed", Integer.class, "description",
+		internalTestComponent("ticket.milestone", "due", Integer.class, "completed", Integer.class, "summary",
 				String.class);
 	}
 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/XmlRpcServer.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/XmlRpcServer.java
index 02ae9ac9e..f3d65e60c 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/XmlRpcServer.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/XmlRpcServer.java
@@ -340,11 +340,11 @@ public class XmlRpcServer {
 	}
 
 	public ModelEnum ticketComponent(String id) throws Exception {
-		return new ModelEnum("ticket.component", id, "owner", "description");
+		return new ModelEnum("ticket.component", id, "owner", "summary");
 	}
 
 	public ModelEnum ticketMilestone(String id) throws Exception {
-		return new ModelEnum("ticket.milestone", id, "due", "completed", "description");
+		return new ModelEnum("ticket.milestone", id, "due", "completed", "summary");
 	}
 
 	public TicketEnum ticketPriority(String id) throws Exception {
@@ -364,7 +364,7 @@ public class XmlRpcServer {
 	}
 
 	public ModelEnum ticketVersion(String id) throws Exception {
-		return new ModelEnum("ticket.version", id, "time", "description");
+		return new ModelEnum("ticket.version", id, "time", "summary");
 	}
 
 }
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
index b63273942..980bc474c 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
@@ -26,10 +26,10 @@ import org.eclipse.mylar.tasks.core.TaskList;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * @author Steffen Pingel
+ * @author Mik Kersten
  */
 public class TracTaskExternalizer extends DelegatingTaskExternalizer {
 
@@ -68,28 +68,9 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
 	}
 
 	@Override
-	public ITask readTask(Node node, TaskList taskList, AbstractTaskContainer category, ITask parent)
+	public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskContainer category, ITask parent)
 			throws TaskExternalizationException {
-
-		Element element = (Element) node;
-//		String handle;
-//		String label;
-//		if (element.hasAttribute(KEY_HANDLE)) {
-//			handle = element.getAttribute(KEY_HANDLE);
-//		} else {
-//			throw new TaskExternalizationException("Handle not stored for task");
-//		}
-//		if (element.hasAttribute(KEY_LABEL)) {
-//			label = element.getAttribute(KEY_LABEL);
-//		} else {
-//			throw new TaskExternalizationException("Description not stored for task");
-//		}
-//
-//		String repositoryUrl = RepositoryTaskHandleUtil.getRepositoryUrl(handle);
-//		String id = RepositoryTaskHandleUtil.getTaskId(handle);
-		
-		TracTask task = new TracTask(null, null, null, false);
-		readTaskInfo(task, taskList, element, parent, category);
+		TracTask task = new TracTask(repositoryUrl, taskId, summary, false);
 		return task;
 	}
 
@@ -178,34 +159,13 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
 			throw new TaskExternalizationException("Description not stored for task");
 		}
 
-		TracRepositoryQuery query = new TracRepositoryQuery(repositoryUrl, queryUrl, label, taskList);
-
-		NodeList list = node.getChildNodes();
-		for (int i = 0; i < list.getLength(); i++) {
-			Node child = list.item(i);
-			try {
-				readQueryHit(child, taskList, query);
-			} catch (TaskExternalizationException e) {
-				MylarStatusHandler.log(e, e.getMessage());
-			}
-		}
-		return query;
+		return new TracRepositoryQuery(repositoryUrl, queryUrl, label, taskList);
 	}
 
 	@Override
-	public void readQueryHit(Node node, TaskList taskList, AbstractRepositoryQuery query)
+	public AbstractQueryHit createQueryHit(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractRepositoryQuery query)
 			throws TaskExternalizationException {
-		Element element = (Element) node;
-		
-		TracQueryHit hit = new TracQueryHit(taskList, null, "", null);
-		// TODO move to DelegationTaskExternalizer
-		if (element.hasAttribute(KEY_COMPLETE)
-				&& element.getAttribute(KEY_COMPLETE).compareTo(VAL_TRUE) == 0) {
-			hit.setCompleted(true);
-		} else {
-			hit.setCompleted(false);
-		}
-		readQueryHitInfo(hit, taskList, query, element);
+		return new TracQueryHit(taskList, repositoryUrl, summary, taskId);
 	}
 
 }
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
index d4b55a425..94b9c209b 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
@@ -29,7 +29,7 @@ public class NewTracTaskEditor extends AbstractNewRepositoryTaskEditor {
 
 	@Override
 	public SearchHitCollector getDuplicateSearchCollector(String searchString) {
-		TracSearchFilter filter = new TracSearchFilter("description");
+		TracSearchFilter filter = new TracSearchFilter("summary");
 		filter.setOperator(CompareOperator.CONTAINS);
 		filter.addValue(searchString);
 
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
index 55101e304..d5995d5ba 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
@@ -148,7 +148,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
 		summaryField = new TextSearchField("summary");
 		summaryField.createControls(control, "Summary");
 
-		descriptionField = new TextSearchField("description");
+		descriptionField = new TextSearchField("summary");
 		descriptionField.createControls(control, "Description");
 
 		keywordsField = new TextSearchField("keywords");