Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Bouhier2014-01-02 14:10:53 +0000
committerChristophe Bouhier2014-01-02 14:44:33 +0000
commit9847ebcb6af62d5a6977abfb6cd69875ee1fa63a (patch)
tree488b524a13e31f592372c24cafef2989babcf0e6 /plugins/org.eclipse.emf.edapt.history.cdo
parent357d3c25b7fae62080f97feac014721444522aed (diff)
downloadorg.eclipse.emf.edapt-9847ebcb6af62d5a6977abfb6cd69875ee1fa63a.tar.gz
org.eclipse.emf.edapt-9847ebcb6af62d5a6977abfb6cd69875ee1fa63a.tar.xz
org.eclipse.emf.edapt-9847ebcb6af62d5a6977abfb6cd69875ee1fa63a.zip
- enable tycho releng on CDO feature & plugin
- clean-up feature projects.
Diffstat (limited to 'plugins/org.eclipse.emf.edapt.history.cdo')
-rw-r--r--plugins/org.eclipse.emf.edapt.history.cdo/.classpath4
-rw-r--r--plugins/org.eclipse.emf.edapt.history.cdo/.project6
-rw-r--r--plugins/org.eclipse.emf.edapt.history.cdo/build.properties1
-rw-r--r--plugins/org.eclipse.emf.edapt.history.cdo/pom.xml11
-rw-r--r--plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java1
5 files changed, 19 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/.classpath b/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
index 64c5e31..00e032c 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/.project b/plugins/org.eclipse.emf.edapt.history.cdo/.project
index c34de77..0992422 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/.project
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/build.properties b/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
index da1e9aa..8d74fc6 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
@@ -1,5 +1,4 @@
source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
new file mode 100644
index 0000000..a5d983f
--- /dev/null
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>edapt</groupId>
+ <artifactId>plugins</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>edapt</groupId>
+ <artifactId>org.eclipse.emf.edapt.history.cdo</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java b/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
index 32ccde0..843a383 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
@@ -23,7 +23,6 @@ public class EdaptCDOViewProvider extends AbstractCDOViewProvider {
}
- @Override
public CDOView getView(URI uri, ResourceSet resourceSet) {
if (container == null) {
container = new ManagedContainer();

Back to the top