Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng/rcp/org.eclipse.papyrus.rcp.feature
diff options
context:
space:
mode:
Diffstat (limited to 'releng/rcp/org.eclipse.papyrus.rcp.feature')
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.feature/.project17
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs4
-rwxr-xr-x[-rw-r--r--]releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties6
-rwxr-xr-x[-rw-r--r--]releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties0
-rwxr-xr-x[-rw-r--r--]releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml16
-rwxr-xr-x[-rw-r--r--]releng/rcp/org.eclipse.papyrus.rcp.feature/license.html0
-rwxr-xr-x[-rw-r--r--]releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml10
7 files changed, 18 insertions, 35 deletions
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.project b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
deleted file mode 100644
index 3ceac2f77b2..00000000000
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.rcp.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2..00000000000
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties
index e11b8a96f0f..a4bee2949c0 100644..100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties
@@ -1,7 +1,3 @@
bin.includes = feature.xml,\
feature.properties,\
- license.html
-#root.win32.win32.x86 = win32
-#root.win32.win32.x86_64 = win64
-#root.linux.gtk.x86 = linux32
-#root.linux.gtk.x86_64 = linux64 \ No newline at end of file
+ license.html \ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
index 6695a516cbf..6695a516cbf 100644..100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 1ce8d4a8c48..36e344c56db 100644..100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -33,6 +33,7 @@ http://www.eclipse.org/legal/epl-v10.html
</url>
<requires>
+ <!-- Features for the Eclipse Modeling Tools distribution -->
<import feature="org.eclipse.amalgam.discovery"/>
<import feature="org.eclipse.cvs"/>
<import feature="org.eclipse.egit"/>
@@ -40,7 +41,6 @@ http://www.eclipse.org/legal/epl-v10.html
<import feature="org.eclipse.emf.cdo.epp"/>
<import feature="org.eclipse.emf.compare.ide.ui.source"/>
<import feature="org.eclipse.emf.compare.source"/>
- <import feature="org.eclipse.emf.ecoretools.design"/>
<import feature="org.eclipse.emf.eef.codegen.ecore-feature"/>
<import feature="org.eclipse.emf.query.sdk"/>
<import feature="org.eclipse.emf.sdk"/>
@@ -61,13 +61,23 @@ http://www.eclipse.org/legal/epl-v10.html
<import feature="org.eclipse.mylyn_feature"/>
<import feature="org.eclipse.ocl.all.sdk"/>
<import feature="org.eclipse.emf.cdo.dawn.sdk"/>
- <import feature="org.eclipse.papyrus.sdk.sources.feature"/>
- <import feature="org.eclipse.papyrus.extra.sources.feature"/>
<import feature="org.eclipse.pde"/>
<import feature="org.eclipse.rcp"/>
<import feature="org.eclipse.sdk"/>
<import feature="org.eclipse.uml2.sdk"/>
<import feature="org.eclipse.xsd.sdk"/>
+
+ <!-- Papyrus components -->
+ <import feature="org.eclipse.papyrus.sdk.feature.source"/>
+ <import feature="org.eclipse.papyrus.extra.feature.source"/>
+ <import feature="org.eclipse.papyrus.dev.feature.source"/>
+
+ <!-- Additional components -->
+ <import feature="org.eclipse.team.svn"/>
+ <import feature="org.eclipse.team.svn.revision.graph"/>
+ <import feature="org.eclipse.team.svn.mylyn"/>
+ <import feature="org.eclipse.gmf.sdk"/>
+ <import feature="org.eclipse.gmf.tooling.codegen.xtend2"/>
</requires>
<plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html
index 5ef681156be..5ef681156be 100644..100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 5964327ff2c..75a6c0ce089 100644..100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus.rcp.master</artifactId>
+ <artifactId>org.eclipse.papyrus</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.papyrus.rcp.master</relativePath>
+ <relativePath>../../top-pom-rcp.xml</relativePath>
</parent>
- <groupId>org.eclipse.papyrus.features</groupId>
+ <groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

Back to the top