diff options
13 files changed, 101 insertions, 49 deletions
diff --git a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml index ff8999b878..d966904d22 100644 --- a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.dawn.examples" label="%featureName" - version="2.1.100.qualifier" + version="2.1.200.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml index b1d9174fb5..9d4f0b9286 100644 --- a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.xml @@ -13,7 +13,7 @@ <feature id="org.eclipse.emf.cdo.server.db4o" label="%featureName" - version="4.2.100.qualifier" + version="4.2.200.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml index d8fb0ef1ad..c88a24b89d 100644 --- a/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.tests.hibernate-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.tests.hibernate" label="%featureName" - version="4.2.100.qualifier" + version="4.2.200.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF index 462d88cf6e..e6be8572b8 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Vendor: %providerName @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.200", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.200", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.200", - org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.200" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti;version="1.0.300", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;version="1.0.300", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;version="1.0.300", + org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;version="1.0.300" diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java index c670f98939..3b9e7259c1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util.DawnGraphitiAcoreRe import org.eclipse.graphiti.dt.AbstractDiagramTypeProvider; import org.eclipse.graphiti.mm.pictograms.Diagram; -import org.eclipse.graphiti.platform.IDiagramEditor; +import org.eclipse.graphiti.platform.IDiagramBehavior; import org.eclipse.graphiti.tb.IToolBehaviorProvider; /** @@ -48,7 +48,7 @@ public class AcoreDiagramTypeProvider extends AbstractDiagramTypeProvider } @Override - public void init(Diagram diagram, IDiagramEditor diagramEditor) + public void init(Diagram diagram, IDiagramBehavior diagramEditor) { super.init(diagram, diagramEditor); DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(), getDiagramBehavior() diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup index 3cb8dd3c5b..90cb7d248f 100644 --- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup +++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup @@ -151,6 +151,55 @@ <sourceLocator rootFolder="${cdo.git.clone.location}"/> <repositoryList + name="Mars"> + <repository + url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-S"/> + <repository + url="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/core"/> + <repository + url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/emf/transaction/updates/interim"/> + <repository + url="http://download.eclipse.org/tools/gef/updates/interim"/> + <repository + url="http://download.eclipse.org/graphiti/updates/milestones"/> + <repository + url="http://download.eclipse.org/technology/swtbot/snapshots"/> + <repository + url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones"/> + <repository + url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/> + <repository + url="http://download.eclipse.org/tools/buckminster/updates-4.4M6"/> + <repository + url="http://download.eclipse.org/technology/nebula/archives/Q12015/release"/> + <repository + url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/> + <repository + url="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/> + <repository + url="http://download.eclipse.org/mmt/qvto/updates/milestones"/> + <repository + url="http://download.eclipse.org/mylyn/snapshots/weekly"/> + <repository + url="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/> + <repository + url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/> + <repository + url="http://www.elver.org/eclipse/2.1.0/update"/> + <repository + url="http://download.oracle.com/otn_software/oepe/luna"/> + </repositoryList> + <repositoryList name="Luna"> <repository url="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.0/R201406111328"/> @@ -497,7 +546,7 @@ <setupTask xsi:type="setup:VariableTask" name="cdo.target.platform" - value="Luna"/> + value="Mars"/> <setupTask xsi:type="setup:VariableTask" name="cdo.bugzilla.version" diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF index 0bb87d0e24..feaeb28fcf 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.server.db4o;singleton:=true -Bundle-Version: 4.0.200.qualifier +Bundle-Version: 4.0.300.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.200", - org.eclipse.emf.cdo.server.internal.db4o;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.db4o", - org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.200";x-internal:=true -Import-Package: com.db4o;version="[7.4.0,8.0.0)", - com.db4o.config;version="[7.4.0,8.0.0)", - com.db4o.constraints;version="[7.4.0,8.0.0)", - com.db4o.ext;version="[7.4.0,8.0.0)", - com.db4o.query;version="[7.4.0,8.0.0)", - com.db4o.reflect;version="[7.4.0,8.0.0)", - com.db4o.reflect.jdk;version="[7.4.0,8.0.0)", +Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.300", + org.eclipse.emf.cdo.server.internal.db4o;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.db4o", + org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.300";x-internal:=true +Import-Package: com.db4o;version="[7.4.0,9.0.0)", + com.db4o.config;version="[7.4.0,9.0.0)", + com.db4o.constraints;version="[7.4.0,9.0.0)", + com.db4o.ext;version="[7.4.0,9.0.0)", + com.db4o.query;version="[7.4.0,9.0.0)", + com.db4o.reflect;version="[7.4.0,9.0.0)", + com.db4o.reflect.jdk;version="[7.4.0,9.0.0)", org.osgi.framework;version="[1.5.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java index f26ddaeff5..e928c52af5 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java +++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java @@ -204,6 +204,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore } } + @SuppressWarnings("deprecation") protected void initObjectServer() { Configuration configuration = serverConfiguration; @@ -347,6 +348,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore protected Configuration createServerConfiguration() { + @SuppressWarnings("deprecation") Configuration config = Db4o.newConfiguration(); config.reflectWith(new JdkReflector(getClass().getClassLoader())); @@ -440,7 +442,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore /** * Carries {@link IStore}-related information. - * + * * @author Victor Roldan Betancort */ private static final class ServerInfo diff --git a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF index 0ef4124802..709037754b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db;singleton:=true -Bundle-Version: 4.0.300.qualifier +Bundle-Version: 4.0.400.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)";visibil org.eclipse.net4j.db.postgresql;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.jdbc;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.oracle;bundle-version="[1.0.0,2.0.0)", - oracle.database.driver;bundle-version="[6.0.0,7.0.0)", + oracle.database.driver;bundle-version="[6.0.0,8.0.0)", org.eclipse.emf.cdo.common.db;bundle-version="[3.0.0,4.0.0)" Eclipse-BuddyPolicy: dependent Import-Package: com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)", @@ -27,10 +27,10 @@ Import-Package: com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)", org.hsqldb.jdbc;version="[2.0.0,3.0.0)", org.postgresql.ds;version="[9.0.0,10.0.0)", org.postgresql.ds.common;version="[9.0.0,10.0.0)" -Export-Package: org.eclipse.emf.cdo.tests.db;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all", - org.eclipse.emf.cdo.tests.db.bundle;version="4.0.300";x-internal:=true, - org.eclipse.emf.cdo.tests.db.capabilities;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all", - org.eclipse.emf.cdo.tests.db.offline;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all", - org.eclipse.emf.cdo.tests.db.performance;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all", - org.eclipse.emf.cdo.tests.db.revisioncache;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all", - org.eclipse.emf.cdo.tests.db.verifier;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.all" +Export-Package: org.eclipse.emf.cdo.tests.db;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all", + org.eclipse.emf.cdo.tests.db.bundle;version="4.0.400";x-internal:=true, + org.eclipse.emf.cdo.tests.db.capabilities;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all", + org.eclipse.emf.cdo.tests.db.offline;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all", + org.eclipse.emf.cdo.tests.db.performance;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all", + org.eclipse.emf.cdo.tests.db.revisioncache;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all", + org.eclipse.emf.cdo.tests.db.verifier;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.all" diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF index 19ccca9ab4..514f145b15 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db4o -Bundle-Version: 4.0.300.qualifier +Bundle-Version: 4.0.400.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db4o;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.300";x-internal:=true +Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.400";x-internal:=true Bundle-Localization: plugin -Import-Package: com.db4o;version="[7.4.0,8.0.0)", - com.db4o.ext;version="[7.4.0,8.0.0)" +Import-Package: com.db4o;version="[7.4.0,9.0.0)", + com.db4o.ext;version="[7.4.0,9.0.0)" diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java index d1240e17d1..336a80043c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -75,12 +75,13 @@ public class DB4OConfig extends RepositoryConfig { if (mem) { - if (!isRestarting()) - { - MEMDB4OStore.clearContainer(); - } - - return new MEMDB4OStore(); + throw new UnsupportedOperationException(); + // if (!isRestarting()) + // { + // MEMDB4OStore.clearContainer(); + // } + // + // return new MEMDB4OStore(); } File tempFolder = TMPUtil.getTempFolder(); diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java.ERROR index 0f2e85fb00..0f2e85fb00 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java.ERROR diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF index 188ff36ad3..110260af85 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.hibernate;singleton:=true -Bundle-Version: 4.1.200.qualifier +Bundle-Version: 4.1.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -21,12 +21,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", com.mysql.jdbc;bundle-version="[5.1.7,6.0.0)", org.dom4j;bundle-version="[1.6.1,2.0.0)", javax.persistence;bundle-version="[2.0.0,3.0.0)", - org.hibernate;bundle-version="[4.0.0,4.2.0)", + org.hibernate;bundle-version="[4.0.0,5.0.0)", org.slf4j.api;bundle-version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.emf.cdo.tests.hibernate;version="4.1.200";x-friends:="org.eclipse.emf.cdo.tests.hudson", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.200", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.200", - org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.200" +Export-Package: org.eclipse.emf.cdo.tests.hibernate;version="4.1.300";x-friends:="org.eclipse.emf.cdo.tests.hudson", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;version="4.1.300", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;version="4.1.300", + org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util;version="4.1.300" Import-Package: org.hibernate.cfg;version="[4.0.0,5.0.0)", org.eclipse.emf.teneo;version="[2.0.1,3.0.0)", org.eclipse.emf.cdo.server.hibernate;version="[4.0.0,5.0.0)", |