NEW - bug 225040: mark internal packages as x-internal

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

26 files changed, 111 insertions, 50 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/.classpath b/org.eclipse.mylyn.bugzilla.core/.classpath
index d12be34be..6fe19812c 100644
--- a/org.eclipse.mylyn.bugzilla.core/.classpath
+++ b/org.eclipse.mylyn.bugzilla.core/.classpath
@@ -3,8 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
-			<accessrule kind="discouraged" pattern="**/mylyn/**/internal/**"/>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
 			<accessrule kind="nonaccessible" pattern="**/System"/>
 		</accessrules>
 	</classpathentry>
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
index 5134e3845..76e589ea8 100644
--- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.core.runtime,
 Eclipse-AutoStart: true
 Bundle-Vendor: Eclipse.org
 Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.internal.bugzilla.core,
- org.eclipse.mylyn.internal.bugzilla.core.history
+Export-Package: org.eclipse.mylyn.internal.bugzilla.core;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui",
+ org.eclipse.mylyn.internal.bugzilla.core.history;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.bugzilla.tests/.classpath b/org.eclipse.mylyn.bugzilla.tests/.classpath
index 85a4bb4b4..c0275fa5b 100644
--- a/org.eclipse.mylyn.bugzilla.tests/.classpath
+++ b/org.eclipse.mylyn.bugzilla.tests/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<accessrules>
 			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
index 138516239..3b3d9162e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
@@ -27,5 +27,6 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-AutoStart: true
 Bundle-Vendor: Eclipse.org
 Bundle-ClassPath: bugzilla-test.jar
-Export-Package: org.eclipse.mylyn.bugzilla.tests
+Export-Package: org.eclipse.mylyn.bugzilla.tests,
+ org.eclipse.mylyn.bugzilla.tests.headless;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchDialogTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchDialogTest.java
index b7c742a27..fae4148ea 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchDialogTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchDialogTest.java
@@ -50,8 +50,8 @@ public class BugzillaSearchDialogTest extends TestCase {
 	 */
 	public void testSearchDialogInit() throws Exception {
 		TaskRepository repo = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
-				IBugzillaConstants.TEST_BUGZILLA_222_URL,
-				IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
+				IBugzillaConstants.TEST_BUGZILLA_222_URL);
+		repo.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
 		manager.addRepository(repo, TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		BugzillaSearchPage page = new BugzillaSearchPage(repo);
 		Shell shell = BugzillaTestPlugin.getDefault().getWorkbench().getDisplay().getShells()[0];
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 c501be6bf..7b7019cb2 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
@@ -65,8 +65,8 @@ public class BugzillaSearchEngineTest extends TestCase {
 
 	public void testSearching218() throws Exception {
 		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
-				IBugzillaConstants.TEST_BUGZILLA_218_URL,
-				IBugzillaConstants.BugzillaServerVersion.SERVER_218.toString());
+				IBugzillaConstants.TEST_BUGZILLA_218_URL);
+		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_218.toString());
 		TasksUiPlugin.getRepositoryManager().addRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		assertEquals(NUM_EXPECTED_HITS, runQuery(IBugzillaConstants.TEST_BUGZILLA_218_URL, SEARCH_DESCRIPTION).size());
@@ -74,8 +74,8 @@ public class BugzillaSearchEngineTest extends TestCase {
 
 	public void testSearching220() throws Exception {
 		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
-				IBugzillaConstants.TEST_BUGZILLA_220_URL,
-				IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
+				IBugzillaConstants.TEST_BUGZILLA_220_URL);
+		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
 		TasksUiPlugin.getRepositoryManager().addRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		assertEquals(NUM_EXPECTED_HITS, runQuery(IBugzillaConstants.TEST_BUGZILLA_220_URL, SEARCH_DESCRIPTION).size());
@@ -83,8 +83,8 @@ public class BugzillaSearchEngineTest extends TestCase {
 
 	public void testSearching2201() throws Exception {
 		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
-				IBugzillaConstants.TEST_BUGZILLA_2201_URL,
-				IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
+				IBugzillaConstants.TEST_BUGZILLA_2201_URL);
+		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
 		TasksUiPlugin.getRepositoryManager().addRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		assertEquals(NUM_EXPECTED_HITS, runQuery(IBugzillaConstants.TEST_BUGZILLA_2201_URL, SEARCH_DESCRIPTION).size());
@@ -92,8 +92,8 @@ public class BugzillaSearchEngineTest extends TestCase {
 
 	public void testSearching222() throws Exception {
 		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
-				IBugzillaConstants.TEST_BUGZILLA_222_URL,
-				IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
+				IBugzillaConstants.TEST_BUGZILLA_222_URL);
+		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
 		TasksUiPlugin.getRepositoryManager().addRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		Set<AbstractTask> hits = runQuery(IBugzillaConstants.TEST_BUGZILLA_222_URL, SEARCH_DESCRIPTION);
diff --git a/org.eclipse.mylyn.bugzilla.ui/.classpath b/org.eclipse.mylyn.bugzilla.ui/.classpath
index a01a39733..8dae74326 100644
--- a/org.eclipse.mylyn.bugzilla.ui/.classpath
+++ b/org.eclipse.mylyn.bugzilla.ui/.classpath
@@ -6,9 +6,6 @@
 			<accessrule kind="accessible" pattern="**/TasksUiImages"/>
 			<accessrule kind="accessible" pattern="**/TaskListColorsAndFonts"/>
 			<accessrule kind="accessible" pattern="**/TaskListPreferenceConstants"/>
-			<accessrule kind="accessible" pattern="**/mylyn/internal/bugzilla/**"/>
-			<accessrule kind="discouraged" pattern="**/mylyn/**/internal/**"/>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
index 3bafc598b..82976d25f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
@@ -22,10 +22,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-AutoStart: true
-Export-Package: org.eclipse.mylyn.internal.bugzilla.ui,
- org.eclipse.mylyn.internal.bugzilla.ui.editor,
- org.eclipse.mylyn.internal.bugzilla.ui.search,
- org.eclipse.mylyn.internal.bugzilla.ui.tasklist,
- org.eclipse.mylyn.internal.bugzilla.ui.wizard
+Export-Package: org.eclipse.mylyn.internal.bugzilla.ui;x-internal:=true,
+ org.eclipse.mylyn.internal.bugzilla.ui.editor;x-internal:=true,
+ org.eclipse.mylyn.internal.bugzilla.ui.search;x-internal:=true,
+ org.eclipse.mylyn.internal.bugzilla.ui.tasklist;x-internal:=true,
+ org.eclipse.mylyn.internal.bugzilla.ui.wizard;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
index 85f5b1ff0..b92608032 100644
--- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime
-Export-Package: org.eclipse.mylyn.internal.help.ui.actions,
- org.eclipse.mylyn.internal.help.ui.dialogs
+Export-Package: org.eclipse.mylyn.internal.help.ui.actions;x-internal:=true,
+ org.eclipse.mylyn.internal.help.ui.dialogs;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
index dd38bb75b..aa71673c5 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
@@ -58,6 +58,8 @@ public class UiLegendDialog extends PopupDialog {
 
 	private final IThemeManager themeManager = PlatformUI.getWorkbench().getThemeManager();
 
+	// TODO e3.4 move to new api
+	@SuppressWarnings("deprecation")
 	public UiLegendDialog(Shell parent) {
 		super(parent, PopupDialog.INFOPOPUP_SHELLSTYLE | SWT.ON_TOP, false, false, false, false, null, null);
 	}
diff --git a/org.eclipse.mylyn.tasks.core/.project b/org.eclipse.mylyn.tasks.core/.project
index d1d3e6eed..27ace4c3d 100644
--- a/org.eclipse.mylyn.tasks.core/.project
+++ b/org.eclipse.mylyn.tasks.core/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index c512025db..21bca44c1 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.net,
  org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.mylyn.internal.tasks.core,
+Export-Package: org.eclipse.mylyn.internal.tasks.core;x-internal:=true,
  org.eclipse.mylyn.tasks.core
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
index de0a8c85f..ec0c94caa 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
@@ -319,6 +319,8 @@ public class TaskRepository extends PlatformObject {
 		addAuthInfo(map);
 	}
 
+	// TODO e3.4 move to new api
+	@SuppressWarnings("deprecation")
 	public void flushAuthenticationCredentials() {
 		synchronized (LOCK) {
 			isCachedUserName = false;
@@ -349,6 +351,8 @@ public class TaskRepository extends PlatformObject {
 		}
 	}
 
+	// TODO e3.4 move to new api
+	@SuppressWarnings("deprecation")
 	private void addAuthInfo(Map<String, String> map) {
 		synchronized (LOCK) {
 			try {
@@ -371,7 +375,8 @@ public class TaskRepository extends PlatformObject {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
+	// TODO e3.4 move to new api
+	@SuppressWarnings( { "unchecked", "deprecation" })
 	private Map<String, String> getAuthInfo() {
 		synchronized (LOCK) {
 			if (Platform.isRunning()) {
diff --git a/org.eclipse.mylyn.tasks.tests/.classpath b/org.eclipse.mylyn.tasks.tests/.classpath
index c9c6503f7..77f8017a9 100644
--- a/org.eclipse.mylyn.tasks.tests/.classpath
+++ b/org.eclipse.mylyn.tasks.tests/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
 			<accessrule kind="accessible" pattern="**/internal/**"/>
 		</accessrules>
 	</classpathentry>
diff --git a/org.eclipse.mylyn.tasks.tests/.project b/org.eclipse.mylyn.tasks.tests/.project
index 63df12cbd..7098e8761 100644
--- a/org.eclipse.mylyn.tasks.tests/.project
+++ b/org.eclipse.mylyn.tasks.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
index b663e9826..c11dfda37 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
@@ -83,6 +83,8 @@ public class TaskRepositoryTest extends TestCase {
 		assertTrue(Platform.isRunning());
 	}
 
+	// TODO e3.4 move to new api 
+	@SuppressWarnings("deprecation")
 	public void password(AuthenticationType authType) throws Exception {
 		URL url = new URL("http://url");
 		TaskRepository taskRepository = new TaskRepository("kind", url.toString());
diff --git a/org.eclipse.mylyn.tasks.ui/.project b/org.eclipse.mylyn.tasks.ui/.project
index ca92196b2..4e9857c70 100644
--- a/org.eclipse.mylyn.tasks.ui/.project
+++ b/org.eclipse.mylyn.tasks.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.tasks.ui/.settings/.api_filters b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters
new file mode 100644
index 000000000..9edffa1e7
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.mylyn.tasks.ui" version="1">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter id="925892614" messageargs="2.3.1.v20080312-1300#3.0.0.qualifier"/>
+    </resource>
+    <resource path="src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java">
+        <filter id="1141899266" messageargs="3.0# 2.4"/>
+    </resource>
+</component>
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index 00d75205e..cc99f185d 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -25,20 +25,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-AutoStart: true
 Bundle-Vendor: Eclipse.org
-Export-Package: org.eclipse.mylyn.internal.tasks.ui,
- org.eclipse.mylyn.internal.tasks.ui.actions,
- org.eclipse.mylyn.internal.tasks.ui.commands,
- org.eclipse.mylyn.internal.tasks.ui.dialogs,
- org.eclipse.mylyn.internal.tasks.ui.editors,
- org.eclipse.mylyn.internal.tasks.ui.notifications,
- org.eclipse.mylyn.internal.tasks.ui.planner,
- org.eclipse.mylyn.internal.tasks.ui.preferences,
- org.eclipse.mylyn.internal.tasks.ui.properties,
- org.eclipse.mylyn.internal.tasks.ui.search,
- org.eclipse.mylyn.internal.tasks.ui.util,
- org.eclipse.mylyn.internal.tasks.ui.views,
- org.eclipse.mylyn.internal.tasks.ui.wizards,
- org.eclipse.mylyn.internal.tasks.ui.workingsets,
+Export-Package: org.eclipse.mylyn.internal.tasks.ui;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.actions;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.commands;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.dialogs;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.editors;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.notifications;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.planner;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.preferences;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.properties;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.search;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.util;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.views;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.wizards;x-internal:=true,
+ org.eclipse.mylyn.internal.tasks.ui.workingsets;x-internal:=true,
  org.eclipse.mylyn.tasks.ui,
  org.eclipse.mylyn.tasks.ui.editors,
  org.eclipse.mylyn.tasks.ui.search,
diff --git a/org.eclipse.mylyn.trac.core/.project b/org.eclipse.mylyn.trac.core/.project
index b83a495f8..831876dac 100644
--- a/org.eclipse.mylyn.trac.core/.project
+++ b/org.eclipse.mylyn.trac.core/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
index ff0984008..61ca1a26e 100644
--- a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)",
  org.apache.xmlrpc;bundle-version="3.0.0"
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.mylyn.internal.trac.core,
- org.eclipse.mylyn.internal.trac.core.model,
- org.eclipse.mylyn.internal.trac.core.util
+Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
+ org.eclipse.mylyn.internal.trac.core.model;x-friends:="org.eclipse.mylyn.trac.ui",
+ org.eclipse.mylyn.internal.trac.core.util;x-friends:="org.eclipse.mylyn.trac.ui"
 Bundle-Activator: org.eclipse.mylyn.internal.trac.core.TracCorePlugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.trac.tests/.classpath b/org.eclipse.mylyn.trac.tests/.classpath
index 304e86186..d7d62759f 100644
--- a/org.eclipse.mylyn.trac.tests/.classpath
+++ b/org.eclipse.mylyn.trac.tests/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.mylyn.trac.tests/.project b/org.eclipse.mylyn.trac.tests/.project
index 4241ae65f..1f3b6278e 100644
--- a/org.eclipse.mylyn.trac.tests/.project
+++ b/org.eclipse.mylyn.trac.tests/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index 11f10b086..aae2f6289 100644
--- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Require-Bundle: org.junit,
  org.eclipse.jface.text,
  org.eclipse.mylyn.web.core,
  org.apache.xmlrpc;bundle-version="3.0.0"
-Export-Package: org.eclipse.mylyn.trac.tests
+Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true,
+ org.eclipse.mylyn.trac.tests;x-internal:=true,
+ org.eclipse.mylyn.trac.tests.support;x-internal:=true
 Bundle-Activator: org.eclipse.mylyn.trac.tests.TracTestPlugin
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.trac.ui/.project b/org.eclipse.mylyn.trac.ui/.project
index fce887b43..6c9ffc283 100644
--- a/org.eclipse.mylyn.trac.ui/.project
+++ b/org.eclipse.mylyn.trac.ui/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
index 8b19cac06..0f6458ed3 100644
--- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.mylyn.web.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.mylyn.internal.trac.ui,
- org.eclipse.mylyn.internal.trac.ui.editor,
- org.eclipse.mylyn.internal.trac.ui.wizard
+Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true,
+ org.eclipse.mylyn.internal.trac.ui.editor;x-internal:=true,
+ org.eclipse.mylyn.internal.trac.ui.wizard;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5