Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo-feature/feature.xml9
-rw-r--r--features/org.eclipse.emf.cdo-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/feature.properties2
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.license-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.db-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.db-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.db.db2-feature/copyright.txt2
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.derby-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.doc-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.h2-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.hsqldb-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.mysql-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.oracle-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.db.postgresql-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.doc-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.examples-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.examples-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.sdk-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.sdk-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.tests-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.tests-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.ui-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.util-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.util-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.util.doc-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.util.ui-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.ws-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.ws-feature/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.options3
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/.api_filters50
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs414
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/build.properties22
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/scrapbook.sql38
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java54
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractDBAccessor.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java54
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractUpdateStatement.java54
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java45
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java852
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java76
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF79
-rw-r--r--plugins/org.eclipse.emf.cdo.common/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java50
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java43
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/URIHandlerRegistry.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java178
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/util/URIHandlerFactory.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters7
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF11
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/buckminster.cspex9
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/build.properties7
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/docs/CDOCompare.pngbin0 -> 92407 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/plugin.xml22
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java190
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/internal/compare/CDOCompareFactoryImpl.java83
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch1589
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch1589
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/CDOExplorer.setup115
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/LinkedResource.gifbin0 -> 215 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/wiz/new_link.gifbin0 -> 3036 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml25
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/bundle/OM.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java82
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLobEditorInput.java251
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/MergeFromActionProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java456
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutNodeWizardPage.java297
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/LinkedResourceWizard.java67
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/LinkedResourceWizardPage.java309
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizard.java141
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizardPage.java222
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerPreferencePage.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF21
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/plugin.xml33
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java77
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerURIHandler.java359
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/resources/CDOCheckoutFileStore.java282
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/resources/CDOCheckoutFileSystem.java100
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/resources/CDOCheckoutRefreshMonitor.java156
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/resources/CDOCheckoutRefreshProvider.java164
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.jdt.core.prefs10
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadMergeDataRequest.java49
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStore.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.server.embedded/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/buckminster.cspex8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/CDOServer.setup76
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.server/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java81
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java86
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java51
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model4interfaces/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model5/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model6/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java72
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_350987_Test.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_397948_Test.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_485487_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_570123_Test.java73
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/buckminster.cspex9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/plugin.xml10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CDOLobAttributeChangeAccessor.java87
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CDOLobAttributeChangeAccessorFactory.java101
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CDOLobAttributeModelUpdateStrategy.java129
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CDOMatchAccessor.java69
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CDOMatchAccessorFactory.java85
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.jdt/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.jdt/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters14
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF36
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/buckminster.cspex8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AbstractCDOEditorInput.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOContentProvider.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java345
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInputImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOLobEditorInput.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOLobStorage.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF52
-rw-r--r--plugins/org.eclipse.emf.cdo/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.genmodel2
-rw-r--r--plugins/org.eclipse.emf.cdo/plugin.xml6
-rw-r--r--plugins/org.eclipse.emf.cdo/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java139
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java38
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java44
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java54
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java49
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java25
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOURIUtil.java47
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java61
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java13
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java46
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java40
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOLockStateLoadingPolicy.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java13
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOURIHandler.java131
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOResource.java4
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.db2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.db2/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.derby/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/EmbeddedDerbyAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.db.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.h2/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/H2Adapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/HSQLDBAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java8
-rw-r--r--plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.net4j.db/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.db/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java4
-rw-r--r--plugins/org.eclipse.net4j.debug/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.examples/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.examples/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.http/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.sdk/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.sdk/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.net4j.tests/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java1
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jarbin5034 -> 5034 bytes
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.trace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.ui/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.util.doc/about.properties2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.classpath2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF34
-rw-r--r--plugins/org.eclipse.net4j.util.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java31
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/GlobalPartAdapter.java271
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java62
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF64
-rw-r--r--plugins/org.eclipse.net4j.util/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java11
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AccessUtil.java2470
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java84
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/UnionSet.java74
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/EmptyInputStream.java31
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/EncodingProvider.java20
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java17
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ReaderInputStream.java155
-rw-r--r--plugins/org.eclipse.net4j.ws/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java24
-rw-r--r--plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.business/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.inventory.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.inventory/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.department/.classpath2
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.table/.classpath2
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp/.classpath2
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.server.web/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.testclient/.classpath2
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.apireports/.classpath2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--releng/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.help/buildLib.ant2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.help/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml1
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target6
-rw-r--r--releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng/CDO.setup48
-rw-r--r--releng/org.eclipse.emf.cdo.releng/hudson/ant.properties6
-rw-r--r--releng/org.eclipse.emf.cdo.releng/versions/release.digestbin10407 -> 10466 bytes
-rw-r--r--releng/org.eclipse.emf.cdo.releng/versions/release.properties6
-rw-r--r--releng/org.eclipse.emf.cdo.releng/versions/release.xml358
617 files changed, 11461 insertions, 6720 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml
index 95e3431f5a..11c9f71e49 100644
--- a/features/org.eclipse.emf.cdo-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo-feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -57,13 +57,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.cdo.common.db"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.emf.cdo.net4j"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.cdo-feature/pom.xml b/features/org.eclipse.emf.cdo-feature/pom.xml
index 0f098b50ac..419b922edd 100644
--- a/features/org.eclipse.emf.cdo-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index 1de39ae532..07bf651567 100644
--- a/features/org.eclipse.emf.cdo.all-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.all"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.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.all-feature/pom.xml b/features/org.eclipse.emf.cdo.all-feature/pom.xml
index a8d769d38f..05eca512bb 100644
--- a/features/org.eclipse.emf.cdo.all-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.all</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.compare-feature/feature.xml b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
index 99c980b268..f38d1abe82 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.compare"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.7.0.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.compare-feature/pom.xml b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
index 237dfc7db6..bc650cf556 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.compare</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index 2b7ccdb231..465e8f92de 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn"
label="%featureName"
- version="2.3.0.qualifier"
+ version="2.3.1.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.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
index f8fb620c5a..697bedbdda 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.dawn</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.xml b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
index dbb42d5ebc..de9a1f633c 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.doc"
label="%featureName"
- version="4.3.2.qualifier"
+ version="4.3.3.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.doc-feature/pom.xml b/features/org.eclipse.emf.cdo.doc-feature/pom.xml
index faac9b6318..4a7dce6b8b 100644
--- a/features/org.eclipse.emf.cdo.doc-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.doc-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.doc</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
index 6fc6e6f203..4df0c474a5 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.epp"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.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.epp-feature/pom.xml b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
index 2b9da5c3ce..3b9136eddc 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.epp</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 415f67640a..5f42c09112 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2013, 2015-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2013, 2015-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples"
label="%featureName"
- version="4.4.3.qualifier"
+ version="4.4.4.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples-feature/pom.xml b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
index 9f9b71aee4..88ddf2bf26 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples</artifactId>
- <version>4.4.3-SNAPSHOT</version>
+ <version>4.4.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
index 229398c80e..7129ecdf77 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013, 2015-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2012, 2013, 2015-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples.installer"
label="%featureName"
- version="4.3.3.qualifier"
+ version="4.3.4.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
index 5446af8cce..1046911130 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
- <version>4.3.3-SNAPSHOT</version>
+ <version>4.3.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.properties b/features/org.eclipse.emf.cdo.license-feature/feature.properties
index 38f2fa2c27..67bf2d3592 100644
--- a/features/org.eclipse.emf.cdo.license-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.license-feature/feature.properties
@@ -3,7 +3,7 @@ providerName = Eclipse Modeling Project
updateSiteName = Eclipse Modeling Project Updates
copyrightURL = copyright.txt
-copyright = Copyright (c) 2004-2020 Eike Stepper (Loehne, Germany) and others.\n\
+copyright = Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.xml b/features/org.eclipse.emf.cdo.license-feature/feature.xml
index 3ad107a592..8e87a07148 100644
--- a/features/org.eclipse.emf.cdo.license-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.license-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.license"
label="CDO License"
- version="4.1.601.qualifier"
+ version="4.1.602.qualifier"
provider-name="Eclipse Modeling Project"
image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.emf.cdo.license-feature/pom.xml b/features/org.eclipse.emf.cdo.license-feature/pom.xml
index caf9f36985..843c644751 100644
--- a/features/org.eclipse.emf.cdo.license-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.license-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.license</artifactId>
- <version>4.1.601-SNAPSHOT</version>
+ <version>4.1.602-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
index a07aa2e8c5..697b5b1920 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.migrator"
label="%featureName"
- version="4.4.1.qualifier"
+ version="4.4.3.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
index f135f985b8..e2f1ae34bd 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.migrator</artifactId>
- <version>4.4.1-SNAPSHOT</version>
+ <version>4.4.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 175d4a9355..efaed8d9ab 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.sdk"
label="%featureName"
- version="5.5.0.qualifier"
+ version="5.6.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
index edb91b57f9..5d127e4b14 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.sdk</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index 4e71edd36f..93a6b845e9 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.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-feature/pom.xml b/features/org.eclipse.emf.cdo.server-feature/pom.xml
index 3c986c506b..06e6d39f17 100644
--- a/features/org.eclipse.emf.cdo.server-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
index 09c8a61f42..e4f67b0bf0 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.db"
label="%featureName"
- version="4.10.0.qualifier"
+ version="4.10.1.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.server.db-feature/pom.xml b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
index f3ac0300a4..e507aee823 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.db</artifactId>
- <version>4.10.0-SNAPSHOT</version>
+ <version>4.10.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
index 443bc983e2..22aeb300d7 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.embedded"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.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.embedded-feature/pom.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
index 228b07f21c..db2a6c5ed2 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.embedded</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
index 5721cc43b0..611e2e24d4 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.lissome"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.2.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.lissome-feature/pom.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
index 4d767c40e9..bdf5701516 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.lissome</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
index cc0637073e..b0a6a264e3 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.mongodb"
label="%featureName"
- version="5.1.1.qualifier"
+ version="5.1.2.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.server.mongodb-feature/pom.xml b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
index 209623f128..58078bb0c3 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.mongodb</artifactId>
- <version>5.1.1-SNAPSHOT</version>
+ <version>5.1.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 5537243f5d..9637580d54 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.tests"
label="%featureName"
- version="4.4.3.qualifier"
+ version="4.4.4.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-feature/pom.xml b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
index 79a6289008..b0d9ced4b8 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.tests</artifactId>
- <version>4.4.3-SNAPSHOT</version>
+ <version>4.4.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 482bace3e2..598ec2c0d5 100644
--- a/features/org.eclipse.net4j-feature/feature.xml
+++ b/features/org.eclipse.net4j-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j-feature/pom.xml b/features/org.eclipse.net4j-feature/pom.xml
index a8308c538c..7ccf378329 100644
--- a/features/org.eclipse.net4j-feature/pom.xml
+++ b/features/org.eclipse.net4j-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml
index 577edd7226..250239bf55 100644
--- a/features/org.eclipse.net4j.db-feature/feature.xml
+++ b/features/org.eclipse.net4j.db-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db-feature/pom.xml b/features/org.eclipse.net4j.db-feature/pom.xml
index 425521c202..3f7284c09e 100644
--- a/features/org.eclipse.net4j.db-feature/pom.xml
+++ b/features/org.eclipse.net4j.db-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.db2-feature/copyright.txt b/features/org.eclipse.net4j.db.db2-feature/copyright.txt
index b71adb84a4..79f5993f94 100644
--- a/features/org.eclipse.net4j.db.db2-feature/copyright.txt
+++ b/features/org.eclipse.net4j.db.db2-feature/copyright.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 Eike Stepper (Berlin, Germany) and others.
+Copyright (c) 2004-2021 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
diff --git a/features/org.eclipse.net4j.db.derby-feature/feature.xml b/features/org.eclipse.net4j.db.derby-feature/feature.xml
index 44ba990c71..31d7b02c5c 100644
--- a/features/org.eclipse.net4j.db.derby-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.derby-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.derby"
label="%featureName"
- version="4.2.501.qualifier"
+ version="4.2.502.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.derby-feature/pom.xml b/features/org.eclipse.net4j.db.derby-feature/pom.xml
index fd8dc3f661..bb3ecff43b 100644
--- a/features/org.eclipse.net4j.db.derby-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.derby-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.derby</artifactId>
- <version>4.2.501-SNAPSHOT</version>
+ <version>4.2.502-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.doc-feature/feature.xml b/features/org.eclipse.net4j.db.doc-feature/feature.xml
index 5e05614fba..d77878bfb8 100644
--- a/features/org.eclipse.net4j.db.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.doc"
label="%featureName"
- version="4.3.0.qualifier"
+ version="4.3.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.doc-feature/pom.xml b/features/org.eclipse.net4j.db.doc-feature/pom.xml
index ec472a4c83..667dfb0a03 100644
--- a/features/org.eclipse.net4j.db.doc-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.doc-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.doc</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index 80eb938015..c53ea6eab9 100644
--- a/features/org.eclipse.net4j.db.h2-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.h2"
label="%featureName"
- version="4.4.0.qualifier"
+ version="4.5.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.h2-feature/pom.xml b/features/org.eclipse.net4j.db.h2-feature/pom.xml
index 73b923dd97..636655af73 100644
--- a/features/org.eclipse.net4j.db.h2-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.h2</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
index c46dada61c..bd3bc563e1 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.hsqldb"
label="%featureName"
- version="4.3.0.qualifier"
+ version="4.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml b/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
index a8c5c6419f..a24c885821 100644
--- a/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.hsqldb</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.mysql-feature/feature.xml b/features/org.eclipse.net4j.db.mysql-feature/feature.xml
index 1a86522e71..1ff30db2ba 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.mysql-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.mysql"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.mysql-feature/pom.xml b/features/org.eclipse.net4j.db.mysql-feature/pom.xml
index 2e9a7878a2..22a819293f 100644
--- a/features/org.eclipse.net4j.db.mysql-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.mysql-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.mysql</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.oracle-feature/feature.xml b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
index efea9470a6..e70f782809 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.oracle"
label="%featureName"
- version="1.2.0.qualifier"
+ version="1.3.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.oracle-feature/pom.xml b/features/org.eclipse.net4j.db.oracle-feature/pom.xml
index 44c996848c..ec66f6fc0f 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.oracle-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.oracle</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
index ecb2e209ff..80c6cbfde1 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.postgresql"
label="%featureName"
- version="4.3.0.qualifier"
+ version="4.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/pom.xml b/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
index 3da76fbff1..0901d31ad4 100644
--- a/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.postgresql</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.doc-feature/feature.xml b/features/org.eclipse.net4j.doc-feature/feature.xml
index 6b03ebe7a4..95881a5aef 100644
--- a/features/org.eclipse.net4j.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.doc"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.doc-feature/pom.xml b/features/org.eclipse.net4j.doc-feature/pom.xml
index 1cbdefa250..14cebc4d37 100644
--- a/features/org.eclipse.net4j.doc-feature/pom.xml
+++ b/features/org.eclipse.net4j.doc-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.doc</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index b84f650e86..29b0105f0c 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2013, 2015-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2013, 2015-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples"
label="%featureName"
- version="4.3.2.qualifier"
+ version="4.3.3.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.examples-feature/pom.xml b/features/org.eclipse.net4j.examples-feature/pom.xml
index cb52295c4c..898b960ef8 100644
--- a/features/org.eclipse.net4j.examples-feature/pom.xml
+++ b/features/org.eclipse.net4j.examples-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.examples</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples.installer-feature/feature.xml b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
index f483c61d37..f6ab488d9c 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013, 2015-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2012, 2013, 2015-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples.installer"
label="%featureName"
- version="4.3.2.qualifier"
+ version="4.3.3.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.examples.installer-feature/pom.xml b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
index 9daeb50aa9..7b6041ba34 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/pom.xml
+++ b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.examples.installer</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index aeaf9ed32c..ec1d079aa4 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.sdk"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.sdk-feature/pom.xml b/features/org.eclipse.net4j.sdk-feature/pom.xml
index e1252b0200..fd665eca16 100644
--- a/features/org.eclipse.net4j.sdk-feature/pom.xml
+++ b/features/org.eclipse.net4j.sdk-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.sdk</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index 89a3224cb7..1664eaf2c9 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.xml
+++ b/features/org.eclipse.net4j.tests-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.tests"
label="%featureName"
- version="4.3.3.qualifier"
+ version="4.3.4.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.tests-feature/pom.xml b/features/org.eclipse.net4j.tests-feature/pom.xml
index acb1d0b7e9..5280b47fbc 100644
--- a/features/org.eclipse.net4j.tests-feature/pom.xml
+++ b/features/org.eclipse.net4j.tests-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.tests</artifactId>
- <version>4.3.3-SNAPSHOT</version>
+ <version>4.3.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml
index 9047c45d3c..2f74a99b8e 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.ui-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ui"
label="%featureName"
- version="4.4.0.qualifier"
+ version="4.4.1.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.ui-feature/pom.xml b/features/org.eclipse.net4j.ui-feature/pom.xml
index 16db247497..e0c521429e 100644
--- a/features/org.eclipse.net4j.ui-feature/pom.xml
+++ b/features/org.eclipse.net4j.ui-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.ui</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util-feature/feature.xml b/features/org.eclipse.net4j.util-feature/feature.xml
index 91ffd87b7f..7a496416b9 100644
--- a/features/org.eclipse.net4j.util-feature/feature.xml
+++ b/features/org.eclipse.net4j.util-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2011-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.util-feature/pom.xml b/features/org.eclipse.net4j.util-feature/pom.xml
index d0d3d29dd8..a89c0cc45f 100644
--- a/features/org.eclipse.net4j.util-feature/pom.xml
+++ b/features/org.eclipse.net4j.util-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.util</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util.doc-feature/feature.xml b/features/org.eclipse.net4j.util.doc-feature/feature.xml
index 4dff554a52..27691a67f6 100644
--- a/features/org.eclipse.net4j.util.doc-feature/feature.xml
+++ b/features/org.eclipse.net4j.util.doc-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util.doc"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.util.doc-feature/pom.xml b/features/org.eclipse.net4j.util.doc-feature/pom.xml
index be0303d8ca..bc7663b847 100644
--- a/features/org.eclipse.net4j.util.doc-feature/pom.xml
+++ b/features/org.eclipse.net4j.util.doc-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.util.doc</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util.ui-feature/feature.xml b/features/org.eclipse.net4j.util.ui-feature/feature.xml
index e8ca51ba14..cdcb3adce0 100644
--- a/features/org.eclipse.net4j.util.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.util.ui-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2011-2021 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util.ui"
label="%featureName"
- version="4.12.0.qualifier"
+ version="4.13.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.util.ui-feature/pom.xml b/features/org.eclipse.net4j.util.ui-feature/pom.xml
index de5a1cf121..ba275e0c5b 100644
--- a/features/org.eclipse.net4j.util.ui-feature/pom.xml
+++ b/features/org.eclipse.net4j.util.ui-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.util.ui</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.ws-feature/feature.xml b/features/org.eclipse.net4j.ws-feature/feature.xml
index c1ee1b5852..7ea4bae24f 100644
--- a/features/org.eclipse.net4j.ws-feature/feature.xml
+++ b/features/org.eclipse.net4j.ws-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2020 Eike Stepper (Loehne, 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
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ws"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.ws-feature/pom.xml b/features/org.eclipse.net4j.ws-feature/pom.xml
index 8107f81804..8e063b0123 100644
--- a/features/org.eclipse.net4j.ws-feature/pom.xml
+++ b/features/org.eclipse.net4j.ws-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2020 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.ws</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
index f939de8ae9..2605b19243 100644
--- a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.common.db/.classpath b/plugins/org.eclipse.emf.cdo.common.db/.classpath
deleted file mode 100644
index eca7bdba8f..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.options b/plugins/org.eclipse.emf.cdo.common.db/.options
deleted file mode 100644
index 4dbdd62d97..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.emf.cdo.common.db/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.project b/plugins/org.eclipse.emf.cdo.common.db/.project
deleted file mode 100644
index 2063ebadb6..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.project
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.common.db</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>check.maven.pom</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>ignore.lower.bound.dependency.ranges</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng/versions/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.oomph.version.VersionNature</nature>
- </natures>
- <filteredResources>
- <filter>
- <id>1396938000000</id>
- <name></name>
- <type>10</type>
- <matcher>
- <id>org.eclipse.ui.ide.multiFilter</id>
- <arguments>1.0-projectRelativePath-matches-true-false-target</arguments>
- </matcher>
- </filter>
- </filteredResources>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.common.db/.settings/.api_filters
deleted file mode 100644
index e46b9e3036..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/.api_filters
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.emf.cdo.common.db" version="2">
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDByteArray">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDByteArray"/>
- <message_argument value="org.eclipse.emf.cdo.common.db_3.0.200"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDInteger">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDInteger"/>
- <message_argument value="org.eclipse.emf.cdo.common.db_3.0.200"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDLong">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDLong"/>
- <message_argument value="org.eclipse.emf.cdo.common.db_3.0.200"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDString">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDString"/>
- <message_argument value="org.eclipse.emf.cdo.common.db_3.0.200"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java" type="org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache">
- <filter id="574619656">
- <message_arguments>
- <message_argument value="InternalCDORevisionCache"/>
- <message_argument value="DBRevisionCache"/>
- </message_arguments>
- </filter>
- <filter id="574660632">
- <message_arguments>
- <message_argument value="InternalCDORevisionCache"/>
- <message_argument value="CDORevisionCache"/>
- <message_argument value="DBRevisionCache"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 0ad175ccb2..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 12:59:47 CEST 2011
-eclipse.preferences.version=1
-
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c2d0341c93..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,414 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-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=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
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=160
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 556ed07a3c..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Sep 02 05:38:34 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f939de8ae9..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,141 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.push_down_negation=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_modifiers=false
-cleanup.remove_redundant_semicolons=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_array_creation=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_autoboxing=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_unboxing=false
-cleanup_profile=_CDO
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMFT
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
-org.eclipse.jdt.ui.javadoc=true
-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) 2020 Eike Stepper (Loehne, 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
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.push_down_negation=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=false
-sp_cleanup.remove_redundant_semicolons=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_array_creation=true
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_autoboxing=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_unboxing=false
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30fe5d..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index b050639a54..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 97c11e6725..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 0c17d59e45..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-MISSING_EE_DESCRIPTIONS=Warning
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Ignore
-automatically_removed_unused_problem_filters=Disabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fe01bb701d..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,31 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=2
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-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=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
deleted file mode 100644
index 897d978380..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.common.db;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.cdo.common.internal.db.bundle.OM$Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.common.db;version="3.1.0",
- org.eclipse.emf.cdo.common.internal.db;version="3.1.0";x-friends:="org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.common.internal.db.bundle;version="3.1.0";x-internal:=true,
- org.eclipse.emf.cdo.common.internal.db.cache;version="3.1.0";x-friends:="org.eclipse.emf.cdo.tests.db"
-Automatic-Module-Name: org.eclipse.emf.cdo.common.db
diff --git a/plugins/org.eclipse.emf.cdo.common.db/about.html b/plugins/org.eclipse.emf.cdo.common.db/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.common.db/build.properties b/plugins/org.eclipse.emf.cdo.common.db/build.properties
deleted file mode 100644
index 964f63e464..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2009, 2010, 2012, 2017 Eike Stepper (Loehne, 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
-
-# NLS_MESSAGEFORMAT_VAR
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties,\
- .options
-src.includes = about.html,\
- pom.xml
-
-generateSourceReferences = true
diff --git a/plugins/org.eclipse.emf.cdo.common.db/plugin.properties b/plugins/org.eclipse.emf.cdo.common.db/plugin.properties
deleted file mode 100644
index 5491f46444..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2009, 2010, 2012 Eike Stepper (Loehne, 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
-
-pluginName = CDO Model Repository Common DB Support
-providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.common.db/pom.xml b/plugins/org.eclipse.emf.cdo.common.db/pom.xml
deleted file mode 100644
index dacc6a5875..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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
--->
-<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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.emf.cdo</groupId>
- <artifactId>org.eclipse.emf.cdo.plugins</artifactId>
- <version>4.7.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/plugins</relativePath>
- </parent>
-
- <groupId>org.eclipse.emf.cdo</groupId>
- <artifactId>org.eclipse.emf.cdo.common.db</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/plugins/org.eclipse.emf.cdo.common.db/scrapbook.sql b/plugins/org.eclipse.emf.cdo.common.db/scrapbook.sql
deleted file mode 100644
index 8fa14e110d..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/scrapbook.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-select * from DBREVISIONCACHE_REVISIONS where VERSION = (select MAX( VERSION ) from DBREVISIONCACHE_REVISIONS)
-
-select id from DBREVISIONCACHE_REVISIONS group by id, version, created, revised;
-
-drop table DBREVISIONCACHE_REVISIONS;
-
-select MAX( VERSION ) from DBREVISIONCACHE_REVISIONS where id = 4
-
-select ID, VERSION, CDOREVISION from DBREVISIONCACHE_REVISIONS where id IN (select distinct id from DBREVISIONCACHE_REVISIONS) GROUP BY ID
-
-select CDOREVISION from DBREVISIONCACHE_REVISIONS where (select ID, MAX(VERSION) as version from DBREVISIONCACHE_REVISIONS GROUP by ID)
-
-select * from DBREVISIONCACHE_REVISIONS where (ID, VERSION) IN (select ID, MAX(VERSION) as version from DBREVISIONCACHE_REVISIONS GROUP by ID)
-
-
-select ID, MAX(VERSION), CDOREVISION as version from DBREVISIONCACHE_REVISIONS GROUP by ID
-
-select VERSION from DBREVISIONCACHE_REVISIONS WHERE version = max(version)
-
-select * from DBREVISIONCACHE_REVISIONS where version = (select max(version) from DBREVISIONCACHE_REVISIONS where DBREVISIONCACHE_REVISIONS.id = DBREVISIONCACHE_REVISIONS.id)
-
-select * from DBREVISIONCACHE_REVISIONS where version = (select max(version) from DBREVISIONCACHE_REVISIONS where DBREVISIONCACHE_REVISIONS.id = DBREVISIONCACHE_REVISIONS.id)
-
-select * from DBREVISIONCACHE_REVISIONS a where version = (select max(version) from DBREVISIONCACHE_REVISIONS b where a.id = b.id)
-
-select * from DBREVISIONCACHE_REVISIONS where id = 3 AND created >= 1244048304119 AND revised <= 1244048304119;
-
-UPDATE DBREVISIONCACHE_REVISIONS SET REVISED = 2222 WHERE ID = 3 AND VERSION = 1
-
-select ID, VERSION, CREATED, REVISED from DBREVISIONCACHE_REVISIONS
-
-select ID, VERSION, CREATED, REVISED from DBREVISIONCACHE_REVISIONS WHERE ID = 3 AND VERSION = 1
-
-SELECT id, version, created, revised FROM dbrevisioncache_revisions WHERE id = 3 AND created <= 1244129540039 AND (revised >= 1244129540039 OR revised = 0 )
-
-SELECT * FROM DBREVISIONCACHE_REVISIONS
-
-SELECT cdorevision, revised FROM dbrevisioncache_revisions WHERE id = 3 AND created <= 1244760465866 AND ( revised >= 1244760465866 OR revised = 0 ) AND resourcenode_name = 'container1'
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
deleted file mode 100644
index 0aec1e1530..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2009-2012, 2016 Eike Stepper (Loehne, 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
- * Andre Dietisheim - further implementations
- */
-package org.eclipse.emf.cdo.common.db;
-
-import org.eclipse.emf.cdo.common.id.CDOIDProvider;
-import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache;
-import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
-import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
-import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-
-/**
- * @author Eike Stepper
- * @since 3.0
- */
-public final class CDOCommonDBUtil
-{
- private CDOCommonDBUtil()
- {
- }
-
- /**
- * Creates and returns a new JDBC-based revision cache.
- * <p>
- * TODO Add all config parameters!
- */
- public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider, CDOListFactory listFactory,
- CDOPackageRegistry packageRegistry, CDORevisionFactory revisionFactory)
- {
- DBRevisionCache cache = new DBRevisionCache();
- cache.setDBAdapter(dbAdapter);
- cache.setDBConnectionProvider(dbConnectionProvider);
- cache.setListFactory(listFactory);
- cache.setPackageRegistry(packageRegistry);
- cache.setRevisionFactory(revisionFactory);
-
- // TODO Remove after branch "redesign-dangling" has been merged!
- cache.setIDProvider(CDOIDProvider.NOOP);
-
- return cache;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractDBAccessor.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractDBAccessor.java
deleted file mode 100644
index 0388a10426..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractDBAccessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2009-2012 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db;
-
-import org.eclipse.emf.cdo.common.internal.db.bundle.OM;
-
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * @author Andre Dietisheim
- */
-public abstract class AbstractDBAccessor
-{
- private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, AbstractDBAccessor.class);
-
- protected PreparedStatement getPreparedStatement(Connection connection) throws Exception
- {
- PreparedStatement preparedStatement = connection.prepareStatement(getSQL());
- setParameters(preparedStatement);
- TRACER.trace(getSQL());
- return preparedStatement;
- }
-
- public abstract String getSQL();
-
- protected abstract void setParameters(PreparedStatement statement) throws SQLException, Exception;
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java
deleted file mode 100644
index ee83de10a8..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2009-2012 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db;
-
-import org.eclipse.net4j.db.DBUtil;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-/**
- * @author Andre Dietisheim
- */
-public abstract class AbstractQueryStatement<Result> extends AbstractDBAccessor
-{
- public AbstractQueryStatement()
- {
- }
-
- public Result query(Connection connection) throws Exception
- {
- PreparedStatement preparedStatement = null;
-
- try
- {
- preparedStatement = getPreparedStatement(connection);
- ResultSet resultSet = preparedStatement.executeQuery();
- connection.commit();
- if (resultSet.next())
- {
- Result result = getResult(resultSet);
- resultSet.close();
- return result;
- }
-
- return null;
- }
- finally
- {
- DBUtil.close(preparedStatement);
- }
- }
-
- protected abstract Result getResult(ResultSet resultSet) throws Exception;
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractUpdateStatement.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractUpdateStatement.java
deleted file mode 100644
index 4618eff4de..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractUpdateStatement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, 2012 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.text.MessageFormat;
-
-/**
- * @author Andre Dietisheim
- */
-public abstract class AbstractUpdateStatement extends AbstractDBAccessor
-{
- public AbstractUpdateStatement()
- {
- }
-
- public void update(Connection connection) throws Exception
- {
- PreparedStatement preparedStatement = null;
- try
- {
- preparedStatement = getPreparedStatement(connection);
- preparedStatement.executeUpdate();
- if (preparedStatement.getUpdateCount() == 0)
- {
- throw new DBException(MessageFormat.format("No row inserted by statement \"{0}\"", getSQL()));
- }
-
- connection.commit();
- }
- finally
- {
- DBUtil.close(preparedStatement);
- }
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws Exception
- {
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
deleted file mode 100644
index fdde6c07d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db;
-
-import org.eclipse.emf.cdo.common.model.CDOModelConstants;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author Andre Dietisheim
- */
-public class DBRevisionCacheUtil
-{
- /**
- * Gets the name of a revision of a CDOResourceNode.
- * <p>
- * See bug 279817
- *
- * @param revision
- * the revision
- * @return the resource node name
- */
- // TODO: this should be refactored and put in a place, that's more generic
- // than this class. The same snippet's used in LRURevisionCache and
- // MemRevisionCache
- public static String getResourceNodeName(CDORevision revision)
- {
- CheckUtil.checkArg(revision.isResourceNode(), "The revision is not a resource node!");
- EStructuralFeature feature = revision.getEClass().getEStructuralFeature(CDOModelConstants.RESOURCE_NODE_NAME_ATTRIBUTE);
- return (String)((InternalCDORevision)revision).getValue(feature);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java
deleted file mode 100644
index 5729353ad3..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- *
- * @author Andre Dietisheim
- */
-public abstract class OM
-{
- public static final String BUNDLE_ID = "org.eclipse.emf.cdo.common.db"; //$NON-NLS-1$
-
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
- public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
- public static final OMLogger LOG = BUNDLE.logger();
-
- public static final class Activator extends OSGiActivator
- {
- public Activator()
- {
- super(BUNDLE);
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
deleted file mode 100644
index c0e6ccd2b8..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ /dev/null
@@ -1,852 +0,0 @@
-/*
- * Copyright (c) 2009-2013, 2016, 2019, 2020 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db.cache;
-
-import org.eclipse.emf.cdo.common.branch.CDOBranch;
-import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
-import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
-import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
-import org.eclipse.emf.cdo.common.commit.CDOCommitInfoManager;
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDProvider;
-import org.eclipse.emf.cdo.common.internal.db.AbstractQueryStatement;
-import org.eclipse.emf.cdo.common.internal.db.AbstractUpdateStatement;
-import org.eclipse.emf.cdo.common.internal.db.DBRevisionCacheUtil;
-import org.eclipse.emf.cdo.common.lob.CDOLobStore;
-import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
-import org.eclipse.emf.cdo.common.protocol.CDODataInput;
-import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
-import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
-import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
-import org.eclipse.emf.cdo.spi.common.protocol.CDODataInputImpl;
-import org.eclipse.emf.cdo.spi.common.protocol.CDODataOutputImpl;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionCache;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutput;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import org.eclipse.net4j.util.lifecycle.Lifecycle;
-
-import org.eclipse.emf.ecore.EClass;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-/**
- * A JDBC-based {@link CDORevisionCache}.
- *
- * @author Andre Dietisheim
- */
-public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCache
-{
- private CDOIDProvider idProvider;
-
- private CDOListFactory listFactory;
-
- private CDOPackageRegistry packageRegistry;
-
- private CDORevisionFactory revisionFactory;
-
- private IDBAdapter dbAdapter;
-
- private IDBConnectionProvider dbConnectionProvider;
-
- public DBRevisionCache()
- {
- }
-
- @Override
- public InternalCDORevisionCache instantiate(CDORevision revision)
- {
- // TODO: Support branches directly
- throw new UnsupportedOperationException();
- }
-
- public CDOIDProvider getIDProvider()
- {
- return idProvider;
- }
-
- public void setIDProvider(CDOIDProvider idProvider)
- {
- this.idProvider = idProvider;
- }
-
- public CDOListFactory getListFactory()
- {
- return listFactory;
- }
-
- public void setListFactory(CDOListFactory listFactory)
- {
- this.listFactory = listFactory;
- }
-
- public CDOPackageRegistry getPackageRegistry()
- {
- return packageRegistry;
- }
-
- public void setPackageRegistry(CDOPackageRegistry packageRegistry)
- {
- this.packageRegistry = packageRegistry;
- }
-
- public CDORevisionFactory getRevisionFactory()
- {
- return revisionFactory;
- }
-
- public void setRevisionFactory(CDORevisionFactory revisionFactory)
- {
- this.revisionFactory = revisionFactory;
- }
-
- public IDBAdapter getDBAdapter()
- {
- return dbAdapter;
- }
-
- public void setDBAdapter(IDBAdapter dbAdapter)
- {
- this.dbAdapter = dbAdapter;
- }
-
- public IDBConnectionProvider getDBConnectionProvider()
- {
- return dbConnectionProvider;
- }
-
- public void setDBConnectionProvider(IDBConnectionProvider dbConnectionProvider)
- {
- this.dbConnectionProvider = dbConnectionProvider;
- }
-
- @Override
- public EClass getObjectType(CDOID id)
- {
- return null;
- }
-
- /**
- * Gets the revision with the highest version for a given {@link CDOID}.
- *
- * @param id
- * the id to match
- * @return the revision that was found
- */
- public InternalCDORevision getRevision(final CDOID id)
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractQueryStatement<InternalCDORevision> query = createGetRevisionByIDStatement(id);
- sql = query.getSQL();
- return query.query(connection);
- }
- catch (Exception e)
- {
- throw new DBException("Error while retrieving the revision from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- private AbstractQueryStatement<InternalCDORevision> createGetRevisionByIDStatement(final CDOID id)
- {
- return new AbstractQueryStatement<InternalCDORevision>()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("SELECT "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CDOREVISION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(" FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" WHERE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_ID);
- builder.append("=? AND "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDORevision.UNSPECIFIED_DATE);
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws SQLException
- {
- preparedStatement.setString(1, id.toURIFragment());
- }
-
- @Override
- protected InternalCDORevision getResult(ResultSet resultSet) throws Exception
- {
- long revised = resultSet.getLong(2);
- Blob blob = resultSet.getBlob(1);
- return toRevision(blob, revised);
- }
- };
- }
-
- /**
- * Gets an {@link InternalCDORevision} that matches the given timestamp (it is >= created timestamp AND <= revised
- * timestamp of the revision).
- *
- * @param id
- * the id
- * @return the revision by time
- */
- @Override
- public InternalCDORevision getRevision(final CDOID id, final CDOBranchPoint branchPoint)
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractQueryStatement<InternalCDORevision> statement = new AbstractQueryStatement<InternalCDORevision>()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("SELECT "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CDOREVISION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(" FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" WHERE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_ID);
- builder.append("=? AND "); //$NON-NLS-1$
- appendTimestampCondition(builder);
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws SQLException
- {
- long timeStamp = branchPoint.getTimeStamp();
- preparedStatement.setString(1, id.toURIFragment());
- preparedStatement.setLong(2, timeStamp);
- preparedStatement.setLong(3, timeStamp);
- }
-
- @Override
- protected InternalCDORevision getResult(ResultSet resultSet) throws Exception
- {
- long revised = resultSet.getLong(2);
- Blob blob = resultSet.getBlob(1);
- return toRevision(blob, revised);
- }
- };
-
- sql = statement.getSQL();
- return statement.query(connection);
- }
- catch (Exception e)
- {
- throw new DBException("Error while retrieving a revision by timestamp from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- /**
- * Gets a {@link InternalCDORevision} by a given id and version.
- *
- * @param id
- * the id to match the revision against
- * @return the revision by version
- */
- @Override
- public InternalCDORevision getRevisionByVersion(final CDOID id, final CDOBranchVersion branchVersion)
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractQueryStatement<InternalCDORevision> statement = new AbstractQueryStatement<InternalCDORevision>()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("SELECT "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CDOREVISION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(" FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" WHERE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_ID);
- builder.append("=? AND "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_VERSION);
- builder.append("=?"); //$NON-NLS-1$
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws SQLException
- {
- preparedStatement.setString(1, id.toURIFragment());
- preparedStatement.setInt(2, branchVersion.getVersion());
- }
-
- @Override
- protected InternalCDORevision getResult(ResultSet resultSet) throws Exception
- {
- long revised = resultSet.getLong(2);
- Blob blob = resultSet.getBlob(1);
- return toRevision(blob, revised);
- }
- };
-
- sql = statement.getSQL();
- return statement.query(connection);
- }
- catch (Exception e)
- {
- throw new DBException("Error while retrieving a revision by version from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- /**
- * Gets the latest revisions of all persisted model versions.
- *
- * @return the revisions
- */
- @Override
- public List<CDORevision> getCurrentRevisions()
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractQueryStatement<List<CDORevision>> query = new AbstractQueryStatement<List<CDORevision>>()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("SELECT "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CDOREVISION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(" FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" WHERE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDORevision.UNSPECIFIED_DATE);
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws SQLException
- {
- }
-
- @Override
- protected List<CDORevision> getResult(ResultSet resultSet) throws Exception
- {
- final List<CDORevision> revisionList = new ArrayList<>();
-
- do
- {
- long revised = resultSet.getLong(2);
- Blob blob = resultSet.getBlob(1);
- revisionList.add(toRevision(blob, revised));
- } while (resultSet.next());
-
- return revisionList;
- }
- };
-
- sql = query.getSQL();
- return query.query(connection);
- }
- catch (Exception e)
- {
- throw new DBException("Error while retrieving a revision by version from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- @Override
- public void forEachCurrentRevision(Consumer<CDORevision> consumer)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void getAllRevisions(List<InternalCDORevision> result)
- {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Adds a given revision to this cache. It furthermore updates the revised timestamp of the latest (before inserting
- * the new one) revision
- *
- * @param revision
- * the revision to add to this cache
- */
- @Override
- public void addRevision(CDORevision revision)
- {
- CheckUtil.checkArg(revision, "revision");
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractUpdateStatement update = createAddRevisionStatement((InternalCDORevision)revision);
- sql = update.getSQL();
- update.update(connection);
-
- if (revision.getVersion() > CDORevision.FIRST_VERSION)
- {
- // Update former latest revision
- update = createUpdateRevisedStatement((InternalCDORevision)revision);
- update.update(connection);
- }
- }
- catch (DBException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw new DBException("Error while retrieving the revision from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- private AbstractUpdateStatement createUpdateRevisedStatement(final InternalCDORevision revision)
- {
- return new AbstractUpdateStatement()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("UPDATE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" SET "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(" =? WHERE "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_ID);
- builder.append(" =? AND "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_VERSION);
- builder.append(" =?"); //$NON-NLS-1$
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws SQLException
- {
- preparedStatement.setLong(1, revision.getTimeStamp() - 1);
- preparedStatement.setString(2, revision.getID().toURIFragment());
- preparedStatement.setInt(3, revision.getVersion() - 1);
- }
- };
- }
-
- private AbstractUpdateStatement createAddRevisionStatement(final InternalCDORevision revision)
- {
- return new AbstractUpdateStatement()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("INSERT INTO "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" ("); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_ID);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_VERSION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CREATED);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CDOREVISION);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_RESOURCENODE_NAME);
- builder.append(", "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_CONTAINERID);
- builder.append(") "); //$NON-NLS-1$
- builder.append(" VALUES (?, ?, ?, ?, ?, ? ,?)"); //$NON-NLS-1$
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws Exception
- {
- preparedStatement.setString(1, revision.getID().toURIFragment());
- preparedStatement.setInt(2, revision.getVersion());
- preparedStatement.setLong(3, revision.getTimeStamp());
- preparedStatement.setLong(4, revision.getRevised());
- preparedStatement.setBytes(5, toBytes(revision));
- setResourceNodeValues(revision, preparedStatement);
- }
-
- /**
- * Sets the values in the prepared statment, that are related to the given revision. If the revision is a resource
- * node, the values are set otherwise the fields are set to <tt>null</tt>
- *
- * @param revision
- * the revision
- * @param preparedStatement
- * the prepared statement
- * @throws SQLException
- * the SQL exception
- */
- private void setResourceNodeValues(InternalCDORevision revision, PreparedStatement preparedStatement) throws SQLException
- {
- if (revision.isResourceNode())
- {
- preparedStatement.setString(6, DBRevisionCacheUtil.getResourceNodeName(revision));
- CDOID containerID = (CDOID)revision.getContainerID();
- preparedStatement.setString(7, containerID.toURIFragment());
- }
- else
- {
- preparedStatement.setNull(6, Types.VARCHAR);
- preparedStatement.setNull(7, Types.INTEGER);
- }
- }
- };
- }
-
- /**
- * Removes a revision by its Id and version. If the given revision does not exist <tt>null</tt> is returned. Otherwise
- * the {@link InternalCDORevision}, that was removed is returned
- *
- * @param id
- * the id of the revision to remove
- * @return the {@link InternalCDORevision} that was removed, <tt>null</tt> otherwise
- */
- @Override
- public InternalCDORevision removeRevision(CDOID id, CDOBranchVersion branchVersion)
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- final InternalCDORevision revision = getRevisionByVersion(id, branchVersion);
- if (revision != null)
- {
- connection = getConnection();
- AbstractUpdateStatement statement = new AbstractUpdateStatement()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("DELETE FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- builder.append(" WHERE ID =? AND VERSION =?"); //$NON-NLS-1$
- return builder.toString();
- }
-
- @Override
- protected void setParameters(PreparedStatement preparedStatement) throws Exception
- {
- preparedStatement.setString(1, revision.getID().toURIFragment());
- preparedStatement.setInt(2, revision.getVersion());
- }
- };
-
- sql = statement.getSQL();
- statement.update(connection);
- }
-
- return revision;
- }
- catch (Exception e)
- {
- throw new DBException("Error while removing a revision from the database", e, sql); //$NON-NLS-1$
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- /**
- * Removes all revisions from this cache (and its database).
- */
- @Override
- public void clear()
- {
- Connection connection = null;
- String sql = null;
-
- try
- {
- connection = getConnection();
- AbstractUpdateStatement update = new AbstractUpdateStatement()
- {
- @Override
- public String getSQL()
- {
- StringBuilder builder = new StringBuilder();
- builder.append("DELETE FROM "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS);
- return builder.toString();
- }
- };
-
- sql = update.getSQL();
- update.update(connection);
- }
- catch (Exception e)
- {
- throw new DBException("Error while clearing the database", e, sql);
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- @Override
- public Map<CDOBranch, List<CDORevision>> getAllRevisions()
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public List<CDORevision> getRevisions(CDOBranchPoint branchPoint)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected void doBeforeActivate() throws Exception
- {
- super.doBeforeActivate();
- checkState(idProvider, "idProvider"); //$NON-NLS-1$
- checkState(listFactory, "listFactory");//$NON-NLS-1$
- checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
- checkState(revisionFactory, "revisionFactory"); //$NON-NLS-1$
- checkState(dbAdapter, "dbAdapter"); //$NON-NLS-1$
- checkState(dbConnectionProvider, "dbConnectionProvider"); //$NON-NLS-1$
- }
-
- @Override
- protected void doActivate() throws Exception
- {
- super.doActivate();
- createTable();
- }
-
- /**
- * Creates the (single) table that's used to store the cached revisions.
- *
- * @throws SQLException
- * Signals that an error has occured while getting the connection or committing the transaction
- */
- private void createTable() throws SQLException
- {
- Connection connection = null;
-
- try
- {
- connection = getConnection();
- DBRevisionCacheSchema.INSTANCE.create(dbAdapter, connection);
- connection.commit();
- }
- finally
- {
- DBUtil.close(connection);
- }
- }
-
- private static StringBuilder appendTimestampCondition(StringBuilder builder)
- {
- builder.append(DBRevisionCacheSchema.REVISIONS_CREATED);
- builder.append("<=? AND ("); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append(">=? OR "); //$NON-NLS-1$
- builder.append(DBRevisionCacheSchema.REVISIONS_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDORevision.UNSPECIFIED_DATE);
- builder.append(")"); //$NON-NLS-1$
- return builder;
- }
-
- /**
- * Converts the given Objects to an {@link InternalCDORevision}. The object is deserialized to an instance of the
- * correct type and the revised timestamp is set separatley. Whe you insert a new revision into this cache, the former
- * latest revision gets a new revised timestamp. This timestamp's only updated in the database column 'revised', not
- * in the blob that holds the serialized instance. Therefore the revised timestamp has to be set separately
- *
- * @param revisedTimestamp
- * the revised timestamp to set to the revision
- * @param blob
- * the blob that holds the revision
- * @return the revision
- * @throws IOException
- * Signals that an error has occurred while reading the revision from the blob.
- * @throws SQLException
- * Signals that an error hass occured while getting the binary stream from the blob
- */
- private InternalCDORevision toRevision(Blob blob, long revisedTimestamp) throws IOException, SQLException
- {
- CDODataInput dataInput = getCDODataInput(ExtendedDataInputStream.wrap(blob.getBinaryStream()));
- InternalCDORevision revision = (InternalCDORevision)dataInput.readCDORevision();
- // Revised timestamp's updated in the revised column only (not in the blob)
- revision.setRevised(revisedTimestamp);
- return revision;
- }
-
- private CDODataInput getCDODataInput(ExtendedDataInputStream inputStream) throws IOException
- {
- return new CDODataInputImpl(inputStream)
- {
- @Override
- public CDOPackageRegistry getPackageRegistry()
- {
- return packageRegistry;
- }
-
- @Override
- protected CDOBranchManager getBranchManager()
- {
- return null;
- }
-
- @Override
- protected CDOCommitInfoManager getCommitInfoManager()
- {
- return null;
- }
-
- @Override
- protected CDORevisionFactory getRevisionFactory()
- {
- return revisionFactory;
- }
-
- @Override
- protected CDOListFactory getListFactory()
- {
- return listFactory;
- }
-
- @Override
- protected CDOLobStore getLobStore()
- {
- return null;
- }
- };
- }
-
- /**
- * Converts a given {@link CDORevision} to a byte array.
- *
- * @param revision
- * the revision
- * @return the array of bytes for the given revision
- * @throws IOException
- * Signals an error has occurred while writing the revision to the byte array.
- */
- private byte[] toBytes(InternalCDORevision revision) throws IOException
- {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- CDODataOutput dataOutput = getCDODataOutput(ExtendedDataOutputStream.wrap(byteArrayOutputStream));
- dataOutput.writeCDORevision(revision, CDORevision.UNCHUNKED);
- return byteArrayOutputStream.toByteArray();
- }
-
- private CDODataOutput getCDODataOutput(ExtendedDataOutput extendedDataOutputStream)
- {
- return new CDODataOutputImpl(extendedDataOutputStream)
- {
- @Override
- public CDOPackageRegistry getPackageRegistry()
- {
- return packageRegistry;
- }
-
- @Override
- public CDOIDProvider getIDProvider()
- {
- return idProvider;
- }
- };
- }
-
- /**
- * Gets a connection from the {@link IDBConnectionProvider} within this cache. The Connection is set not to auto
- * commit transactions.
- *
- * @return the connection
- * @throws SQLException
- * Signals that an error occured while getting the connection from the connection provider
- */
- private Connection getConnection() throws SQLException
- {
- Connection connection = dbConnectionProvider.getConnection();
- connection.setAutoCommit(false);
- return connection;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java
deleted file mode 100644
index 6b4819ef7b..0000000000
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2009, 2011-2013, 2015 Eike Stepper (Loehne, 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:
- * Andre Dietisheim - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.common.internal.db.cache;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.spi.db.ddl.InternalDBSchema;
-
-/**
- * @author Andre Dietisheim
- */
-public class DBRevisionCacheSchema
-{
- public static final IDBSchema INSTANCE = DBUtil.createSchema("DBRevisionCache");
-
- /**
- * DBTable dbrevisioncache_revisions.
- * <p>
- * TODO Make name configurable!
- */
- public static final IDBTable REVISIONS = INSTANCE.addTable("dbrevisioncache_revisions");
-
- public static final IDBField REVISIONS_ID = //
- REVISIONS.addField("id", DBType.VARCHAR, 254);
-
- public static final IDBField REVISIONS_VERSION = //
- REVISIONS.addField("version", DBType.INTEGER);
-
- public static final IDBField REVISIONS_CREATED = //
- REVISIONS.addField("created", DBType.BIGINT);
-
- public static final IDBField REVISIONS_REVISED = //
- REVISIONS.addField("revised", DBType.BIGINT);
-
- public static final IDBField REVISIONS_CDOREVISION = //
- REVISIONS.addField("revision", DBType.BLOB);
-
- public static final IDBField REVISIONS_RESOURCENODE_NAME = //
- REVISIONS.addField("resourcenode_name", DBType.VARCHAR, false);
-
- public static final IDBField REVISIONS_CONTAINERID = //
- REVISIONS.addField("container_id", DBType.BIGINT, false);
-
- public static final IDBIndex INDEX_REVISIONS_RESOURCENODENAME = //
- REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_RESOURCENODE_NAME);
-
- public static final IDBIndex INDEX_REVISIONS_ID = //
- REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_ID);
-
- public static final IDBIndex INDEX_REVISIONS_VERSION = //
- REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_VERSION);
-
- public static final IDBIndex INDEX_REVISIONS_PK = //
- REVISIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, REVISIONS_ID, REVISIONS_VERSION);
-
- public static final IDBIndex INDEX_REVISIONS_CONTAINERID = //
- REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_CONTAINERID);
-
- static
- {
- ((InternalDBSchema)INSTANCE).lock();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
index f939de8ae9..2605b19243 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
index 8995fe09e5..6c6d43baee 100644
--- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.common;singleton:=true
-Bundle-Version: 4.12.0.qualifier
+Bundle-Version: 4.13.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,21 +15,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
- org.eclipse.emf.cdo.common.admin;version="4.12.0",
- org.eclipse.emf.cdo.common.branch;version="4.12.0",
- org.eclipse.emf.cdo.common.commit;version="4.12.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.12.0",
- org.eclipse.emf.cdo.common.id;version="4.12.0",
- org.eclipse.emf.cdo.common.lob;version="4.12.0",
- org.eclipse.emf.cdo.common.lock;version="4.12.0",
- org.eclipse.emf.cdo.common.model;version="4.12.0",
- org.eclipse.emf.cdo.common.protocol;version="4.12.0",
- org.eclipse.emf.cdo.common.revision;version="4.12.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.12.0",
- org.eclipse.emf.cdo.common.security;version="4.12.0",
- org.eclipse.emf.cdo.common.util;version="4.12.0",
- org.eclipse.emf.cdo.internal.common;version="4.12.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.13.0",
+ org.eclipse.emf.cdo.common.admin;version="4.13.0",
+ org.eclipse.emf.cdo.common.branch;version="4.13.0",
+ org.eclipse.emf.cdo.common.commit;version="4.13.0",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.13.0",
+ org.eclipse.emf.cdo.common.id;version="4.13.0",
+ org.eclipse.emf.cdo.common.lob;version="4.13.0",
+ org.eclipse.emf.cdo.common.lock;version="4.13.0",
+ org.eclipse.emf.cdo.common.model;version="4.13.0",
+ org.eclipse.emf.cdo.common.protocol;version="4.13.0",
+ org.eclipse.emf.cdo.common.revision;version="4.13.0",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.13.0",
+ org.eclipse.emf.cdo.common.security;version="4.13.0",
+ org.eclipse.emf.cdo.common.util;version="4.13.0",
+ org.eclipse.emf.cdo.internal.common;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -38,10 +38,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.branch;version="4.12.0";
- x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.12.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.12.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.13.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.13.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -50,7 +49,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.id;version="4.12.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -61,9 +60,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.admin,
org.eclipse.emf.cdo.server.admin",
- org.eclipse.emf.cdo.internal.common.lock;version="4.12.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.12.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.12.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.13.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.13.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -72,7 +71,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision;version="4.12.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -81,7 +80,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="4.12.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.13.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -90,14 +89,24 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.12.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.spi.common;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.12.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.12.0"
+ org.eclipse.emf.cdo.internal.common.util;version="4.13.0";
+ x-friends:="org.eclipse.emf.cdo.common,
+ org.eclipse.emf.cdo.common.db,
+ org.eclipse.emf.cdo,
+ org.eclipse.emf.cdo.net4j,
+ org.eclipse.emf.cdo.server,
+ org.eclipse.emf.cdo.server.net4j,
+ org.eclipse.emf.cdo.ui,
+ org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.spi.common;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.id;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.model;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.13.0",
+ org.eclipse.emf.cdo.spi.common.util;version="4.13.0"
Automatic-Module-Name: org.eclipse.emf.cdo.common
Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index 7567a8beed..fc817252da 100644
--- a/plugins/org.eclipse.emf.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.common/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2021 Eike Stepper (Loehne, 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
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.common</artifactId>
- <version>4.12.0-SNAPSHOT</version>
+ <version>4.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
index 20cb033785..f3e76c73cd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
@@ -12,8 +12,12 @@ package org.eclipse.emf.cdo.common.lob;
import org.eclipse.emf.cdo.spi.common.CDOLobStoreImpl;
+import org.eclipse.net4j.util.HexUtil;
import org.eclipse.net4j.util.io.ExtendedDataInput;
+import org.eclipse.net4j.util.io.IOUtil;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -35,6 +39,22 @@ public final class CDOBlob extends CDOLob<InputStream>
super(contents, store);
}
+ /**
+ * @since 4.13
+ */
+ public CDOBlob(byte[] contents, CDOLobStore store) throws IOException
+ {
+ super(new ByteArrayInputStream(contents), store);
+ }
+
+ /**
+ * @since 4.13
+ */
+ public CDOBlob(String contents, CDOLobStore store) throws IOException
+ {
+ super(new ByteArrayInputStream(HexUtil.hexToBytes(contents)), store);
+ }
+
CDOBlob(byte[] id, long size)
{
super(id, size);
@@ -51,6 +71,36 @@ public final class CDOBlob extends CDOLob<InputStream>
return getStore().getBinary(this);
}
+ /**
+ * @since 4.13
+ */
+ public byte[] getBytes() throws IOException
+ {
+ InputStream inputStream = null;
+
+ try
+ {
+ inputStream = getContents();
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ IOUtil.copy(inputStream, outputStream);
+ return outputStream.toByteArray();
+ }
+ finally
+ {
+ IOUtil.close(inputStream);
+ }
+ }
+
+ /**
+ * @since 4.13
+ */
+ @Override
+ public String getString() throws IOException
+ {
+ return HexUtil.bytesToHex(getBytes());
+ }
+
@Override
protected CDOLobInfo put(InputStream contents) throws IOException
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
index fdbcb5fdd4..a51bd4b380 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
@@ -13,9 +13,12 @@ package org.eclipse.emf.cdo.common.lob;
import org.eclipse.emf.cdo.spi.common.CDOLobStoreImpl;
import org.eclipse.net4j.util.io.ExtendedDataInput;
+import org.eclipse.net4j.util.io.IOUtil;
+import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.Reader;
+import java.io.StringReader;
/**
* An identifiable character large object with streaming support.
@@ -35,6 +38,14 @@ public final class CDOClob extends CDOLob<Reader>
super(contents, store);
}
+ /**
+ * @since 4.13
+ */
+ public CDOClob(String contents, CDOLobStore store) throws IOException
+ {
+ super(new StringReader(contents), store);
+ }
+
CDOClob(byte[] id, long size)
{
super(id, size);
@@ -51,6 +62,28 @@ public final class CDOClob extends CDOLob<Reader>
return getStore().getCharacter(this);
}
+ /**
+ * @since 4.13
+ */
+ @Override
+ public String getString() throws IOException
+ {
+ Reader reader = null;
+
+ try
+ {
+ reader = getContents();
+
+ CharArrayWriter writer = new CharArrayWriter();
+ IOUtil.copyCharacter(reader, writer);
+ return writer.toString();
+ }
+ finally
+ {
+ IOUtil.close(reader);
+ }
+ }
+
@Override
protected CDOLobInfo put(Reader contents) throws IOException
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
index ef0079aa1f..97084f6b17 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
@@ -65,5 +65,10 @@ public abstract class CDOLob<IO> extends CDOLobInfo
public abstract IO getContents() throws IOException;
+ /**
+ * @since 4.13
+ */
+ public abstract String getString() throws IOException;
+
protected abstract CDOLobInfo put(IO contents) throws IOException;
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
index d2ff1ad83a..0da44623d7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
@@ -13,6 +13,8 @@ package org.eclipse.emf.cdo.common.lob;
import org.eclipse.net4j.util.HexUtil;
import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Objects;
/**
* Encapsulates {@link #getID() ID} and {@link #getSize() size} of a {@link CDOLob large object}.
@@ -62,6 +64,33 @@ public class CDOLobInfo
}
@Override
+ public final int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + Arrays.hashCode(id);
+ result = prime * result + Objects.hash(size);
+ return result;
+ }
+
+ @Override
+ public final boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (!(obj instanceof CDOLobInfo))
+ {
+ return false;
+ }
+
+ CDOLobInfo other = (CDOLobInfo)obj;
+ return Arrays.equals(id, other.id) && size == other.size;
+ }
+
+ @Override
public String toString()
{
return MessageFormat.format("{0}[id={1}, size={2}]", getClass().getSimpleName(), getIDString(), size);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
index f39f5bd577..8c50655d1c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
@@ -16,7 +16,6 @@ import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.om.OMPlatform;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -171,7 +170,7 @@ public final class CDOPackageTypeRegistry
}
EPackage topLevelPackage = EMFUtil.getTopLevelPackage(ePackage);
- EClass eClass = getAnyConcreteEClass(topLevelPackage);
+ EClass eClass = EMFUtil.getAnyConcreteEClass(topLevelPackage, true);
if (eClass != null)
{
EObject testObject = EcoreUtil.create(eClass);
@@ -186,32 +185,6 @@ public final class CDOPackageTypeRegistry
return null;
}
- private static EClass getAnyConcreteEClass(EPackage ePackage)
- {
- for (EClassifier classifier : ePackage.getEClassifiers())
- {
- if (classifier instanceof EClass)
- {
- EClass eClass = (EClass)classifier;
- if (!(eClass.isAbstract() || eClass.isInterface()))
- {
- return eClass;
- }
- }
- }
-
- for (EPackage subpackage : ePackage.getESubpackages())
- {
- EClass eClass = getAnyConcreteEClass(subpackage);
- if (eClass != null)
- {
- return eClass;
- }
- }
-
- return null;
- }
-
/**
* A common marker interface for CDO (native) objects.
*
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
index e9a13cfd6c..a1d3ac6eae 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageUnit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2012, 2015, 2019, 2021 Eike Stepper (Loehne, 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
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
import org.eclipse.emf.cdo.internal.common.messages.Messages;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EPackage.Registry;
@@ -150,28 +151,29 @@ public interface CDOPackageUnit extends Comparable<CDOPackageUnit>, CDOTimeProvi
}
/**
- * Describes the instances of {@link EClass classes} of a {@link CDOPackageUnit package unit}.
+ * Describes the {@link EObject instances} of {@link EClass classes} of a {@link CDOPackageUnit package unit}.
*
* @author Eike Stepper
*/
public enum Type
{
/**
- * The type of models that are generated specifically for the usage with CDO. Instances of {@link EClass classes} of
- * these models can be directly cast to InternalCDOObject.
+ * The type of models that are generated specifically for the usage with CDO. {@link EObject Instances} of {@link EClass classes} of
+ * these models can be directly cast to <code>CDOObject</code>.
*/
NATIVE,
/**
- * The type of models that are <b>not</b> generated specifically for the usage with CDO. Instances of {@link EClass
- * classes} of these models can <b>not</b> be directly cast to InternalCDOObject.
+ * The type of models that are <b>not</b> generated specifically for the usage with CDO. {@link EObject Instances} of {@link EClass
+ * classes} of these models can <b>not</b> be directly cast to <code>CDOObject</code>. The static utility method
+ * <code>CDOUtil.getCDOObject(eObject)</code> can be used to obtain a <code>CDOObject</code>.
*/
LEGACY,
/**
- * The type of models that are not generated <b>at all</b> but rather dynamically contructed at runtime. Instances
- * of {@link EClass classes} of these models <b>can</b> be directly cast to InternalCDOObject, i.e. they're
- * implicitely <i>native</i>.
+ * The type of models that are not generated <b>at all</b> but rather dynamically constructed at runtime. {@link EObject Instances}
+ * of {@link EClass classes} of these models <b>can</b> be directly cast to <code>CDOObject</code>, i.e. they're
+ * implicitly {@link #NATIVE}.
*/
DYNAMIC,
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index 4a9e33d750..8ebfe2a4e9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015, 2016, 2018-2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2016, 2018-2021 Eike Stepper (Loehne, 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
@@ -203,6 +203,8 @@ public final class EMFUtil
}
};
+ private static final EPackage.Registry[] GLOBAL_REGISTRY_ARRAY = { EPackage.Registry.INSTANCE };
+
private EMFUtil()
{
}
@@ -412,6 +414,38 @@ public final class EMFUtil
}
}
+ /**
+ * @since 4.13
+ */
+ public static EClass getAnyConcreteEClass(EPackage ePackage, boolean includeSubPackages)
+ {
+ for (EClassifier classifier : ePackage.getEClassifiers())
+ {
+ if (classifier instanceof EClass)
+ {
+ EClass eClass = (EClass)classifier;
+ if (!(eClass.isAbstract() || eClass.isInterface()))
+ {
+ return eClass;
+ }
+ }
+ }
+
+ if (includeSubPackages)
+ {
+ for (EPackage subpackage : ePackage.getESubpackages())
+ {
+ EClass eClass = getAnyConcreteEClass(subpackage, true);
+ if (eClass != null)
+ {
+ return eClass;
+ }
+ }
+ }
+
+ return null;
+ }
+
public static EClass[] getPersistentClasses(EPackage ePackage)
{
List<EClass> result = new ArrayList<>();
@@ -505,10 +539,10 @@ public final class EMFUtil
public static void registerPackage(EPackage ePackage, EPackage.Registry... packageRegistries)
{
ePackage.getClass(); // Initialize package in standalone mode
- if (packageRegistries == null || packageRegistries.length == 0)
+
+ if (packageRegistries.length == 0)
{
- EPackage.Registry[] globalRegistry = { EPackage.Registry.INSTANCE };
- packageRegistries = globalRegistry;
+ packageRegistries = GLOBAL_REGISTRY_ARRAY;
}
for (EPackage.Registry packageRegistry : packageRegistries)
@@ -592,6 +626,7 @@ public final class EMFUtil
{
@SuppressWarnings("unchecked")
T adapter = (T)EcoreUtil.getAdapter(notifier.eAdapters(), type);
+
return adapter;
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/URIHandlerRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/URIHandlerRegistry.java
new file mode 100644
index 0000000000..5be31499ac
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/URIHandlerRegistry.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Eike Stepper (Loehne, 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
+ */
+package org.eclipse.emf.cdo.common.util;
+
+import org.eclipse.emf.cdo.internal.common.util.URIHandlerRegistryImpl;
+
+import org.eclipse.emf.ecore.resource.URIHandler;
+
+/**
+ * @author Eike Stepper
+ * @since 4.13
+ */
+public interface URIHandlerRegistry
+{
+ public static final URIHandlerRegistry INSTANCE = URIHandlerRegistryImpl.INSTANCE;
+
+ public URIHandler addURIHandler(String scheme, URIHandler handler);
+
+ public URIHandler removeURIHandler(String scheme);
+
+ public URIHandler getURIHandler(String scheme);
+}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
index 9458feef94..6330a7be33 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
@@ -10,12 +10,22 @@
*/
package org.eclipse.emf.cdo.internal.common.bundle;
+import org.eclipse.emf.cdo.internal.common.util.URIHandlerRegistryImpl;
+
+import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.om.OMBundle;
import org.eclipse.net4j.util.om.OMPlatform;
import org.eclipse.net4j.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.log.OMLogger;
import org.eclipse.net4j.util.om.trace.OMTracer;
+import org.eclipse.emf.ecore.resource.URIHandler;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* The <em>Operations & Maintenance</em> class of this bundle.
*
@@ -54,5 +64,25 @@ public abstract class OM
{
super(BUNDLE);
}
+
+ @Override
+ protected void doStart() throws Exception
+ {
+ super.doStart();
+
+ try
+ {
+ List<URIHandler> defaultHandlers = new ArrayList<>();
+ defaultHandlers.add(URIHandlerRegistryImpl.INSTANCE);
+ defaultHandlers.addAll(URIHandler.DEFAULT_HANDLERS);
+
+ Field field = ReflectUtil.getField(URIHandler.class, "DEFAULT_HANDLERS");
+ ReflectUtil.setValue(field, null, Collections.unmodifiableList(defaultHandlers), true);
+ }
+ catch (Throwable t)
+ {
+ LOG.error(t);
+ }
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java
new file mode 100644
index 0000000000..56585c6451
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2020 Eike Stepper (Loehne, 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
+ */
+package org.eclipse.emf.cdo.internal.common.util;
+
+import org.eclipse.emf.cdo.common.util.URIHandlerRegistry;
+import org.eclipse.emf.cdo.internal.common.bundle.OM;
+import org.eclipse.emf.cdo.spi.common.util.URIHandlerFactory;
+
+import org.eclipse.net4j.util.container.ContainerEventAdapter;
+import org.eclipse.net4j.util.container.IContainer;
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.factory.IFactory;
+import org.eclipse.net4j.util.factory.IFactoryKey;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.URIHandler;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author Eike Stepper
+ */
+public final class URIHandlerRegistryImpl implements URIHandlerRegistry, URIHandler
+{
+ public static final URIHandlerRegistryImpl INSTANCE = new URIHandlerRegistryImpl();
+
+ private final Map<String, URIHandler> handlers = new HashMap<>();
+
+ private boolean initialized;
+
+ private URIHandlerRegistryImpl()
+ {
+ }
+
+ private void initialize()
+ {
+ if (!initialized)
+ {
+ initialized = true;
+
+ for (String scheme : IPluginContainer.INSTANCE.getFactoryTypes(URIHandlerFactory.PRODUCT_GROUP))
+ {
+ try
+ {
+ URIHandler handler = (URIHandler)IPluginContainer.INSTANCE.getElement(URIHandlerFactory.PRODUCT_GROUP, scheme, null);
+ addURIHandler(scheme, handler);
+ }
+ catch (Exception ex)
+ {
+ OM.LOG.error(ex);
+ }
+ }
+
+ IPluginContainer.INSTANCE.getFactoryRegistry().addListener(new ContainerEventAdapter<Map.Entry<IFactoryKey, IFactory>>()
+ {
+ @Override
+ protected void onAdded(IContainer<Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
+ {
+ String scheme = getScheme(element);
+ if (scheme != null)
+ {
+ URIHandler handler = (URIHandler)IPluginContainer.INSTANCE.getElement(URIHandlerFactory.PRODUCT_GROUP, scheme, null);
+ addURIHandler(scheme, handler);
+ }
+ }
+
+ @Override
+ protected void onRemoved(IContainer<Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
+ {
+ String scheme = getScheme(element);
+ if (scheme != null)
+ {
+ removeURIHandler(scheme);
+ }
+ }
+
+ private String getScheme(Map.Entry<IFactoryKey, IFactory> element)
+ {
+ IFactoryKey key = element.getKey();
+ if (URIHandlerFactory.PRODUCT_GROUP.equals(key.getProductGroup()))
+ {
+ return key.getType();
+ }
+
+ return null;
+ }
+ });
+ }
+ }
+
+ @Override
+ public synchronized URIHandler addURIHandler(String scheme, URIHandler handler)
+ {
+ initialize();
+ return handlers.put(scheme, handler);
+ }
+
+ @Override
+ public synchronized URIHandler removeURIHandler(String scheme)
+ {
+ initialize();
+ return handlers.remove(scheme);
+ }
+
+ @Override
+ public synchronized URIHandler getURIHandler(String scheme)
+ {
+ initialize();
+ return handlers.get(scheme);
+ }
+
+ private URIHandler getHandler(URI uri)
+ {
+ return getURIHandler(uri.scheme());
+ }
+
+ @Override
+ public boolean canHandle(URI uri)
+ {
+ URIHandler handler = getHandler(uri);
+ return handler != null && handler.canHandle(uri);
+ }
+
+ @Override
+ public boolean exists(URI uri, Map<?, ?> options)
+ {
+ return getHandler(uri).exists(uri, options);
+ }
+
+ @Override
+ public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException
+ {
+ return getHandler(uri).contentDescription(uri, options);
+ }
+
+ @Override
+ public Map<String, ?> getAttributes(URI uri, Map<?, ?> options)
+ {
+ return getHandler(uri).getAttributes(uri, options);
+ }
+
+ @Override
+ public void setAttributes(URI uri, Map<String, ?> attributes, Map<?, ?> options) throws IOException
+ {
+ getHandler(uri).setAttributes(uri, attributes, options);
+ }
+
+ @Override
+ public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException
+ {
+ return getHandler(uri).createInputStream(uri, options);
+ }
+
+ @Override
+ public OutputStream createOutputStream(URI uri, Map<?, ?> options) throws IOException
+ {
+ return getHandler(uri).createOutputStream(uri, options);
+ }
+
+ @Override
+ public void delete(URI uri, Map<?, ?> options) throws IOException
+ {
+ getHandler(uri).delete(uri, options);
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/util/URIHandlerFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/util/URIHandlerFactory.java
new file mode 100644
index 0000000000..77f3d98cdb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/util/URIHandlerFactory.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020 Eike Stepper (Loehne, 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
+ */
+package org.eclipse.emf.cdo.spi.common.util;
+
+import org.eclipse.net4j.util.factory.Factory;
+import org.eclipse.net4j.util.factory.ProductCreationException;
+
+import org.eclipse.emf.ecore.resource.URIHandler;
+
+/**
+ * @author Eike Stepper
+ * @since 4.13
+ */
+public abstract class URIHandlerFactory extends Factory
+{
+ public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.common.util.uriHandlers";
+
+ public URIHandlerFactory(String type)
+ {
+ super(PRODUCT_GROUP, type);
+ }
+
+ @Override
+ public abstract URIHandler create(String description) throws ProductCreationException;
+}
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
index 539a70541a..96a6f6aa84 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.compare" version="2">
- <resource path="src/org/eclipse/emf/cdo/compare/CDOCompare.java" type="org.eclipse.emf.cdo.compare.CDOCompare$CDOIDFunction">
- <filter id="337682486">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.compare.CDOCompare.CDOIDFunction"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java" type="org.eclipse.emf.cdo.compare.CDOComparisonScope$Minimal">
<filter id="337682486">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
index f939de8ae9..2605b19243 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
index 2de9ee40a3..bec0ead7f8 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -1,17 +1,18 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.compare; singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-SymbolicName: org.eclipse.emf.cdo.compare;singleton:=true
+Bundle-Version: 4.5.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.emf.cdo.internal.compare.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.compare;version="4.4.1",
- org.eclipse.emf.cdo.internal.compare.bundle;version="4.4.1";x-friends:="org.eclipse.emf.cdo.tests"
+ org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.compare.rcp;bundle-version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy
+Export-Package: org.eclipse.emf.cdo.compare;version="4.5.0",
+ org.eclipse.emf.cdo.internal.compare.bundle;version="4.5.0";x-friends:="org.eclipse.emf.cdo.tests"
Bundle-ActivationPolicy: lazy
Import-Package: com.google.common.base;version="[15.0.0,28.0.0)",
com.google.common.collect;version="[15.0.0,28.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.compare/buckminster.cspex b/plugins/org.eclipse.emf.cdo.compare/buckminster.cspex
deleted file mode 100644
index b571ac68a7..0000000000
--- a/plugins/org.eclipse.emf.cdo.compare/buckminster.cspex
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
-
- <cs:dependencies>
- <cs:dependency name="com.google.guava" componentType="osgi.bundle" versionDesignator="[11.0.0,16.0.0)"/>
- <cs:dependency name="org.apache.log4j" componentType="osgi.bundle"/>
- </cs:dependencies>
-
-</cs:cspecExtension> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.compare/build.properties b/plugins/org.eclipse.emf.cdo.compare/build.properties
index 09e99f233e..2a51ea84e5 100644
--- a/plugins/org.eclipse.emf.cdo.compare/build.properties
+++ b/plugins/org.eclipse.emf.cdo.compare/build.properties
@@ -13,10 +13,11 @@ bin.includes = .,\
META-INF/,\
plugin.properties,\
.options,\
- about.html
+ about.html,\
+ plugin.xml
src.includes = about.html,\
- buckminster.cspex,\
- pom.xml
+ pom.xml,\
+ docs/
jars.compile.order = .
additional.bundles = javax.annotation
source.. = src/
diff --git a/plugins/org.eclipse.emf.cdo.compare/docs/CDOCompare.png b/plugins/org.eclipse.emf.cdo.compare/docs/CDOCompare.png
new file mode 100644
index 0000000000..e32ae7ead2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.compare/docs/CDOCompare.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.compare/plugin.xml b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
new file mode 100644
index 0000000000..0495b2fa77
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2021 Eike Stepper (Loehne, 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>
+
+ <extension point="org.eclipse.emf.ecore.factory_override">
+ <factory
+ class="org.eclipse.emf.cdo.internal.compare.CDOCompareFactoryImpl"
+ uri="http://www.eclipse.org/emf/compare"/>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.compare/pom.xml b/plugins/org.eclipse.emf.cdo.compare/pom.xml
index 5ccadfb59f..2ca425b02a 100644
--- a/plugins/org.eclipse.emf.cdo.compare/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.compare</artifactId>
- <version>4.4.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index a0905be3ad..153615c6ef 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -15,20 +15,26 @@ import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.id.CDOIDUtil;
import org.eclipse.emf.cdo.common.model.EMFUtil;
+import org.eclipse.emf.cdo.internal.compare.CDOCompareFactoryImpl;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.net4j.util.ReflectUtil;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.emf.common.CommonPlugin;
import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.compare.CompareFactory;
+import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.EMFCompare.Builder;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.conflict.IConflictDetector;
+import org.eclipse.emf.compare.diff.DefaultDiffEngine;
+import org.eclipse.emf.compare.diff.FeatureFilter;
import org.eclipse.emf.compare.diff.IDiffEngine;
+import org.eclipse.emf.compare.diff.IDiffProcessor;
import org.eclipse.emf.compare.equi.IEquiEngine;
import org.eclipse.emf.compare.match.DefaultComparisonFactory;
import org.eclipse.emf.compare.match.DefaultEqualityHelperFactory;
@@ -42,7 +48,13 @@ import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl;
import org.eclipse.emf.compare.postprocessor.IPostProcessor;
import org.eclipse.emf.compare.req.IReqEngine;
import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.utils.ReferenceUtil;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -63,20 +75,50 @@ import java.util.Set;
*/
public class CDOCompare
{
+ private static final boolean IGNORE_RCP_REGISTRIES = OMPlatform.INSTANCE.isProperty("org.eclipse.emf.cdo.compare.CDOCompare.IGNORE_RCP_REGISTRIES");
+
+ private static final boolean USE_RCP_REGISTRIES;
+
+ static
+ {
+ if (IGNORE_RCP_REGISTRIES)
+ {
+ USE_RCP_REGISTRIES = false;
+ }
+ else
+ {
+ boolean rcpRegistriesAvailable = false;
+
+ try
+ {
+ rcpRegistriesAvailable = CommonPlugin.loadClass("org.eclipse.emf.compare.rcp", "org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin") != null;
+ }
+ catch (Throwable ex)
+ {
+ //$FALL-THROUGH$
+ }
+
+ USE_RCP_REGISTRIES = rcpRegistriesAvailable;
+ }
+
+ // Bug 568373 - IllegalStateException in ReferenceChangeMerger:
+ // Couldn't add in target because its parent hasn't been merged yet.
+ EFactory factory = ComparePackage.eINSTANCE.getEFactoryInstance();
+ if (factory == null || factory.getClass() != CDOCompareFactoryImpl.class)
+ {
+ ComparePackage.eINSTANCE.setEFactoryInstance(CDOCompareFactoryImpl.getInstance());
+ }
+ }
+
public Comparison compare(IComparisonScope scope)
{
Function<EObject, String> idFunction = createIDFunction();
IEObjectMatcher matcher = createMatcher(idFunction);
IEqualityHelperFactory equalityHelperFactory = createEqualityHelperFactory();
IComparisonFactory comparisonFactory = createComparisonFactory(equalityHelperFactory);
- EMFCompare comparator = createComparator(matcher, comparisonFactory);
-
- Comparison comparison = comparator.compare(scope);
-
- // TODO See EMFCompare.java, line 316
- comparison.eAdapters().add(new ComparisonScopeAdapter(scope));
- return comparison;
+ EMFCompare comparator = createComparator(matcher, comparisonFactory);
+ return comparator.compare(scope);
}
protected CDOIDFunction createIDFunction()
@@ -99,10 +141,29 @@ public class CDOCompare
return new DefaultComparisonFactory(equalityHelperFactory);
}
- protected EMFCompare createComparator(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
+ /**
+ * @since 4.5
+ */
+ @SuppressWarnings("restriction")
+ protected Builder createComparatorBuilder()
{
Builder builder = EMFCompare.builder();
+ if (USE_RCP_REGISTRIES)
+ {
+ org.eclipse.emf.compare.rcp.internal.extension.IEMFCompareBuilderConfigurator configurator = //
+ org.eclipse.emf.compare.rcp.internal.extension.impl.EMFCompareBuilderConfigurator.createDefault();
+
+ configurator.configure(builder);
+ }
+
+ return builder;
+ }
+
+ protected EMFCompare createComparator(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
+ {
+ Builder builder = createComparatorBuilder();
+
IMatchEngine.Factory.Registry matchEngineFactoryRegistry = createMatchEngineFactoryRegistry(matcher, comparisonFactory);
if (matchEngineFactoryRegistry != null)
{
@@ -151,7 +212,7 @@ public class CDOCompare
protected IDiffEngine createDiffEngine()
{
- return null;
+ return new CDODiffEngine();
}
protected IReqEngine createRequirementEngine()
@@ -176,13 +237,7 @@ public class CDOCompare
public static IComparisonScope getScope(Comparison comparison)
{
- ComparisonScopeAdapter adapter = EMFUtil.getAdapter(comparison, ComparisonScopeAdapter.class);
- if (adapter == null)
- {
- return null;
- }
-
- return adapter.getScope();
+ return EMFUtil.getAdapter(comparison, IComparisonScope.class);
}
/**
@@ -240,8 +295,13 @@ public class CDOCompare
return super.matchPerId(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID, originEObjectsNoID);
}
- private Set<Match> matchPerIdCompatibility(Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects,
- Iterator<? extends EObject> originEObjects, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID)
+ private Set<Match> matchPerIdCompatibility( //
+ Iterator<? extends EObject> leftEObjects, //
+ Iterator<? extends EObject> rightEObjects, //
+ Iterator<? extends EObject> originEObjects, //
+ List<EObject> leftEObjectsNoID, //
+ List<EObject> rightEObjectsNoID, //
+ List<EObject> originEObjectsNoID)
{
final List<EObject> leftEObjectsNoID1 = leftEObjectsNoID;
final List<EObject> rightEObjectsNoID1 = rightEObjectsNoID;
@@ -280,6 +340,7 @@ public class CDOCompare
{
matches.add(match);
}
+
idToMatch.put(identifier, match);
leftEObjectsToMatch.put(left, match);
}
@@ -374,6 +435,7 @@ public class CDOCompare
originEObjectsNoID1.add(origin);
}
}
+
return matches;
}
@@ -467,25 +529,99 @@ public class CDOCompare
/**
* @author Eike Stepper
+ * @since 4.5
*/
- private static final class ComparisonScopeAdapter extends AdapterImpl
+ public static class CDODiffEngine extends DefaultDiffEngine
{
- private IComparisonScope scope;
+ public CDODiffEngine()
+ {
+ }
- public ComparisonScopeAdapter(IComparisonScope scope)
+ public CDODiffEngine(IDiffProcessor processor)
{
- this.scope = scope;
+ super(processor);
}
- public final IComparisonScope getScope()
+ @Override
+ protected FeatureFilter createFeatureFilter()
{
- return scope;
+ return new CDOFeatureFilter();
}
+ }
+ /**
+ * @author Eike Stepper
+ * @since 4.5
+ */
+ public static class CDOFeatureFilter extends FeatureFilter
+ {
+ public CDOFeatureFilter()
+ {
+ }
+
+ /**
+ * TODO Remove this copied method when EMFCompare bug 570625 is resolved and released.
+ */
@Override
- public boolean isAdapterForType(Object type)
+ @SuppressWarnings("deprecation")
+ protected boolean isIgnoredReference(Match match, EReference reference)
+ {
+ final boolean toIgnore;
+ if (reference != null)
+ {
+ // ignore the derived, container or transient
+ if (!reference.isDerived() && !reference.isContainer() && !isTransient(reference))
+ {
+ /*
+ * EGenericTypes are usually "mutually derived" references that are handled through specific means in ecore
+ * (eGenericSuperTypes and eSuperTypes, EGenericType and eType...). As these aren't even shown to the user, we
+ * wish to avoid detection of changes on them.
+ */
+ // Otherwise if this reference is not set on any side, no use checking it
+ boolean isGenericTypeWithoutArguments = false;
+ boolean isGenericType = reference.getEType() == EcorePackage.eINSTANCE.getEGenericType();
+ if (isGenericType)
+ {
+ isGenericTypeWithoutArguments = //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getLeft()) && //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getRight()) && //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getOrigin());
+ }
+
+ toIgnore = isGenericTypeWithoutArguments || !referenceIsSet(reference, match);
+ }
+ else if (ReferenceUtil.isFeatureMapDerivedFeature(reference))
+ {
+ toIgnore = false;
+ }
+ else
+ {
+ toIgnore = true;
+ }
+ }
+ else
+ {
+ toIgnore = true;
+ }
+
+ return toIgnore;
+ }
+
+ /**
+ * TODO Remove this copied method when EMFCompare bug 570625 is resolved and released.
+ */
+ @Override
+ protected boolean isIgnoredAttribute(EAttribute attribute)
+ {
+ return attribute == null || attribute.isDerived() || isTransient(attribute);
+ }
+
+ /**
+ * @since 4.5
+ */
+ protected boolean isTransient(EStructuralFeature feature)
{
- return type == ComparisonScopeAdapter.class;
+ return !EMFUtil.isPersistent(feature);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
index b6516728bd..8e65bd4222 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java
@@ -207,6 +207,25 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
ids.addAll(requiredParentIDs);
+ Set<String> nsURIs = getNsURIs();
+ for (CDOID id : ids)
+ {
+ String nsURI = getNsURI(leftView, id);
+ if (nsURI == null)
+ {
+ nsURI = getNsURI(rightView, id);
+ if (nsURI == null)
+ {
+ nsURI = getNsURI(originView, id);
+ }
+ }
+
+ if (nsURI != null)
+ {
+ nsURIs.add(nsURI);
+ }
+ }
+
CDOResource rootResource = (CDOResource)getLeft();
ids.remove(rootResource.cdoID());
}
@@ -407,5 +426,26 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
return view.getRootResource();
}
+
+ private static String getNsURI(CDOView view, CDOID id)
+ {
+ if (view != null)
+ {
+ try
+ {
+ CDOObject object = view.getObject(id);
+ if (object != null)
+ {
+ return object.eClass().getEPackage().getNsURI();
+ }
+ }
+ catch (ObjectNotFoundException ex)
+ {
+ //$FALL-THROUGH$
+ }
+ }
+
+ return null;
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/internal/compare/CDOCompareFactoryImpl.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/internal/compare/CDOCompareFactoryImpl.java
new file mode 100644
index 0000000000..dcf156359f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/internal/compare/CDOCompareFactoryImpl.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2021 Eike Stepper (Loehne, 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
+ */
+package org.eclipse.emf.cdo.internal.compare;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.compare.CompareFactory;
+import org.eclipse.emf.compare.ComparePackage;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.impl.CompareFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EContentsEList;
+
+/**
+ * Bug 568373 - IllegalStateException in ReferenceChangeMerger: Couldn't add in target because its parent hasn't been merged yet.
+ *
+ * @author Eike Stepper
+ */
+public class CDOCompareFactoryImpl extends CompareFactoryImpl
+{
+ private static CompareFactory instance;
+
+ public CDOCompareFactoryImpl()
+ {
+ synchronized (CDOCompareFactoryImpl.class)
+ {
+ instance = this;
+ }
+ }
+
+ @Override
+ public Match createMatch()
+ {
+ return new CDOMatchSpec();
+ }
+
+ public static CompareFactory getInstance()
+ {
+ synchronized (CDOCompareFactoryImpl.class)
+ {
+ if (instance == null)
+ {
+ new CDOCompareFactoryImpl();
+ }
+
+ return instance;
+ }
+ }
+
+ /**
+ * Bug 568373 - IllegalStateException in ReferenceChangeMerger: Couldn't add in target because its parent hasn't been merged yet.
+ *
+ * @author Eike Stepper
+ */
+ @SuppressWarnings("restriction")
+ public static class CDOMatchSpec extends org.eclipse.emf.compare.internal.spec.MatchSpec
+ {
+ public CDOMatchSpec()
+ {
+ }
+
+ /**
+ * Bug 568373 - IllegalStateException in ReferenceChangeMerger: Couldn't add in target because its parent hasn't been merged yet.
+ */
+ @Override
+ public EList<EObject> eContents()
+ {
+ EStructuralFeature[] eStructuralFeatures = { //
+ ComparePackage.Literals.MATCH__DIFFERENCES, //
+ ComparePackage.Literals.MATCH__SUBMATCHES };
+
+ return new EContentsEList<>(this, eStructuralFeatures);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.classpath b/plugins/org.eclipse.emf.cdo.dawn.emf/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
index 0dbd6328dc..73cbd60634 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
index 5a143c62e8..8a2c539fa0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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) 2021 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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.dawn.gmf/.classpath b/plugins/org.eclipse.emf.cdo.dawn.gmf/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
index 4b36a6cfce..6ed05952a8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -70,6 +71,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,7 +99,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
index 28f02b38d3..c993e80543 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.dawn.graphiti/.classpath b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
index 0dbd6328dc..73cbd60634 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
index 5a143c62e8..8a2c539fa0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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) 2021 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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.dawn.ui/.classpath b/plugins/org.eclipse.emf.cdo.dawn.ui/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
index 0dbd6328dc..73cbd60634 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
index 5a143c62e8..8a2c539fa0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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) 2021 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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.dawn.util/.classpath b/plugins/org.eclipse.emf.cdo.dawn.util/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
index 0dbd6328dc..73cbd60634 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
index 5a143c62e8..8a2c539fa0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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) 2021 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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.dawn/.classpath b/plugins/org.eclipse.emf.cdo.dawn/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.classpath
+++ b/plugins/org.eclipse.emf.cdo.dawn/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters
index d7a6728825..64f746907b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/.api_filters
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.dawn" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter id="923795461">
+ <message_arguments>
+ <message_argument value="2.2.0"/>
+ <message_argument value="2.2.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.dawn.resources.DawnResourceFactory">
<filter id="305324134">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
index 0dbd6328dc..73cbd60634 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
index 5a143c62e8..8a2c539fa0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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) 2021 Eike Stepper (Loehne, 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 * Martin Fluegge - 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 Martin Fluegge\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.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
index 44f82399ed..bb38a12e79 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,20 +14,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.emf.cdo.dawn;version="2.2.0",
- org.eclipse.emf.cdo.dawn.actions;version="2.2.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.appearance;version="2.2.0",
- org.eclipse.emf.cdo.dawn.commands;version="2.2.0",
- org.eclipse.emf.cdo.dawn.conflicts;version="2.2.0",
- org.eclipse.emf.cdo.dawn.editors;version="2.2.0",
- org.eclipse.emf.cdo.dawn.editors.impl;version="2.2.0",
- org.eclipse.emf.cdo.dawn.helper;version="2.2.0",
- org.eclipse.emf.cdo.dawn.notifications;version="2.2.0",
- org.eclipse.emf.cdo.dawn.preferences;version="2.2.0",
- org.eclipse.emf.cdo.dawn.resources;version="2.2.0",
- org.eclipse.emf.cdo.dawn.resources.impl;version="2.2.0",
- org.eclipse.emf.cdo.dawn.spi;version="2.2.0",
- org.eclipse.emf.cdo.dawn.transaction;version="2.2.0",
- org.eclipse.emf.cdo.internal.dawn.bundle;version="2.2.0"
+Export-Package: org.eclipse.emf.cdo.dawn;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.actions;version="2.2.1";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.appearance;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.commands;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.conflicts;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.editors;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.editors.impl;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.helper;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.notifications;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.preferences;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.resources;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.resources.impl;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.spi;version="2.2.1",
+ org.eclipse.emf.cdo.dawn.transaction;version="2.2.1",
+ org.eclipse.emf.cdo.internal.dawn.bundle;version="2.2.1"
Bundle-Vendor: %providerName
Automatic-Module-Name: org.eclipse.emf.cdo.dawn
diff --git a/plugins/org.eclipse.emf.cdo.dawn/about.properties b/plugins/org.eclipse.emf.cdo.dawn/about.properties
index 919b2cec5c..89e5bb6deb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/about.properties
+++ b/plugins/org.eclipse.emf.cdo.dawn/about.properties
@@ -21,7 +21,7 @@ featureText = CDO Model Repository Dawn\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2020 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.dawn/pom.xml b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
index 66eee9eb16..c89a75e302 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.dawn</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
index 28f02b38d3..c993e80543 100644
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
index 255aca418b..2124b04cfe 100644
--- a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.doc; singleton:=true
-Bundle-Version: 4.2.2.qualifier
+Bundle-Version: 4.2.3.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -23,14 +23,14 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
org.eclipse.emf.cdo.server.ocl;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.emf.cdo.explorer;bundle-version="[4.0.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.doc;version="4.2.2",
- org.eclipse.emf.cdo.doc.online;version="4.2.2",
- org.eclipse.emf.cdo.doc.operators;version="4.2.2",
- org.eclipse.emf.cdo.doc.programmers;version="4.2.2",
- org.eclipse.emf.cdo.doc.programmers.client;version="4.2.2",
- org.eclipse.emf.cdo.doc.programmers.server;version="4.2.2",
- org.eclipse.emf.cdo.doc.reference;version="4.2.2",
- org.eclipse.emf.cdo.doc.reference.api;version="4.2.2",
- org.eclipse.emf.cdo.doc.reference.schema;version="4.2.2",
- org.eclipse.emf.cdo.doc.users;version="4.2.2"
+Export-Package: org.eclipse.emf.cdo.doc;version="4.2.3",
+ org.eclipse.emf.cdo.doc.online;version="4.2.3",
+ org.eclipse.emf.cdo.doc.operators;version="4.2.3",
+ org.eclipse.emf.cdo.doc.programmers;version="4.2.3",
+ org.eclipse.emf.cdo.doc.programmers.client;version="4.2.3",
+ org.eclipse.emf.cdo.doc.programmers.server;version="4.2.3",
+ org.eclipse.emf.cdo.doc.reference;version="4.2.3",
+ org.eclipse.emf.cdo.doc.reference.api;version="4.2.3",
+ org.eclipse.emf.cdo.doc.reference.schema;version="4.2.3",
+ org.eclipse.emf.cdo.doc.users;version="4.2.3"
Automatic-Module-Name: org.eclipse.emf.cdo.doc
diff --git a/plugins/org.eclipse.emf.cdo.doc/about.properties b/plugins/org.eclipse.emf.cdo.doc/about.properties
index 9035ef07d2..455145bb8a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/about.properties
+++ b/plugins/org.eclipse.emf.cdo.doc/about.properties
@@ -21,7 +21,7 @@ featureText = CDO Model Repository Documentation\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2020 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.doc/pom.xml b/plugins/org.eclipse.emf.cdo.doc/pom.xml
index 72dc21171a..0b08c4c967 100644
--- a/plugins/org.eclipse.emf.cdo.doc/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.doc</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.2.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties b/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties
index 80325ade2f..3c1d35c658 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties
@@ -21,7 +21,7 @@ featureText = CDO Model Repository Client (Retrofit for EMF before 2.9)\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-Copyright (c) 2004-2020 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
+Copyright (c) 2004-2021 Eike Stepper (Loehne, Germany) and others. All rights reserved.\n\
\n\
Visit http://www.eclipse.org/cdo
diff --git a/plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs
index 28f02b38d3..c993e80543 100644
--- a/plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs
index 28f02b38d3..c993e80543 100644
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
index 87bd169358..bb69662299 100644
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 4.5.3.qualifier
+Bundle-Version: 4.5.4.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="4.5.3",
+Export-Package: org.eclipse.emf.cdo.edit;version="4.5.4",
org.eclipse.emf.cdo.eresource.provider;version="4.2.100",
org.eclipse.emf.cdo.etypes.provider;version="4.2.100",
- org.eclipse.emf.cdo.internal.edit.messages;version="4.5.3";x-internal:=true
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.5.4";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.edit
diff --git a/plugins/org.eclipse.emf.cdo.edit/pom.xml b/plugins/org.eclipse.emf.cdo.edit/pom.xml
index f1601370df..0482cde606 100644
--- a/plugins/org.eclipse.emf.cdo.edit/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.edit/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.edit</artifactId>
- <version>4.5.3-SNAPSHOT</version>
+ <version>4.5.4-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
index ceddcc7b43..33453ec508 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
- * This is the central singleton for the Etypes edit plugin.
+ * This is the central singleton for the Eresource edit plugin.
* <!-- begin-user-doc -->
*
* @since 4.0 <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
index baa11668bc..85edd77c53 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
@@ -69,8 +69,7 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOBinaryResource_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", "_UI_CDOBinaryResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
index e3a00ae772..e80dbc4038 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
@@ -123,8 +123,7 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOResource_trackingModification_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOResource_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
@@ -137,8 +136,7 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOResource_timeStamp_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOResource_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", "_UI_CDOResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index 79afea10c6..3735a867ef 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
@@ -85,8 +85,7 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOResourceNode_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOResourceNode_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_name_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_RESOURCE_NODE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -99,8 +98,7 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOResourceNode_path_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOResourceNode_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOResourceNode_path_feature", "_UI_CDOResourceNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_RESOURCE_NODE__PATH, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -115,6 +113,22 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter
}
/**
+ * This returns <code>getImage(object)</code> for the column index <code>0</code> or <code>super.getImage(object)</code> otherwise.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getText(Object)
+ * @see #getColumnText(Object, int)
+ * @generated
+ */
+ @Override
+ public Object getColumnImage(Object object, int columnIndex)
+ {
+ // TODO: implement this method to return appropriate information for each column.
+ // Ensure that you remove @generated or mark it @generated NOT
+ return columnIndex == 0 ? getImage(object) : super.getImage(object);
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -139,6 +153,22 @@ public class CDOResourceNodeItemProvider extends CDOItemProviderAdapter
}
/**
+ * This returns <code>getText(object)</code> for the column index <code>0</code> or <code>super.getText(object)</code> otherwise.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getImage(Object)
+ * @see #getColumnImage(Object, int)
+ * @generated
+ */
+ @Override
+ public String getColumnText(Object object, int columnIndex)
+ {
+ // TODO: implement this method to return appropriate information for each column.
+ // Ensure that you remove @generated or mark it @generated NOT
+ return columnIndex == 0 ? getText(object) : super.getText(object);
+ }
+
+ /**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
index 78fbb72d7f..0595d4659f 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
@@ -70,8 +70,7 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOTextResource_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", "_UI_CDOTextResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -86,8 +85,7 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider
{
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
getString("_UI_CDOTextResource_encoding_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", //$NON-NLS-1$//$NON-NLS-2$
- "_UI_CDOTextResource_type"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CDOTextResource_encoding_feature", "_UI_CDOTextResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
EresourcePackage.Literals.CDO_TEXT_RESOURCE__ENCODING, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index e0cefac19e..1c09d47f3b 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -82,7 +82,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
*
* @generated
*/
- protected Collection<Object> supportedTypes = new ArrayList<>();
+ protected Collection<Object> supportedTypes = new ArrayList<Object>();
/**
* This constructs an instance.
@@ -258,7 +258,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
+ if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
{
return adapter;
}
@@ -336,7 +336,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -344,21 +344,13 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
public void dispose()
{
if (cdoResourceFolderItemProvider != null)
- {
cdoResourceFolderItemProvider.dispose();
- }
if (cdoResourceItemProvider != null)
- {
cdoResourceItemProvider.dispose();
- }
if (cdoBinaryResourceItemProvider != null)
- {
cdoBinaryResourceItemProvider.dispose();
- }
if (cdoTextResourceItemProvider != null)
- {
cdoTextResourceItemProvider.dispose();
- }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index f957280df6..0ea7016b2d 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -83,7 +83,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
*
* @generated
*/
- protected Collection<Object> supportedTypes = new ArrayList<>();
+ protected Collection<Object> supportedTypes = new ArrayList<Object>();
/**
* This constructs an instance.
@@ -183,7 +183,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
+ if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
{
return adapter;
}
@@ -261,7 +261,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -269,9 +269,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory
public void dispose()
{
if (annotationItemProvider != null)
- {
annotationItemProvider.dispose();
- }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/.classpath b/plugins/org.eclipse.emf.cdo.examples.client.offline/.classpath
index eca7bdba8f..e801ebfb46 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/.classpath
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
index 6b35f57b85..3fb462d22c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -95,7 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs
index 28f02b38d3..c993e80543 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.ui.prefs
@@ -75,7 +75,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) 2020 Eike Stepper (Loehne, 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>
+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) 2021 Eike Stepper (Loehne, 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.examples.client.offline/CDOOfflineExample.launch b/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
index fcdd65e725..9c2095a68c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
@@ -1,759 +1,836 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.emf.cdo.examples.client.offline.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<listAttribute key="com.chronon.sb.browser.launcher.launchattrs.excludePatterns"/>
-<listAttribute key="com.chronon.sb.browser.launcher.launchattrs.includePatterns">
-<listEntry value="org.eclipse.emf.cdo.**"/>
-<listEntry value="org.eclipse.internal.net4j.**"/>
-<listEntry value="org.eclipse.spi.net4j.**"/>
-<listEntry value="org.eclipse.emf.spi.cdo.**"/>
-<listEntry value="org.eclipse.emf.internal.cdo.**"/>
-<listEntry value="org.eclipse.net4j.**"/>
-</listAttribute>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CDOOfflineExample"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../ws-CDOOfflineExample"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m &#13;&#10;-Xmx1g&#13;&#10;-Dnode.manager.root=${resource_loc:/org.eclipse.emf.cdo.examples.client.offline}/nodes"/>
-<booleanAttribute key="pde.generated.config" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.h2@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.client.offline@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<booleanAttribute key="tracing" value="false"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.birt.chart.device.extension/debug" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/extension.i18n" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/image" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/plugin" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/swing" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/swt" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/trace" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.device.extension/util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/aggregate" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/datafeed" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/debug" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/engine.extension.i18n" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/plugin" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/render" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine.extension/trace" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/aggregate" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/computation" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/computation.withaxes" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/computation.withoutaxes" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/datafeed" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/debug" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/device" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/engine.i18n" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/event" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/exception" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/factory" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/internal" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/internal.computations" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/internal.factory" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/internal.script" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/log" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/log.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.attribute" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.attribute.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.attribute.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.component" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.component.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.component.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.data" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.data.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.data.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.layout" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.layout.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.layout.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.prefs" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.type" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.type.impl" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.type.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/model.util" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/plugin" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/render" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/script" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/style" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/trace" value="false"/>
-<mapEntry key="org.eclipse.birt.chart.engine/util" value="false"/>
-<mapEntry key="org.eclipse.birt.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/debug/TypeExtensionManager" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/memory/dynamicLoading" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/breakpointDeltas" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.egit.core/debug" value="false"/>
-<mapEntry key="org.eclipse.egit.core/debug/core" value="false"/>
-<mapEntry key="org.eclipse.egit.core/debug/core/indexdiffcache" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/quickdiff" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/repochangescanner" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/ui" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/ui/decoration" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/ui/historyview" value="false"/>
-<mapEntry key="org.eclipse.egit.ui/debug/ui/repositoriesview" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.id" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.compare/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.ecore.editor.dawn/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.examples.acore.diagram/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.examples.acore.diagram/debug/visualID" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.tests/debug.object" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.ui/debug.object" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.util/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn.util/debug.object" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.object" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.object.statemachine" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.object.store" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.session.model" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.session.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.view" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.view.audit" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/debug.view.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.dawn/load.resource.before.notification" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.efs/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.explorer/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.location/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.net4j/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.net4j/perf.revision" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.net4j/perf.revision.loading" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.security/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.lissome/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.index" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.journal" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.vob" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.mongodb/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.store" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.types" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.product/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.team/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.all/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.lissome/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.mongodb/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.transfer.repository/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.transfer.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.transfer.workspace.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.transfer.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.transfer/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.compare/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.efs/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.ide/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.location/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.shared/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.team/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/test" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.workspace.efs/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object.statemachine" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object.store" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session.model" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view.audit" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/load.resource.before.notification" value="false"/>
-<mapEntry key="org.eclipse.emf.mint/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.mint/debug/MemberAnnotationManager" value="false"/>
-<mapEntry key="org.eclipse.emf.mint/debug/MemberAnnotationManager/CacheCleaner" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.equinox.ds/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="false"/>
-<mapEntry key="org.eclipse.equinox.ds/performance" value="false"/>
-<mapEntry key="org.eclipse.equinox.ds/print_on_console" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/unsigned" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/untrusted" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.engine/engine/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.engine/enginesession/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.p2.engine/profileregistry/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
-<mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
-<mapEntry key="org.eclipse.gmf.common/debug/organizeImports" value="false"/>
-<mapEntry key="org.eclipse.gmf.common/reconciler/traceCrossRefUpdate" value="false"/>
-<mapEntry key="org.eclipse.gmf.common/reconciler/traceDecision" value="false"/>
-<mapEntry key="org.eclipse.gmf.common/reconciler/traceDecision/features" value="false"/>
-<mapEntry key="org.eclipse.gmf.common/reconciler/traceMatches" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.validate/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.validate/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.gmf.validate/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.validate/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.validate/debug/meta/definitions" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
-<mapEntry key="org.eclipse.help/debug/toc" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/>
-<mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.jdt.debug/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug/astEvaluations" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug/astEvaluations/callingThreads" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug/jdiEvents" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug/jdiRequestTimes" value="false"/>
-<mapEntry key="org.eclipse.jdt.launching/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.launching/debug/classpath/jreContainer" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.jface.text/assert/TextSelection/validConstructorArguments" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.mat.api/debug" value="false"/>
-<mapEntry key="org.eclipse.mat.dtfj/debug" value="false"/>
-<mapEntry key="org.eclipse.mat.dtfj/debug/verbose" value="false"/>
-<mapEntry key="org.eclipse.mat.dtfj/errorCount" value="20"/>
-<mapEntry key="org.eclipse.mat.hprof/debug" value="false"/>
-<mapEntry key="org.eclipse.mat.hprof/debug/parser" value="false"/>
-<mapEntry key="org.eclipse.mat.parser/debug" value="false"/>
-<mapEntry key="org.eclipse.mat.report/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.chat.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.chat/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.h2/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.h2/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.oracle/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.oracle/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.postgresql/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.http/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.tests/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.ui.shared/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om.monitor" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/>
-<mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/objectPool/adds" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/objectPool/dups" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/cachedmanifest" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/apianalyzer" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/apidescription" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/apifilterstore" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/apiprofile" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/classfilevisitor" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/delta" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/descriptor/framework" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/pluginworkspacecomponent" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/profilemanager" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/tagscanner" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/usereportconverter" value="false"/>
-<mapEntry key="org.eclipse.pde.api.tools/debug/workspacedeltaprocessor" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.pde.core/target/profile" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/markers" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug/dnd" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug/setup" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug/sort" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/debug/viewermap" value="false"/>
-<mapEntry key="org.eclipse.ui.navigator/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/perspectives" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-</mapAttribute>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
+ <booleanAttribute key="append.args" value="true"/>
+ <stringAttribute key="application" value="org.eclipse.emf.cdo.examples.client.offline.application"/>
+ <booleanAttribute key="askclear" value="false"/>
+ <booleanAttribute key="automaticAdd" value="false"/>
+ <booleanAttribute key="automaticValidate" value="false"/>
+ <stringAttribute key="bootstrap" value=""/>
+ <stringAttribute key="checked" value="[NONE]"/>
+ <booleanAttribute key="clearConfig" value="false"/>
+ <booleanAttribute key="clearws" value="false"/>
+ <booleanAttribute key="clearwslog" value="false"/>
+ <listAttribute key="com.chronon.sb.browser.launcher.launchattrs.excludePatterns"/>
+ <listAttribute key="com.chronon.sb.browser.launcher.launchattrs.includePatterns">
+ <listEntry value="org.eclipse.emf.cdo.**"/>
+ <listEntry value="org.eclipse.internal.net4j.**"/>
+ <listEntry value="org.eclipse.spi.net4j.**"/>
+ <listEntry value="org.eclipse.emf.spi.cdo.**"/>
+ <listEntry value="org.eclipse.emf.internal.cdo.**"/>
+ <listEntry value="org.eclipse.net4j.**"/>
+ </listAttribute>
+ <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CDOOfflineExample"/>
+ <booleanAttribute key="default" value="true"/>
+ <booleanAttribute key="includeOptional" value="false"/>
+ <stringAttribute key="location" value="${workspace_loc}/../ws-CDOOfflineExample"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} &#13;&#10;-consoleLog"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m &#13;&#10;-Xmx1g&#13;&#10;-DclearPersistedState=true&#13;&#10;-DpersistState=false&#13;&#10;-Dnode.manager.root=${resource_loc:/org.eclipse.emf.cdo.examples.client.offline}/nodes"/>
+ <booleanAttribute key="pde.generated.config" value="false"/>
+ <stringAttribute key="pde.version" value="3.3"/>
+ <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+ <setAttribute key="selected_target_bundles">
+ <setEntry value="com.ibm.icu@default:default"/>
+ <setEntry value="org.eclipse.compare.core@default:default"/>
+ <setEntry value="org.eclipse.core.commands@default:default"/>
+ <setEntry value="org.eclipse.core.contenttype@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+ <setEntry value="org.eclipse.core.databinding@default:default"/>
+ <setEntry value="org.eclipse.core.expressions@default:default"/>
+ <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+ <setEntry value="org.eclipse.core.filesystem.win32.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.filesystem@default:default"/>
+ <setEntry value="org.eclipse.core.jobs@default:default"/>
+ <setEntry value="org.eclipse.core.resources@default:default"/>
+ <setEntry value="org.eclipse.core.runtime.compatibility.registry@default:false"/>
+ <setEntry value="org.eclipse.core.runtime@default:true"/>
+ <setEntry value="org.eclipse.emf.common.ui@default:default"/>
+ <setEntry value="org.eclipse.emf.common@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.edit@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore@default:default"/>
+ <setEntry value="org.eclipse.emf.edit.ui@default:default"/>
+ <setEntry value="org.eclipse.emf.edit@default:default"/>
+ <setEntry value="org.eclipse.equinox.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.common@2:true"/>
+ <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+ <setEntry value="org.eclipse.equinox.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.security.win32.x86_64@default:false"/>
+ <setEntry value="org.eclipse.equinox.security@default:default"/>
+ <setEntry value="org.eclipse.help@default:default"/>
+ <setEntry value="org.eclipse.jface.databinding@default:default"/>
+ <setEntry value="org.eclipse.jface.text@default:default"/>
+ <setEntry value="org.eclipse.jface@default:default"/>
+ <setEntry value="org.eclipse.osgi@-1:true"/>
+ <setEntry value="org.eclipse.swt.win32.win32.x86_64@default:false"/>
+ <setEntry value="org.eclipse.swt@default:default"/>
+ <setEntry value="org.eclipse.text@default:default"/>
+ <setEntry value="org.eclipse.ui.editors@default:default"/>
+ <setEntry value="org.eclipse.ui.ide@default:default"/>
+ <setEntry value="org.eclipse.ui.views@default:default"/>
+ <setEntry value="org.eclipse.ui.win32@default:false"/>
+ <setEntry value="org.eclipse.ui.workbench.texteditor@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ui@default:default"/>
+ <setEntry value="org.h2@default:default"/>
+ </setAttribute>
+ <setAttribute key="selected_workspace_bundles">
+ <setEntry value="org.eclipse.emf.cdo.common@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.edit@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.examples.client.offline@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.examples.company.edit@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.examples.company@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.net4j@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.server.admin@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.server.db@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.server.net4j@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.server@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.transfer.repository@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.transfer.ui@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.transfer@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.ui.shared@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo.ui@default:default"/>
+ <setEntry value="org.eclipse.emf.cdo@default:default"/>
+ <setEntry value="org.eclipse.net4j.db.h2@default:default"/>
+ <setEntry value="org.eclipse.net4j.db@default:default"/>
+ <setEntry value="org.eclipse.net4j.jvm@default:default"/>
+ <setEntry value="org.eclipse.net4j.tcp@default:default"/>
+ <setEntry value="org.eclipse.net4j.ui.shared@default:default"/>
+ <setEntry value="org.eclipse.net4j.util.ui@default:default"/>
+ <setEntry value="org.eclipse.net4j.util@default:default"/>
+ <setEntry value="org.eclipse.net4j@default:default"/>
+ </setAttribute>
+ <booleanAttribute key="show_selected_only" value="true"/>
+ <booleanAttribute key="tracing" value="false"/>
+ <mapAttribute key="tracingOptions">
+ <mapEntry key="org.eclipse.birt.chart.device.extension/debug" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/extension.i18n" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/image" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/plugin" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/swing" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/swt" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/trace" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.device.extension/util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/aggregate" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/datafeed" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/debug" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/engine.extension.i18n" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/plugin" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/render" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine.extension/trace" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/aggregate" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/computation" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/computation.withaxes" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/computation.withoutaxes" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/datafeed" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/debug" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/device" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/engine.i18n" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/event" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/exception" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/factory" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/internal" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/internal.computations" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/internal.factory" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/internal.script" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/log" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/log.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.attribute" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.attribute.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.attribute.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.component" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.component.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.component.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.data" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.data.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.data.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.layout" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.layout.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.layout.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.prefs" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.type" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.type.impl" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.type.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/model.util" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/plugin" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/render" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/script" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/style" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/trace" value="false"/>
+ <mapEntry key="org.eclipse.birt.chart.engine/util" value="false"/>
+ <mapEntry key="org.eclipse.birt.core/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.expressions/debug/TypeExtensionManager" value="false"/>
+ <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
+ <mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/history" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
+ <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+ <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
+ <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
+ <mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
+ <mapEntry key="org.eclipse.core.resources/strings" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
+ <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+ <mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+ <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
+ <mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/memory/dynamicLoading" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/breakpointDeltas" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
+ <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
+ <mapEntry key="org.eclipse.egit.core/debug" value="false"/>
+ <mapEntry key="org.eclipse.egit.core/debug/core" value="false"/>
+ <mapEntry key="org.eclipse.egit.core/debug/core/indexdiffcache" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/quickdiff" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/repochangescanner" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/ui" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/ui/decoration" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/ui/historyview" value="false"/>
+ <mapEntry key="org.eclipse.egit.ui/debug/ui/repositoriesview" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.admin/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.admin/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common.db/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/debug.id" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/perf" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.compare/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.ecore.editor.dawn/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.examples.acore.diagram/debug" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.examples.acore.diagram/debug/visualID" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.tests/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.tests/debug.object" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.ui/debug.object" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.util/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn.util/debug.object" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.object" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.object.statemachine" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.object.store" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.session" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.session.model" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.session.revision" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.view" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.view.audit" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/debug.view.transaction" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.dawn/load.resource.before.notification" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.efs/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.explorer/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.location/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.net4j/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.net4j/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.net4j/perf" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.net4j/perf.revision" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.net4j/perf.revision.loading" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.security/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.admin/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.admin/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.lissome/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.index" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.journal" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.lissome/debug.vob" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.mongodb/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.repository" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.resource" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.revision" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.session" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.store" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.transaction" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.net4j/debug.types" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server.product/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.team/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests.all/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests.db/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests.lissome/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests.mongodb/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.tests/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.transfer.repository/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.transfer.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.transfer.workspace.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.transfer.workspace/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.transfer/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.admin/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.compare/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.efs/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.ide/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.location/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.shared/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.team/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui.workspace/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.ui/test" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo.workspace.efs/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo.workspace/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.object.statemachine" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.object.store" value="false"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.session.model" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.session.revision" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.view.audit" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/debug.view.transaction" value="true"/>
+ <mapEntry key="org.eclipse.emf.cdo/load.resource.before.notification" value="false"/>
+ <mapEntry key="org.eclipse.emf.mint/debug" value="false"/>
+ <mapEntry key="org.eclipse.emf.mint/debug/MemberAnnotationManager" value="false"/>
+ <mapEntry key="org.eclipse.emf.mint/debug/MemberAnnotationManager/CacheCleaner" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
+ <mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
+ <mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
+ <mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.equinox.ds/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="false"/>
+ <mapEntry key="org.eclipse.equinox.ds/performance" value="false"/>
+ <mapEntry key="org.eclipse.equinox.ds/print_on_console" value="false"/>
+ <mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/unsigned" value="false"/>
+ <mapEntry key="org.eclipse.equinox.p2.engine/certificatechecker/untrusted" value="false"/>
+ <mapEntry key="org.eclipse.equinox.p2.engine/engine/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.p2.engine/enginesession/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.p2.engine/profileregistry/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
+ <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
+ <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
+ <mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
+ <mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/>
+ <mapEntry key="org.eclipse.equinox.security/debug" value="false"/>
+ <mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/>
+ <mapEntry key="org.eclipse.gmf.common/debug/organizeImports" value="false"/>
+ <mapEntry key="org.eclipse.gmf.common/reconciler/traceCrossRefUpdate" value="false"/>
+ <mapEntry key="org.eclipse.gmf.common/reconciler/traceDecision" value="false"/>
+ <mapEntry key="org.eclipse.gmf.common/reconciler/traceDecision/features" value="false"/>
+ <mapEntry key="org.eclipse.gmf.common/reconciler/traceMatches" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/>
+ <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/