add Papyrus back to main build
Change-Id: Ibfef318f798d0b78de01b03d5796bfc4a2947406
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=388149
diff --git a/org.eclipse.mylyn.mft-site/pom.xml b/org.eclipse.mylyn.mft-site/pom.xml
index 4f13db3..9422af7 100644
--- a/org.eclipse.mylyn.mft-site/pom.xml
+++ b/org.eclipse.mylyn.mft-site/pom.xml
@@ -15,6 +15,7 @@
<properties>
<qualifier>${project.unqualifiedVersion}</qualifier>
<sign-dir>tools/mylyn/hudson/mft/signing</sign-dir>
+ <platform-repository-url>${papyrus-repository-url}</platform-repository-url>
</properties>
<profiles>
<profile>
diff --git a/org.eclipse.mylyn.mft-site/site.xml b/org.eclipse.mylyn.mft-site/site.xml
index 3029564..95c217a 100644
--- a/org.eclipse.mylyn.mft-site/site.xml
+++ b/org.eclipse.mylyn.mft-site/site.xml
@@ -15,11 +15,9 @@
<feature url="features/org.eclipse.mylyn.mft.uml2_0.0.0.jar" id="org.eclipse.mylyn.mft.uml2" version="0.0.0">
<category name="SDK"/>
</feature>
- <!--
<feature url="features/org.eclipse.mylyn.mft.papyrus_0.0.0.jar" id="org.eclipse.mylyn.mft.papyrus" version="0.0.0">
<category name="Integration"/>
</feature>
- -->
<feature url="features/org.eclipse.mylyn.mft.sdk_0.0.0.jar" id="org.eclipse.mylyn.mft.sdk" version="0.0.0">
<category name="SDK"/>
</feature>
diff --git a/org.eclipse.mylyn.mft-target/mft-e3.8-papyrus.target b/org.eclipse.mylyn.mft-target/mft-e3.8-papyrus.target
new file mode 100644
index 0000000..3fe1b54
--- /dev/null
+++ b/org.eclipse.mylyn.mft-target/mft-e3.8-papyrus.target
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="mft-e3.8-papyrus" sequenceNumber="23">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="3.8.0.I20120608-1200"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="1.1.0.201205150811"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120608-0554"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.8.0.201206112118"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.6.0.v20120517-1809-67R09E9QuFflXswwIO_z0E3d4k_X"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.9.0.v201206131215"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="4.0.0.v20120604-0919"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.mylyn.mft-target/mft-e3.8.target b/org.eclipse.mylyn.mft-target/mft-e3.8.target
new file mode 100644
index 0000000..dbe4144
--- /dev/null
+++ b/org.eclipse.mylyn.mft-target/mft-e3.8.target
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="mft-e3.8" sequenceNumber="22">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="3.8.0.I20120608-1200"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120608-0554"/>
+<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="1.1.0.201205150811"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.8.0.201206112118"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.6.0.v20120517-1809-67R09E9QuFflXswwIO_z0E3d4k_X"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="4.0.0.v20120604-0919"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.mylyn.mft.papyrus-feature/feature.xml b/org.eclipse.mylyn.mft.papyrus-feature/feature.xml
index 6c42260..c092a5a 100644
--- a/org.eclipse.mylyn.mft.papyrus-feature/feature.xml
+++ b/org.eclipse.mylyn.mft.papyrus-feature/feature.xml
@@ -29,7 +29,7 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.uml" version="0.8.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.papyrus.uml.feature" version="0.9.0" match="greaterOrEqual"/>
<import feature="org.eclipse.uml2" version="3.2.0" match="greaterOrEqual"/>
<import feature="org.eclipse.mylyn.commons" version="3.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.mylyn.context_feature" version="3.7.0" match="greaterOrEqual"/>
diff --git a/org.eclipse.mylyn.mft.papyrus-feature/pom.xml b/org.eclipse.mylyn.mft.papyrus-feature/pom.xml
index edb2992..bcff86c 100644
--- a/org.eclipse.mylyn.mft.papyrus-feature/pom.xml
+++ b/org.eclipse.mylyn.mft.papyrus-feature/pom.xml
@@ -11,6 +11,6 @@
<version>0.9.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<properties>
- <platform-repository-url>http://download.eclipse.org/releases/indigo/201202240900/</platform-repository-url>
+ <platform-repository-url>${papyrus-repository-url}</platform-repository-url>
</properties>
</project>
diff --git a/org.eclipse.mylyn.mft.papyrus.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.mft.papyrus.tests/META-INF/MANIFEST.MF
index c4bf916..35122e1 100644
--- a/org.eclipse.mylyn.mft.papyrus.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.mft.papyrus.tests/META-INF/MANIFEST.MF
@@ -28,32 +28,16 @@
org.eclipse.gmf.runtime.common.ui,
org.eclipse.gmf.runtime.diagram.ui,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.core.adaptor.gmf,
- org.eclipse.papyrus.core.queries,
- org.eclipse.papyrus.core.queries.configuration,
- org.eclipse.papyrus.core.queries.configuration.edit,
- org.eclipse.papyrus.core.resourceloading,
- org.eclipse.papyrus.core.resourceloading.preferences,
- org.eclipse.papyrus.diagram.activity,
- org.eclipse.papyrus.diagram.clazz,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.diagram.common.groups,
- org.eclipse.papyrus.diagram.communication,
- org.eclipse.papyrus.diagram.component,
- org.eclipse.papyrus.diagram.composite,
- org.eclipse.papyrus.diagram.deployment,
- org.eclipse.papyrus.diagram.icons.uml,
- org.eclipse.papyrus.diagram.menu,
- org.eclipse.papyrus.diagram.profile,
- org.eclipse.papyrus.diagram.sequence,
- org.eclipse.papyrus.diagram.statemachine,
- org.eclipse.papyrus.diagram.usecase,
+ org.eclipse.papyrus.infra.queries.core,
+ org.eclipse.papyrus.infra.queries.core.configuration,
+ org.eclipse.papyrus.infra.queries.core.configuration.edit,
org.eclipse.papyrus.editor,
org.eclipse.mylyn.mft.papyrus.ui,
org.eclipse.mylyn.mft.gmf.ui,
org.eclipse.mylyn.commons.sdk.util,
- org.eclipse.papyrus.outline,
org.eclipse.mylyn.mft.emf.core;bundle-version="0.9.1",
- org.eclipse.mylyn.mft.uml2.core
+ org.eclipse.mylyn.mft.uml2.core,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.clazz
Export-Package: org.eclipse.mylyn.mft.papyrus.tests;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.mft.papyrus.tests/pom.xml b/org.eclipse.mylyn.mft.papyrus.tests/pom.xml
index 20802e5..82baf04 100644
--- a/org.eclipse.mylyn.mft.papyrus.tests/pom.xml
+++ b/org.eclipse.mylyn.mft.papyrus.tests/pom.xml
@@ -11,7 +11,7 @@
<version>0.9.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <platform-repository-url>http://download.eclipse.org/releases/indigo/201202240900/</platform-repository-url>
+ <platform-repository-url>${papyrus-repository-url}</platform-repository-url>
</properties>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java b/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
index 50a1532..4941063 100644
--- a/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
+++ b/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
@@ -16,7 +16,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
@@ -29,7 +31,6 @@
import org.eclipse.mylyn.mft.emf.core.DomainModelContextStructureBridge;
import org.eclipse.mylyn.mft.emf.ui.DiagramUiEditingMonitor;
import org.eclipse.mylyn.mft.sdk.util.AbstractEmfContextTest;
-import org.eclipse.papyrus.diagram.common.editparts.IPapyrusEditPart;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -73,7 +74,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
PapyrusMultiDiagramEditor ed = (PapyrusMultiDiagramEditor) page.openEditor(input,
- "org.eclipse.papyrus.core.papyrusEditor");
+ "org.eclipse.papyrus.infra.core.papyrusEditor");
System.out.println(ContextCore.getContextManager().getActiveContext().getAllElements());
@@ -84,7 +85,7 @@
IInteractionElement iInteractionElement = ContextCore.getContextManager().getActiveContext().get(RESOURCE_URI);
assertFalse(iInteractionElement.getInterest().isInteresting());
- ClassImpl book = (ClassImpl) ed.getEditingDomain()
+ ShapeImpl bookShape = (ShapeImpl) ed.getEditingDomain()
.getResourceSet()
.getResources()
.get(0)
@@ -93,10 +94,12 @@
.eContents()
.get(0);
- assertEquals("Book", book.getName()); //$NON-NLS-1$
+ ClassImpl book = (ClassImpl) bookShape.getElement();
+ String name = book.getName();
+ assertEquals("Book", name); //$NON-NLS-1$
List<?> findEditPartsForElement = ed.getDiagramGraphicalViewer().findEditPartsForElement(
- EMFCoreUtil.getProxyID(book), IPapyrusEditPart.class);
+ EMFCoreUtil.getProxyID(book), ShapeEditPart.class);
assertEquals(findEditPartsForElement.size(), 1);
StructuredSelection selection = new StructuredSelection(findEditPartsForElement);
diff --git a/org.eclipse.mylyn.mft.papyrus.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.mft.papyrus.ui/META-INF/MANIFEST.MF
index 7aaddde..ca2eedd 100644
--- a/org.eclipse.mylyn.mft.papyrus.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.mft.papyrus.ui/META-INF/MANIFEST.MF
@@ -10,14 +10,19 @@
org.eclipse.mylyn.context.ui,
org.eclipse.mylyn.commons.core,
org.eclipse.mylyn.monitor.ui,
- org.eclipse.papyrus.editor,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.papyrus.diagram.clazz,
org.eclipse.mylyn.mft.emf.ui,
org.eclipse.mylyn.mft.emf.core,
org.eclipse.mylyn.mft.gmf.ui,
org.eclipse.ui.navigator,
- org.eclipse.mylyn.mft.uml2.core
+ org.eclipse.mylyn.mft.uml2.core,
+ org.eclipse.papyrus.editor;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
+ org.eclipse.jface.text,
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.gef,
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.0",
+ org.eclipse.gmf.runtime.diagram.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.mylyn.internal.mft.papyrus.ui;x-internal:=true
diff --git a/org.eclipse.mylyn.mft.papyrus.ui/plugin.xml b/org.eclipse.mylyn.mft.papyrus.ui/plugin.xml
index 474d9a1..63ba84c 100644
--- a/org.eclipse.mylyn.mft.papyrus.ui/plugin.xml
+++ b/org.eclipse.mylyn.mft.papyrus.ui/plugin.xml
@@ -62,7 +62,7 @@
viewerId="org.eclipse.mylyn.context.ui.navigator.context">
<includes>
<contentExtension pattern="org.eclipse.papyrus.diagram.clazz.resourceContent"/>
- <contentExtension pattern="org.eclipse.papyrus.diagram.clazz.domainResourceContent"/>
+ <contentExtension pattern="org.eclipse.papyrus.*"/>
</includes>
</viewerContentBinding>
</extension>
diff --git a/org.eclipse.mylyn.mft.papyrus.ui/pom.xml b/org.eclipse.mylyn.mft.papyrus.ui/pom.xml
index 6c6e98c..f173be7 100644
--- a/org.eclipse.mylyn.mft.papyrus.ui/pom.xml
+++ b/org.eclipse.mylyn.mft.papyrus.ui/pom.xml
@@ -11,7 +11,7 @@
<version>0.9.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
- <platform-repository-url>http://download.eclipse.org/releases/indigo/201202240900/</platform-repository-url>
+ <platform-repository-url>${papyrus-repository-url}</platform-repository-url>
</properties>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.mft.papyrus.ui/src/org/eclipse/mylyn/internal/mft/papyrus/ui/Uml2UiBridge.java b/org.eclipse.mylyn.mft.papyrus.ui/src/org/eclipse/mylyn/internal/mft/papyrus/ui/Uml2UiBridge.java
index 2978936..eddeb48 100644
--- a/org.eclipse.mylyn.mft.papyrus.ui/src/org/eclipse/mylyn/internal/mft/papyrus/ui/Uml2UiBridge.java
+++ b/org.eclipse.mylyn.mft.papyrus.ui/src/org/eclipse/mylyn/internal/mft/papyrus/ui/Uml2UiBridge.java
@@ -13,9 +13,9 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
import org.eclipse.mylyn.mft.emf.ui.DiagramUiBridge;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart;
-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Relationship;
diff --git a/pom.xml b/pom.xml
index 7b6b7fe..bde918f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
</issueManagement>
<properties>
<mylyn-repository-url>http://download.eclipse.org/mylyn/drops/3.8.0/v20120612-0600/</mylyn-repository-url>
+ <papyrus-repository-url>http://download.eclipse.org/releases/juno/</papyrus-repository-url>
</properties>
<repositories>
<repository>
