diff options
Diffstat (limited to 'plugins')
13 files changed, 82 insertions, 46 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.project b/plugins/org.eclipse.emf.cdo.tests.objectivity/.project index 340587f7c7..99fad3961b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.project +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.project @@ -20,9 +20,25 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name> + <arguments> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.cdo.releng/release.xml</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs index 6d1e49fd20..f6c5987344 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.core.prefs @@ -61,7 +61,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.ui.prefs index 6e040177ce..51145884f6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.jdt.ui.prefs @@ -65,7 +65,7 @@ org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Ibrahim Sallam - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Ibrahim Sallam\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.core.prefs index 9b2824b8c1..d4e5e9d667 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.core.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.core.prefs @@ -1,3 +1,3 @@ -#Wed Jan 27 16:42:50 EST 2010 +#Fri May 22 23:02:22 CEST 2009 eclipse.preferences.version=1 resolve.requirebundle=false diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.prefs index 0def64b264..c6b96bb45e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/.settings/org.eclipse.pde.prefs @@ -17,7 +17,7 @@ compilers.p.missing-version-export-package=1 compilers.p.missing-version-import-package=1 compilers.p.missing-version-require-bundle=1 compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 +compilers.p.not-externalized-att=2 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF index 52e87d9ef9..53b6ad4a32 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Import-Package: com.objy.as;version="3.0.0", com.objy.db.app;version="3.0.0", com.objy.db.iapp;version="3.0.0", com.objy.pm;version="3.0.0" +Export-Package: org.eclipse.emf.cdo.tests.objectivity;version="3.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/build.properties b/plugins/org.eclipse.emf.cdo.tests.objectivity/build.properties index f140eb80f0..02255da03d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/build.properties +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/build.properties @@ -9,7 +9,6 @@ bin.includes = .,\ META-INF/,\ - plugin.xml,\ plugin.properties,\ copyright.txt,\ about.html,\ diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/plugin.xml b/plugins/org.eclipse.emf.cdo.tests.objectivity/plugin.xml deleted file mode 100644 index 9d6d59d575..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/plugin.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.3"?> -<!-- - Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - All rights reserved. This program and the accompanying materials - 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 ---> - -<plugin> - - -</plugin> diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java index d7f1823ce6..b7ebdfe46d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java @@ -1,12 +1,17 @@ package org.eclipse.emf.cdo.tests.objectivity; -import static org.junit.Assert.*; -import java.util.ArrayList; +import static org.junit.Assert.assertEquals; + import org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyArrayList; -import org.junit.*; import com.objy.as.app.Class_Object; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; + /** * Class to be used for testing, all persistence related calls are * overriden by local ones. diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java index f1536b6bc0..4191cd89de 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyBranchManagementTest.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: * Ibrahim Sallam - initial API and implementation */ @@ -84,7 +84,7 @@ class Temp extends ooObj class DbStore { - private final String fdName = "c:\\data\\objyBranchTest.boot"; // TODO - this is windows path style, generalise it. + // private final String fdName = "c:\\data\\objyBranchTest.boot"; // TODO - this is windows path style, generalise it. private final String repoName = "TestRepo"; @@ -333,7 +333,7 @@ public class ObjyBranchManagementTest { dbStore.begin(); int thisBaseBranchId = dbStore.getBranchManager().createBranch(NEW_BRANCH, branchInfoA); - int branchIdB = dbStore.getBranchManager().createBranch(NEW_BRANCH, branchInfoB); + dbStore.getBranchManager().createBranch(NEW_BRANCH, branchInfoB); long thisBaseBranchTimeStamp = System.currentTimeMillis(); // using the created branch we'll create subBranches. dbStore.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyExternalReferenceTest.java index c3ffa79410..9307a7d2f0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyExternalReferenceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyExternalReferenceTest.java @@ -14,20 +14,14 @@ package org.eclipse.emf.cdo.tests.objectivity; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; -import org.eclipse.emf.cdo.tests.model2.Model2Package; import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained; import org.eclipse.emf.cdo.transaction.CDOTransaction; -import org.eclipse.emf.cdo.transaction.CDOXATransaction; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.DanglingReferenceException; -import org.eclipse.emf.cdo.view.CDOViewSet; import org.eclipse.net4j.util.transaction.TransactionException; -import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -41,9 +35,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - /** * @author Simon McDuff */ diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF index 98cfc8383c..adf7ca60c4 100644 --- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF @@ -24,15 +24,56 @@ Export-Package: org.eclipse.emf.cdo;version="3.0.0", org.eclipse.emf.cdo.util;version="3.0.0", org.eclipse.emf.cdo.view;version="3.0.0", org.eclipse.emf.internal.cdo;version="3.0.0", - org.eclipse.emf.internal.cdo.analyzer;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.analyzer;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", org.eclipse.emf.internal.cdo.bundle;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui", org.eclipse.emf.internal.cdo.messages;version="3.0.0";x-internal:=true, - org.eclipse.emf.internal.cdo.query;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.revision;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.session;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.session.remote;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.transaction;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.util;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.view;version="3.0.0";x-friends:="org.eclipse.emf.cdo.net4j,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.defs,org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.query;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui, + org.eclipse.emf.cdo.tests.objectivity", + org.eclipse.emf.internal.cdo.revision;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.session;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.session.remote;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.transaction;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.util;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.view;version="3.0.0"; + x-friends:="org.eclipse.emf.cdo.net4j, + org.eclipse.emf.cdo.server, + org.eclipse.emf.cdo.tests, + org.eclipse.emf.cdo.defs, + org.eclipse.emf.cdo.ui", org.eclipse.emf.spi.cdo;version="3.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF index f761ce265c..9eb0f8d743 100644 --- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.net4j.internal.debug;version="3.0.0";x-internal:=true, org.eclipse.net4j.internal.debug.bundle;version="3.0.0";x-internal:=true, - org.eclipse.net4j.internal.debug.messages;x-internal:=true, + org.eclipse.net4j.internal.debug.messages;version="3.0.0";x-internal:=true, org.eclipse.net4j.internal.debug.views;version="3.0.0";x-internal:=true |