summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2011-12-17 05:51:36 (EST)
committer Steffen Pingel2011-12-17 05:51:36 (EST)
commita8a0a84be74cb5fca1155da28b8d0bcba08900fc (patch)
tree3ee04f758cf90e583cbd4748150d924d3f10c770
parentc9892dca0fdcff4ed63b9776ad6ac0433bb08340 (diff)
downloadorg.eclipse.mylyn.tasks-a8a0a84be74cb5fca1155da28b8d0bcba08900fc.zip
org.eclipse.mylyn.tasks-a8a0a84be74cb5fca1155da28b8d0bcba08900fc.tar.gz
org.eclipse.mylyn.tasks-a8a0a84be74cb5fca1155da28b8d0bcba08900fc.tar.bz2
NEW - bug 350385: [releng] rename bundles to reflect component structure
https://bugs.eclipse.org/bugs/show_bug.cgi?id=350385 Change-Id: Icd0fbf7574588ceba3951624fe56ba48dfbefda6
-rw-r--r--.gitignore4
-rw-r--r--org.eclipse.mylyn-feature/feature.xml49
-rw-r--r--org.eclipse.mylyn.bugzilla-feature/feature.xml1
-rw-r--r--org.eclipse.mylyn.tasks.tests/testdata/FeedReaderTest/update1.xml41
-rw-r--r--org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/UserAttributeEditor.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java2
-rw-r--r--org.eclipse.mylyn.test-feature/feature.xml116
-rw-r--r--org.eclipse.mylyn.trac-feature/feature.xml2
11 files changed, 21 insertions, 216 deletions
diff --git a/.gitignore b/.gitignore
index fe30253..789e1f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/org.eclipse*/bin
-/org.eclipse*/target
+bin/
+target/
*.rej
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index f227c6b..11d393f 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -33,57 +33,20 @@
</url>
<requires>
- <import plugin="org.eclipse.mylyn" version="3.7.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.core" version="3.7.0" match="compatible"/>
<import plugin="org.eclipse.mylyn.commons.net" version="3.7.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.identity" version="0.9.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.repositories" version="0.9.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.team" version="0.9.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.ui" version="3.7.0.I20110906" match="compatible"/>
<import plugin="org.apache.commons.codec" version="1.3.0" match="compatible"/>
<import plugin="org.apache.commons.lang" version="2.3.0" match="compatible"/>
<import plugin="org.apache.commons.logging" version="1.0.4" match="compatible"/>
<import plugin="org.apache.commons.httpclient" version="3.1.0" match="compatible"/>
+
+ <import feature="org.eclipse.mylyn.discovery" version="3.7.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.monitor" version="3.7.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons" version="3.7.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.identity" version="0.9.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.repositories" version="0.9.0" match="compatible"/>
<import feature="org.eclipse.mylyn.commons.notifications" version="0.9.0" match="compatible"/>
</requires>
-<!--
- <plugin
- id="org.eclipse.mylyn"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
--->
-
- <plugin
- id="org.eclipse.mylyn.discovery.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.discovery.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.monitor.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.monitor.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.mylyn.tasks.core"
download-size="0"
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 9bcea3b..8227768 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -35,6 +35,7 @@
<import plugin="org.apache.ws.commons.util" version="1.0.1" match="compatible"/>
<import plugin="javax.xml.bind" version="2.0.0" match="compatible"/>
<import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
+
<import feature="org.eclipse.mylyn_feature" version="3.7.0" match="equivalent"/>
</requires>
diff --git a/org.eclipse.mylyn.tasks.tests/testdata/FeedReaderTest/update1.xml b/org.eclipse.mylyn.tasks.tests/testdata/FeedReaderTest/update1.xml
deleted file mode 100644
index 47fbb4a..0000000
--- a/org.eclipse.mylyn.tasks.tests/testdata/FeedReaderTest/update1.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- >
-<channel>
-<title>Mylyn Updates</title>
-<link>http://eclipse.org/mylyn</link>
-<description>Mylyn Updates</description>
-<lastBuildDate>Fri, 27 May 2011 17:33:37 +0000</lastBuildDate>
-<language>en</language>
-<item>
-<title>Mylyn 3.6 is now available</title>
-<link>http://eclipse.org/mylyn/new/</link>
-<pubDate>Thu, 24 Mar 2011 14:00:07 +0000</pubDate>
-<dc:creator>Steffen Pingel</dc:creator>
-<dc:subject>runtimeVersion=1.5.0</dc:subject>
-<dc:subject>requires=org.eclipse.mylyn</dc:subject>
-<category>Mylyn</category>
-<guid isPermaLink="false">20110527-0000</guid>
-<description>Mylyn 3.7 is now available. &lt;a href="http://eclipse.org/mylyn/new/"&gt;See New and Noteworthy&lt;/a&gt; for details.</description>
-</item>
-<item>
-<title>New Connectors</title>
-<link>http://eclipse.org/mylyn/new/</link>
-<pubDate>Fri, 27 May 2011 12:00:00 +0000</pubDate>
-<dc:creator>Steffen Pingel</dc:creator>
-<dc:subject>frameworkVersion=[0.0.0,3.7.0)</dc:subject>
-<guid isPermaLink="false">20110527-0001</guid>
-<description>New connectors are now available. &lt;a href="#discovery"&gt;Show connectors&lt;/a&gt;.</description>
-</item>
-<item>
-<title>Filtered Item</title>
-<link>http://eclipse.org/mylyn/new/</link>
-<pubDate>Fri, 27 May 2011 12:00:00 +0000</pubDate>
-<dc:creator>Steffen Pingel</dc:creator>
-<dc:subject>frameworkVersion=[1.0.0,2.0.0)</dc:subject>
-<guid isPermaLink="false">20110527-0002</guid>
-<description>Specifies an unsatisfiable framework version.</description>
-</item>
-</channel>
-</rss>
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index 03ae49d..8d9118a 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -18,15 +18,15 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.navigator;resolution:=optional,
org.eclipse.ui.views,
org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy,
- org.eclipse.mylyn.commons.repositories;bundle-version="0.1.0",
- org.eclipse.mylyn.commons.identity;bundle-version="0.8.0",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.identity.core,
org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.notifications.core,
org.eclipse.mylyn.commons.notifications.feed,
org.eclipse.mylyn.commons.notifications.ui,
- org.eclipse.mylyn.commons.repositories;bundle-version="0.1.0",
+ org.eclipse.mylyn.commons.repositories.core,
+ org.eclipse.mylyn.commons.repositories.ui,
org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.workbench;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 70bb444..d39a2c3 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -2009,7 +2009,7 @@
</navigatorContent>
</extension>
<extension
- point="org.eclipse.mylyn.commons.team.newWizards">
+ point="org.eclipse.mylyn.commons.repositories.ui.newWizards">
<category
id="org.eclipse.mylyn.tasks.ui.category.Tasks"
name="Tasks">
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 8278bb2..1fe3eda 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -58,8 +58,8 @@ import org.eclipse.mylyn.commons.notifications.ui.AbstractUiNotification;
import org.eclipse.mylyn.commons.ui.compatibility.CommonColors;
import org.eclipse.mylyn.commons.ui.compatibility.CommonFonts;
import org.eclipse.mylyn.commons.workbench.TaskBarManager;
-import org.eclipse.mylyn.internal.commons.identity.IdentityModel;
-import org.eclipse.mylyn.internal.commons.identity.gravatar.GravatarConnector;
+import org.eclipse.mylyn.internal.commons.identity.core.IdentityModel;
+import org.eclipse.mylyn.internal.commons.identity.core.gravatar.GravatarConnector;
import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
import org.eclipse.mylyn.internal.tasks.core.AbstractSearchHandler;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/UserAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/UserAttributeEditor.java
index acb41d3..26ebdaa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/UserAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/UserAttributeEditor.java
@@ -17,10 +17,10 @@ import java.io.ByteArrayInputStream;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.eclipse.mylyn.commons.identity.Account;
-import org.eclipse.mylyn.commons.identity.IIdentity;
-import org.eclipse.mylyn.commons.identity.IProfileImage;
-import org.eclipse.mylyn.commons.identity.spi.ProfileImage;
+import org.eclipse.mylyn.commons.identity.core.Account;
+import org.eclipse.mylyn.commons.identity.core.IIdentity;
+import org.eclipse.mylyn.commons.identity.core.IProfileImage;
+import org.eclipse.mylyn.commons.identity.core.spi.ProfileImage;
import org.eclipse.mylyn.commons.ui.CommonImages;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
index 48f9aad..4d93e1a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
@@ -59,7 +59,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.mylyn.commons.core.CoreUtil;
import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.commons.identity.Account;
+import org.eclipse.mylyn.commons.identity.core.Account;
import org.eclipse.mylyn.commons.ui.CommonImages;
import org.eclipse.mylyn.commons.ui.CommonUiUtil;
import org.eclipse.mylyn.commons.workbench.WorkbenchUtil;
diff --git a/org.eclipse.mylyn.test-feature/feature.xml b/org.eclipse.mylyn.test-feature/feature.xml
index adf7e51..c713e05 100644
--- a/org.eclipse.mylyn.test-feature/feature.xml
+++ b/org.eclipse.mylyn.test-feature/feature.xml
@@ -31,122 +31,6 @@
<import feature="org.eclipse.mylyn.sdk_feature" version="3.7.0"/>
</requires>
-<!--
- <plugin
- id="org.eclipse.mylyn.cdt.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.context.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.ide.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.java.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.resources.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.team.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.cdt.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.context.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.ide.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.java.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.resources.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.team.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
--->
-
-<!--
- <plugin
- id="org.eclipse.mylyn.commons.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.discovery.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.monitor.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.commons.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.discovery.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.mylyn.monitor.tests.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
--->
-
<plugin
id="org.eclipse.mylyn.bugzilla.tests"
download-size="0"
diff --git a/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.trac-feature/feature.xml
index 7b4ed42..361bff6 100644
--- a/org.eclipse.mylyn.trac-feature/feature.xml
+++ b/org.eclipse.mylyn.trac-feature/feature.xml
@@ -29,8 +29,6 @@
</license>
<requires>
- <import plugin="org.eclipse.mylyn.commons.net" version="3.7.0" match="compatible"/>
- <import plugin="org.eclipse.mylyn.commons.ui" version="3.7.0" match="compatible"/>
<import feature="org.eclipse.mylyn_feature" version="3.7.0" match="compatible"/>
</requires>