summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Parker2012-10-31 16:12:57 (EDT)
committer Steffen Pingel2012-11-02 13:42:54 (EDT)
commit0abe270aeaec36bf0fd215c9e8b9561634021709 (patch)
tree5c75f8373cc801a0fe676ca1ff49cc7e2c9d908a
parent163b166daaade691f71a77290d9d379a019f55ed (diff)
downloadorg.eclipse.mylyn.reviews-0abe270aeaec36bf0fd215c9e8b9561634021709.zip
org.eclipse.mylyn.reviews-0abe270aeaec36bf0fd215c9e8b9561634021709.tar.gz
org.eclipse.mylyn.reviews-0abe270aeaec36bf0fd215c9e8b9561634021709.tar.bz2
324327: Manifest changes (Needed for R4E and other generic consumers)refs/changes/61/8461/5
•Reviews core exposes core model to r4e core and ui •Reviews core exposes internals to R4E core model. (Dependencies are unavoidable for EMF generated implementations.) •Update dependencies to Mylyn 3.9 https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327 Change-Id: I90b7299cdc3706760c960e1e482bbe81603e817c
-rw-r--r--org.eclipse.mylyn.gerrit.core/.classpath6
-rw-r--r--org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java4
-rw-r--r--org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java4
-rw-r--r--org.eclipse.mylyn.gerrit.ui/.classpath6
-rw-r--r--org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF6
5 files changed, 17 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.gerrit.core/.classpath b/org.eclipse.mylyn.gerrit.core/.classpath
index ad32c83..c29247a 100644
--- a/org.eclipse.mylyn.gerrit.core/.classpath
+++ b/org.eclipse.mylyn.gerrit.core/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <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/reviews/core/model/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
index f5a19ce..dce339e 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
@@ -34,9 +34,9 @@ import org.eclipse.mylyn.reviews.core.model.ILineRange;
import org.eclipse.mylyn.reviews.core.model.IReview;
import org.eclipse.mylyn.reviews.core.model.IReviewItem;
import org.eclipse.mylyn.reviews.core.model.IReviewItemSet;
+import org.eclipse.mylyn.reviews.core.model.IReviewsFactory;
import org.eclipse.mylyn.reviews.core.model.ITopic;
import org.eclipse.mylyn.reviews.core.model.IUser;
-import org.eclipse.mylyn.reviews.internal.core.model.ReviewsFactory;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskData;
@@ -64,7 +64,7 @@ import com.google.gerrit.reviewdb.UserIdentity;
*/
public class GerritUtil {
- private static final ReviewsFactory FACTORY = ReviewsFactory.eINSTANCE;
+ private static final IReviewsFactory FACTORY = IReviewsFactory.INSTANCE;
public static GerritChange getChange(TaskData taskData) {
JSonSupport json = new JSonSupport();
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
index bfd416c..e61c75b 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
@@ -44,9 +44,9 @@ import org.eclipse.mylyn.reviews.core.model.IComment;
import org.eclipse.mylyn.reviews.core.model.IFileRevision;
import org.eclipse.mylyn.reviews.core.model.ILineLocation;
import org.eclipse.mylyn.reviews.core.model.ILineRange;
+import org.eclipse.mylyn.reviews.core.model.IReviewsFactory;
import org.eclipse.mylyn.reviews.core.model.ITopic;
import org.eclipse.mylyn.reviews.core.model.IUser;
-import org.eclipse.mylyn.reviews.internal.core.model.ReviewsFactory;
import org.eclipse.osgi.util.NLS;
import com.google.gerrit.common.data.AccountDashboardInfo;
@@ -87,7 +87,7 @@ import com.google.gwtjsonrpc.client.VoidResult;
*/
public class GerritClient {
- private static final ReviewsFactory FACTORY = ReviewsFactory.eINSTANCE;
+ private static final IReviewsFactory FACTORY = IReviewsFactory.INSTANCE;
private abstract class Operation<T> implements AsyncCallback<T> {
diff --git a/org.eclipse.mylyn.gerrit.ui/.classpath b/org.eclipse.mylyn.gerrit.ui/.classpath
index ad32c83..c29247a 100644
--- a/org.eclipse.mylyn.gerrit.ui/.classpath
+++ b/org.eclipse.mylyn.gerrit.ui/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <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/reviews/core/model/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
index 6ae8d45..91e53aa 100644
--- a/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: Mylyn Reviews
Bundle-SymbolicName: org.eclipse.mylyn.reviews.core;singleton:=true
Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
- org.eclipse.mylyn.tasks.core;bundle-version="3.8.0",
+ org.eclipse.mylyn.commons.core;bundle-version="3.9.0",
+ org.eclipse.mylyn.tasks.core;bundle-version="3.9.0",
org.eclipse.emf.common;bundle-version="2.5.0",
org.eclipse.emf.ecore;bundle-version="2.5.0",
org.eclipse.emf.ecore.xmi;bundle-version="2.5.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.reviews.core.model;x-friends:="org.eclipse.mylyn.gerrit.core,org.eclipse.mylyn.gerrit.ui,org.eclipse.mylyn.reviews.ui",
+Export-Package: org.eclipse.mylyn.reviews.core.model;x-friends:="org.eclipse.mylyn.reviews.ui",
org.eclipse.mylyn.reviews.internal.core.model;x-internal:=true
Bundle-Vendor: Eclipse Mylyn