Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/feature.xml15
-rw-r--r--features/org.eclipse.emf.cdo.all-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.compare-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.doc-feature/.settings/org.eclipse.core.resources.prefs2
-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.ecore.dependencies-feature/.project42
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/build.properties14
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.xml45
-rw-r--r--features/org.eclipse.emf.cdo.ecore.dependencies-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/feature.xml15
-rw-r--r--features/org.eclipse.emf.cdo.epp-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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.lm-feature/.project42
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/build.properties14
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/feature.properties8
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/feature.xml93
-rw-r--r--features/org.eclipse.emf.cdo.lm-feature/pom.xml31
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.migrator-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/feature.xml8
-rw-r--r--features/org.eclipse.emf.cdo.sdk-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server.db-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/feature.xml11
-rw-r--r--features/org.eclipse.emf.cdo.tests-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j-feature/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.net4j.ui-feature/feature.xml4
-rw-r--r--features/org.eclipse.net4j.ui-feature/pom.xml4
-rw-r--r--features/org.eclipse.net4j.util-feature/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.net4j.ws-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.ws-feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs3
-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.MF72
-rw-r--r--plugins/org.eclipse.emf.cdo.common/plugin.xml11
-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/branch/CDOBranch.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs3
-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.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/plugin.xml19
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs3
-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/.settings/org.eclipse.core.resources.prefs3
-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.gmf/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs3
-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/.settings/org.eclipse.core.resources.prefs3
-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/.settings/org.eclipse.core.resources.prefs3
-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.util/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.util/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/.settings/org.eclipse.core.resources.prefs3
-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.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs2
-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.dependencies/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.core.prefs435
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.jdt.ui.prefs133
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/META-INF/MANIFEST.MF27
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.ini (renamed from plugins/org.eclipse.emf.cdo.explorer/about.ini)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.mappings (renamed from plugins/org.eclipse.emf.cdo.explorer/about.mappings)0
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/about.properties (renamed from plugins/org.eclipse.emf.cdo.explorer/about.properties)12
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/build.properties32
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/BrokenLink.gifbin0 -> 375 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callees.gifbin0 -> 215 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Callers.gifbin0 -> 218 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Copy.gifbin0 -> 607 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Element.gifbin0 -> 443 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Flat.gifbin0 -> 97 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Generics.gifbin0 -> 99 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Horizontal.gifbin0 -> 373 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Link.gifbin0 -> 218 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Model.gifbin0 -> 208 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/ModelContainer.gifbin0 -> 364 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Refresh.gifbin0 -> 330 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Search.gifbin0 -> 348 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/SortByDependencies.gifbin0 -> 238 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Uri.gifbin0 -> 349 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Vertical.gifbin0 -> 353 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/obj16/Xml.gifbin0 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/icons/full/ovr16/Error.gifbin0 -> 82 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.ecore88
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/model/dependencies.genmodel68
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/modeling32.png (renamed from plugins/org.eclipse.emf.cdo.explorer/modeling32.png)bin2414 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.properties58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/plugin.xml51
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Addressable.java67
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesFactory.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/DependenciesPackage.java1314
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Element.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Link.java117
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/Model.java329
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ModelContainer.java65
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/bundle/DependenciesPlugin.java155
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/DependenciesFactoryImpl.java218
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/DependenciesPackageImpl.java790
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ElementImpl.java541
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/LinkImpl.java516
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ModelContainerImpl.java249
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/impl/ModelImpl.java939
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/DependenciesItemProviderAdapterFactory.java328
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ElementItemProvider.java280
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/LinkItemProvider.java237
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelContainerItemProvider.java280
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelItemProvider.java496
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/ModelItemProviderForLinkViewer.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/provider/URIStyler.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ui/DependenciesView.java846
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/ui/TableColumnSorter.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/DependenciesAdapterFactory.java226
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/DependenciesSwitch.java251
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/Graph.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.dependencies/src/org/eclipse/emf/cdo/ecore/dependencies/util/WorkspaceScanner.java218
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.retrofit/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.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.core.resources.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.core.resources.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/.settings/org.eclipse.core.resources.prefs1
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.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.core.resources.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.core.resources.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.core.resources.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.core.resources.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.core.resources.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.core.resources.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.core.resources.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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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.core.resources.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.core.resources.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/.settings/org.eclipse.core.resources.prefs2
-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.core.resources.prefs2
-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.core.resources.prefs3
-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.core.resources.prefs3
-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/.settings/org.eclipse.core.resources.prefs3
-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/META-INF/MANIFEST.MF25
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/icons/workingset.gifbin0 -> 349 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml30
-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.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/workingsets/CheckoutWorkingSetWizardPage.java560
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/workingsets/OthersWorkingSetUpdater.java139
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.core.resources.prefs3
-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.MF18
-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/internal/explorer/AbstractManager.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.edit/.settings/org.eclipse.core.resources.prefs2
-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/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.emf.cdo.genmodel/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/Assembly.gifbin0 -> 580 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/AssemblyModule.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/obj16/AssemblyModuleDisabled.gifbin0 -> 367 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/old/Assembly.gifbin0 -> 579 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/old/AssemblyModule.gifbin0 -> 532 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/icons/full/overlay/ModuleOverlay.gifbin0 -> 307 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/plugin.properties34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/plugin.xml29
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyEditPlugin.java101
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyItemProvider.java196
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyItemProviderAdapterFactory.java258
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly.edit/src/org/eclipse/emf/cdo/lm/assembly/provider/AssemblyModuleItemProvider.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/.api_filters44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.aird200
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.ecore20
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/model/Assembly.genmodel28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/plugin.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/Assembly.java101
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyFactory.java61
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyModule.java162
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/AssemblyPackage.java398
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyFactoryImpl.java127
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyImpl.java347
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyModuleImpl.java407
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/impl/AssemblyPackageImpl.java331
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyAdapterFactory.java179
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyResourceFactoryImpl.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyResourceImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblySwitch.java173
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.assembly/src/org/eclipse/emf/cdo/lm/assembly/util/AssemblyXMLProcessor.java57
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/plugin.xml44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/IAssemblyDescriptor.java125
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/IAssemblyManager.java62
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/ISystemDescriptor.java313
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/client/ISystemManager.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/AssemblyDescriptor.java810
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/AssemblyManager.java624
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMAdapterFactory.java53
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMManager.java201
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMResourceSetConfiguration.java297
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMResourceSetConfigurer.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java1202
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemManager.java717
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/TimeStamp.java240
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/bundle/OM.java75
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/properties/CheckoutProperties.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/properties/ModuleCheckoutProperties.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Change.gifbin0 -> 533 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ChangeDisabled.gifbin0 -> 330 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Delivery.gifbin0 -> 184 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Dependency.gifbin0 -> 131 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Drop.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/DropType.gifbin0 -> 332 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Module.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ModuleType.gifbin0 -> 608 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Process.gifbin0 -> 1027 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Release.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/ReleaseType.gifbin0 -> 335 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Stream.gifbin0 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/System.gifbin0 -> 339 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/icons/full/obj16/Tag.gifbin0 -> 135 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/plugin.properties98
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/plugin.xml29
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/BaselineItemProvider.java130
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java201
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DeliveryItemProvider.java174
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DependencyItemProvider.java185
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DropItemProvider.java179
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/DropTypeItemProvider.java172
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/FixedBaselineItemProvider.java172
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/FloatingBaselineItemProvider.java134
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/LMEditPlugin.java100
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/LMItemProviderAdapterFactory.java479
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleElementItemProvider.java107
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleItemProvider.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ModuleTypeItemProvider.java157
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ProcessElementItemProvider.java133
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ProcessItemProvider.java215
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/StreamElementItemProvider.java107
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/StreamItemProvider.java349
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/SystemElementItemProvider.java122
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/SystemItemProvider.java195
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/icons/full/obj16/DependencyDefinition.gifbin0 -> 131 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/icons/full/obj16/ModuleDefinition.gifbin0 -> 576 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/plugin.properties33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/plugin.xml33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/DependencyDefinitionItemProvider.java263
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModuleDefinitionItemProvider.java227
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModulesEditPlugin.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules.edit/src/org/eclipse/emf/cdo/lm/modules/provider/ModulesItemProviderAdapterFactory.java253
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/.api_filters35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/build.properties24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.aird258
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.ecore27
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/model/Modules.genmodel28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/plugin.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/DependencyDefinition.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModuleDefinition.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModulesFactory.java67
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/ModulesPackage.java440
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/DependencyDefinitionImpl.java302
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModuleDefinitionImpl.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModulesFactoryImpl.java222
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/impl/ModulesPackageImpl.java358
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesAdapterFactory.java177
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesResourceFactoryImpl.java59
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesResourceImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesSwitch.java173
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.modules/src/org/eclipse/emf/cdo/lm/modules/util/ModulesXMLProcessor.java57
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/CDOServer (LM).launch436
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/META-INF/MANIFEST.MF21
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/config/.options24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/config/cdo-server.xml68
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/plugin.xml30
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/AbstractLifecycleManager.java888
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/LMAppExtension.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/XMLLifecycleManager.java103
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.server/src/org/eclipse/emf/cdo/lm/server/bundle/OM.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/.api_filters11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/META-INF/MANIFEST.MF33
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/build.properties25
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Assembly.gifbin0 -> 580 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Checkout.pngbin0 -> 2998 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Delete.gifbin0 -> 351 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/DeleteChange.gifbin0 -> 3230 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/DeleteModule.gifbin0 -> 3230 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewChange.pngbin0 -> 2829 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewDelivery.pngbin0 -> 2362 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewDrop.pngbin0 -> 3959 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewModule.pngbin0 -> 3974 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewRelease.pngbin0 -> 4095 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewStream.pngbin0 -> 2364 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/NewTag.pngbin0 -> 4088 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Rename.gifbin0 -> 922 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/RenameChange.gifbin0 -> 2815 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/System.gifbin0 -> 339 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/Update.gifbin0 -> 332 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/checkout.gifbin0 -> 357 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateAddition.pngbin0 -> 625 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateModification.pngbin0 -> 629 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/overlay/UpdateRemoval.pngbin0 -> 683 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/icons/read_only.gifbin0 -> 851 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/plugin.xml124
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/InteractiveDeliveryMerger.java95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMHistoryInputObjectModifier.java115
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMLoadResourceProvider.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMMenuFiller.java118
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/LMTargetNameProvider.java81
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/CheckoutAction.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/DeleteChangeAction.java82
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/DeleteModuleAction.java70
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/InstallUpdatesHandler.java50
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/LMAction.java277
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewChangeAction.java261
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewDeliveryAction.java203
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewDropAction.java255
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewModuleAction.java195
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/NewStreamAction.java274
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/RenameChangeAction.java140
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/actions/UpdateAssemblyAction.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/bundle/OM.java69
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/decorators/AvailableUpdatesDecorator.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/dialogs/SelectModuleResourcesDialog.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/properties/ModulePropertyPage.java250
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/providers/SystemContentProvider.java229
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/providers/SystemLabelProvider.java85
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/views/AssembliesView.java674
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/views/SystemsView.java324
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/widgets/BaselineComposite.java224
-rw-r--r--plugins/org.eclipse.emf.cdo.lm.ui/src/org/eclipse/emf/cdo/lm/ui/widgets/TimeStampComposite.java268
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.project58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/.api_filters131
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.core.prefs441
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.jdt.ui.prefs141
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.pde.api.tools.prefs95
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/.settings/org.eclipse.pde.prefs35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.ini15
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.mappings6
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/about.properties31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/build.properties28
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.aird1993
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.ecore165
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/model/LM.genmodel133
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/modeling32.pngbin0 -> 2414 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/plugin.xml24
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/BasePoint.java68
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Baseline.java102
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Change.java154
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Delivery.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Dependency.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Drop.java119
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/DropType.java100
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/FixedBaseline.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/FloatingBaseline.java79
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Impact.java242
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/LMFactory.java139
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/LMPackage.java3727
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Module.java132
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ModuleElement.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ModuleType.java78
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Process.java137
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/ProcessElement.java35
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/Stream.java347
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamElement.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamMode.java242
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/StreamSpec.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/System.java111
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/SystemElement.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/BaselineImpl.java352
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ChangeImpl.java447
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DeliveryImpl.java299
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DependencyImpl.java270
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DropImpl.java312
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/DropTypeImpl.java310
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/FixedBaselineImpl.java266
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/FloatingBaselineImpl.java214
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/LMFactoryImpl.java369
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/LMPackageImpl.java1502
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ModuleImpl.java391
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ModuleTypeImpl.java270
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ProcessElementImpl.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ProcessImpl.java362
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/StreamImpl.java907
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/SystemImpl.java328
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMAdapterFactory.java512
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMMerger.java58
-rw-r--r--plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/LMSwitch.java785
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.classpath6
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.gitignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.core.resources.prefs3
-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/ant_tasks/.gitignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant8
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/build.properties9
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/CDOTask.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/GenerateModelTask.java398
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/.settings/org.eclipse.core.resources.prefs3
-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/plugin.xml21
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockAreaRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteSessionNotificationIndication.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteTopicRequest.java68
-rw-r--r--plugins/org.eclipse.emf.cdo.sdk/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs2
-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/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.admin/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/model/catalog.genmodel7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/plugin.xml12
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryConfigurationManagerExtension.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.core.resources.prefs3
-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/plugin.xml18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.server.embedded/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs3
-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.lissome/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/plugin.xml15
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.mongodb/.settings/org.eclipse.core.resources.prefs3
-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.net4j/.settings/org.eclipse.core.resources.prefs3
-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.net4j/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/plugin.xml34
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/Net4jAppExtension.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerWriteIndication.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteTopicIndication.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/.settings/org.eclipse.core.resources.prefs3
-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.ocl/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/plugin.xml5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.ocl/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.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.launch7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/.api_filters16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/.settings/org.eclipse.core.resources.prefs3
-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.security/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/plugin.xml8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityExtension.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java65
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.core.resources.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.MF17
-rw-r--r--plugins/org.eclipse.emf.cdo.server/about.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.properties14
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.xml11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/schema/appExtensions.exsd49
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/DelegatingCommitContext.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java151
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Topic.java135
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TopicManager.java169
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java60
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/messages.properties16
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java49
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ISessionManager.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITopic.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITopicManager.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AppExtension.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension4.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension5.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/ISessionProtocol.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalQueryResult.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSession.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSessionManager.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalTopic.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalTopicManager.java41
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/Store.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorPool.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.all/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs3
-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.MF16
-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/AllTestsDBH2Branching.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lissome/.settings/org.eclipse.core.resources.prefs2
-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.lm/.classpath11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.project52
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.jdt.core.prefs434
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.jdt.ui.prefs133
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.ltk.core.refactoring.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/.settings/org.eclipse.pde.prefs31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/LMFlowsTest.launch252
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/LMVersionEvolutionTest.launch252
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/about.html28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/build.properties21
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/AbstractLMTest.java582
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/IntegrationTestsSuiteLM.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/LMFlowsTest.java94
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/LMVersionEvolutionTest.java272
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.lm/src/org/eclipse/emf/cdo/tests/lm/bundle/OM.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs3
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs3
-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.core.resources.prefs3
-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/AllConfigs.java127
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java156
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockStateCacheTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingNotificationsTest.java81
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingSequenceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java51
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RemoteSessionManagerTest.java89
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionManagerTest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321986_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336382_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_369646_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_370105_Test.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_414270_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430836_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439173_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447912_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_456993_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_505654_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_516824_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_517168_Test.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_560957_Test.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_576893_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_579786_Test.java99
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java208
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs2
-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.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.core.resources.prefs2
-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.core.resources.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.core.resources.prefs2
-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/.settings/org.eclipse.core.resources.prefs1
-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/.settings/org.eclipse.core.resources.prefs3
-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.jdt/.settings/org.eclipse.core.resources.prefs2
-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.shared/.settings/org.eclipse.core.resources.prefs3
-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.shared/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/topic.gifbin0 -> 315 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/view16/cdo_remote_topics.gifbin0 -> 564 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/.settings/org.eclipse.core.resources.prefs3
-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.team/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/DropConfirmationDialog.java180
-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.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch471
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF39
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml34
-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/CDOAdapterFactoryContentProvider.java71
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOContentProvider.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java342
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOLoadResourceAction.java159
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/handlers/LockingHandler.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteTopicsView.java758
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/UserInfo.java539
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLoadResourceProvider.java64
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTopicProvider.java134
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs2
-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/plugin.xml16
-rw-r--r--plugins/org.eclipse.emf.cdo/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java73
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java83
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java36
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionRegistry.java72
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteSessionRequest.java422
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteTopic.java81
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/CDORemoteTopicEvent.java53
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java16
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOStaleReferencePolicy.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewRegistry.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLockImpl.java224
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionRegistryImpl.java109
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java29
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java259
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteTopicImpl.java258
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/AbstractLocksChangedEvent.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/AbstractRegistry.java136
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java95
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java15
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.java54
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDORemoteTopic.java35
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/plugin.xml17
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/build.properties5
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.buddies.common/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs3
-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.doc/.settings/org.eclipse.core.resources.prefs3
-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/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.db.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.h2/.settings/org.eclipse.core.resources.prefs3
-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.hsqldb/.settings/org.eclipse.core.resources.prefs3
-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.jdbc/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.oracle/.settings/org.eclipse.core.resources.prefs1
-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.postgresql/.settings/org.eclipse.core.resources.prefs1
-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.tests/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs3
-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.xml2
-rw-r--r--plugins/org.eclipse.net4j.debug/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs3
-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/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/.settings/org.eclipse.core.resources.prefs1
-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/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.chat/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/plugin.xml17
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/.settings/org.eclipse.core.resources.prefs1
-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.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/build.properties5
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/plugin.xml21
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/.settings/org.eclipse.core.resources.prefs1
-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/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs3
-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.jms.admin/.settings/org.eclipse.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs1
-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.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.sdk/.settings/org.eclipse.core.resources.prefs3
-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.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.net4j.tcp/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java14
-rw-r--r--plugins/org.eclipse.net4j.tests/.settings/org.eclipse.core.resources.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/tests/AllTests.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/RWOLockManagerTest.java2
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/.settings/org.eclipse.core.resources.prefs3
-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.jarbin5035 -> 5032 bytes
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.trace/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.trace/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.trace/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.net4j.trace/plugin.xml9
-rw-r--r--plugins/org.eclipse.net4j.trace/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/expand_all.gifbin0 -> 165 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/link_with_editor.gifbin0 -> 158 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/messages/Messages.java (renamed from plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java)6
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/messages/messages.properties26
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/CollapseAllAction.java50
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/ExpandAllAction.java50
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/LinkWithEditorAction.java37
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/RefreshAction.java49
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java12
-rw-r--r--plugins/org.eclipse.net4j.ui/.settings/org.eclipse.core.resources.prefs3
-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.xml4
-rw-r--r--plugins/org.eclipse.net4j.util.doc/.settings/org.eclipse.core.resources.prefs3
-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/build.properties3
-rw-r--r--plugins/org.eclipse.net4j.util.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.core.resources.prefs3
-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/plugin.xml46
-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/ui/GlobalPartAdapter.java137
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/SafeTreeViewer.java90
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java28
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java70
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java5
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/DoubleClickButtonAdapter.java47
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java37
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs95
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs12
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF66
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.properties7
-rw-r--r--plugins/org.eclipse.net4j.util/plugin.xml28
-rw-r--r--plugins/org.eclipse.net4j.util/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j.util/schema/factories.exsd8
-rw-r--r--plugins/org.eclipse.net4j.util/schema/productGroups.exsd135
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java38
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java74
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/AccessUtil.java169
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/PluginUtil.java129
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java11
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java160
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ThreadPool.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ListContainer.java96
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ModifiableContainer.java282
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/PersistableContainer.java104
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java323
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/LimitedInputStream.java58
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/RemoteException.java57
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java44
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java25
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java7
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java7
-rw-r--r--plugins/org.eclipse.net4j.ws/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.net4j.ws/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.eclipse.net4j/.settings/org.eclipse.core.resources.prefs3
-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/plugin.xml12
-rw-r--r--plugins/org.eclipse.net4j/pom.xml4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java7
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteException.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java25
-rw-r--r--plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.business.edit/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.business/.settings/org.eclipse.core.resources.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.core.resources.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.core.resources.prefs2
-rw-r--r--plugins/org.gastro.inventory/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp.department/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp.table/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.rcp/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.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.core.resources.prefs2
-rw-r--r--plugins/org.gastro.server/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.gastro.testclient/.settings/org.eclipse.jdt.ui.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.core.resources.prefs3
-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/.settings/org.eclipse.core.resources.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/.gitignore1
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/Tycho Build.launch15
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/features/pom.xml12
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/plugins/pom.xml13
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/pom.xml7
-rw-r--r--releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target7
-rw-r--r--releng/org.eclipse.emf.cdo.releng.site/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--releng/org.eclipse.emf.cdo.releng.site/category.xml1
-rw-r--r--releng/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs1
-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.setup254
-rw-r--r--releng/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF4
-rw-r--r--releng/org.eclipse.emf.cdo.releng/api/Api2Html.launch19
-rw-r--r--releng/org.eclipse.emf.cdo.releng/api/api.xml2611
-rw-r--r--releng/org.eclipse.emf.cdo.releng/hudson/ant.properties8
-rw-r--r--releng/org.eclipse.emf.cdo.releng/pom.xml2
-rw-r--r--releng/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java4
-rw-r--r--releng/org.eclipse.emf.cdo.releng/versions/release.digestbin10164 -> 10314 bytes
-rw-r--r--releng/org.eclipse.emf.cdo.releng/versions/release.xml563
1318 files changed, 73005 insertions, 5936 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml
index 6889cb6cdc..e0f1d52091 100644
--- a/features/org.eclipse.emf.cdo-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo"
label="%featureName"
- version="4.16.0.qualifier"
+ version="4.19.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-feature/pom.xml b/features/org.eclipse.emf.cdo-feature/pom.xml
index a21cf96e20..ebb363e5fe 100644
--- a/features/org.eclipse.emf.cdo-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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</artifactId>
- <version>4.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.all-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index 313b83a7e5..36745075c4 100644
--- a/features/org.eclipse.emf.cdo.all-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2009, 2011, 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2009, 2011, 2017-2022 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
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.all"
label="%featureName"
- version="4.16.0.qualifier"
+ version="4.19.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -40,6 +40,10 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.emf.cdo.lm"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.emf.cdo.epp"
version="0.0.0"/>
@@ -92,6 +96,13 @@
version="0.0.0"/>
<plugin
+ id="org.eclipse.emf.cdo.lm.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.emf.cdo.examples.server"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.cdo.all-feature/pom.xml b/features/org.eclipse.emf.cdo.all-feature/pom.xml
index 0b82aeb8ec..40fba76666 100644
--- a/features/org.eclipse.emf.cdo.all-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.all</artifactId>
- <version>4.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.compare-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.compare-feature/feature.xml b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
index b0e0a48f5b..04f55e428d 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.compare-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2015-2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2013, 2015-2017, 2019-2022 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.compare"
label="%featureName"
- version="4.8.0.qualifier"
+ version="4.9.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.compare-feature/pom.xml b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
index 60026704e9..168f9625a0 100644
--- a/features/org.eclipse.emf.cdo.compare-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.compare-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019-2022 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.compare</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.9.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.dawn-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.dawn-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index 6c1125a755..eeee3aeeb3 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2012, 2015-2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2010-2012, 2015-2017, 2019-2022 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.dawn"
label="%featureName"
- version="2.4.2.qualifier"
+ version="2.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.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
index c25b9cba82..7d9a38816f 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019-2022 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.dawn</artifactId>
- <version>2.4.2-SNAPSHOT</version>
+ <version>2.4.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.doc-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.doc-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.doc-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.xml b/features/org.eclipse.emf.cdo.doc-feature/feature.xml
index 9aa7c790bf..2b82b13bb3 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.5.qualifier"
+ version="4.3.6.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 5e996cd584..d06f31e0a0 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.5-SNAPSHOT</version>
+ <version>4.3.6-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.project b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.project
new file mode 100644
index 0000000000..5910c45fef
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.project
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.ecore.dependencies-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</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>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</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/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..9b58a30859
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 04 12:36:04 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..d573634502
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Thu Feb 04 10:06:10 CET 2010
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..3556bac076
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/.settings/org.eclipse.mylyn.team.ui.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 10:06:10 CET 2010
+commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
+eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/build.properties b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/build.properties
new file mode 100644
index 0000000000..42d1d3cbdb
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/build.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 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
+
+bin.includes = feature.xml,\
+ feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.properties b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.properties
new file mode 100644
index 0000000000..aa4edef8eb
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.properties
@@ -0,0 +1,8 @@
+# Copyright (c) 2022 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
+
+featureName = CDO Model Repository Ecore Dependencies Tool
+description = Contains the CDO Ecore Dependencies plugin.
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.xml b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.xml
new file mode 100644
index 0000000000..5ca4471437
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2022 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
+-->
+<feature
+ id="org.eclipse.emf.cdo.ecore.dependencies"
+ label="%featureName"
+ version="1.0.1.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.ecore.dependencies"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.ecore.dependencies-feature/pom.xml b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/pom.xml
new file mode 100644
index 0000000000..d4cfbf984c
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.ecore.dependencies-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2022 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.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.ecore.dependencies</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.epp-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.epp-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
index 74e825ee2f..7fa7307040 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2010-2022 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.epp"
label="%featureName"
- version="4.16.0.qualifier"
+ version="4.19.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -70,11 +70,12 @@
id="org.eclipse.emf.cdo.doc"
version="0.0.0"/>
- <plugin
+ <includes
id="org.eclipse.emf.cdo.migrator"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.ecore.dependencies"
+ version="0.0.0"/>
</feature>
diff --git a/features/org.eclipse.emf.cdo.epp-feature/pom.xml b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
index 2044bf97d1..3eba54d801 100644
--- a/features/org.eclipse.emf.cdo.epp-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.epp-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.epp</artifactId>
- <version>4.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.examples-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.examples-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 830104180d..7eee95728f 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2013, 2015-2022 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.5.2.qualifier"
+ version="4.5.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 2bf09ea131..6c509afa2a 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.5.2-SNAPSHOT</version>
+ <version>4.5.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.examples.installer-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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 191999807b..78af8449f2 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2012, 2013, 2015-2022 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.7.qualifier"
+ version="4.3.9.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 18879c8f9d..3c36558e72 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.7-SNAPSHOT</version>
+ <version>4.3.9-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.license-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.license-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.license-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.license-feature/feature.properties b/features/org.eclipse.emf.cdo.license-feature/feature.properties
index 67bf2d3592..4a45836651 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-2021 Eike Stepper (Loehne, Germany) and others.\n\
+copyright = Copyright (c) 2004-2022 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 8e87a07148..706b9249bd 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.602.qualifier"
+ version="4.1.603.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 843c644751..a7db0cecb2 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.602-SNAPSHOT</version>
+ <version>4.1.603-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.lm-feature/.project b/features/org.eclipse.emf.cdo.lm-feature/.project
new file mode 100644
index 0000000000..cf658fbdcb
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/.project
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.cdo.lm-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</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>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng/versions/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</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/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..9b58a30859
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 04 12:36:04 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..d573634502
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Thu Feb 04 10:06:10 CET 2010
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..3556bac076
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/.settings/org.eclipse.mylyn.team.ui.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 10:06:10 CET 2010
+commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url}
+eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.lm-feature/build.properties b/features/org.eclipse.emf.cdo.lm-feature/build.properties
new file mode 100644
index 0000000000..42d1d3cbdb
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/build.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 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
+
+bin.includes = feature.xml,\
+ feature.properties
+src.includes = pom.xml
diff --git a/features/org.eclipse.emf.cdo.lm-feature/feature.properties b/features/org.eclipse.emf.cdo.lm-feature/feature.properties
new file mode 100644
index 0000000000..373e9d79da
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/feature.properties
@@ -0,0 +1,8 @@
+# Copyright (c) 2022 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
+
+featureName = CDO Model Repository (Lifecycle Management)
+description = Contains the CDO lifecycle management client and user interface plugins.
diff --git a/features/org.eclipse.emf.cdo.lm-feature/feature.xml b/features/org.eclipse.emf.cdo.lm-feature/feature.xml
new file mode 100644
index 0000000000..1e8e92b472
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/feature.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2022 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
+-->
+<feature
+ id="org.eclipse.emf.cdo.lm"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ license-feature="org.eclipse.emf.cdo.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.assembly"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.assembly.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.modules"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.modules.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.lm.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.lm-feature/pom.xml b/features/org.eclipse.emf.cdo.lm-feature/pom.xml
new file mode 100644
index 0000000000..d6b0602a1b
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.lm-feature/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017-2022 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.features</artifactId>
+ <version>4.7.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.cdo.releng.parent/features</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.cdo.features</groupId>
+ <artifactId>org.eclipse.emf.cdo.lm</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.migrator-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.migrator-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
index b43f5d8bd7..9b930e224d 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2012, 2015-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2011, 2012, 2015-2022 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.migrator"
label="%featureName"
- version="4.4.7.qualifier"
+ version="4.4.9.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 f4d73b8a32..f7d54a4881 100644
--- a/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.migrator-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.migrator</artifactId>
- <version>4.4.7-SNAPSHOT</version>
+ <version>4.4.9-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs
index b9743bf086..c7a37d5e96 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs
+++ b/features/org.eclipse.emf.cdo.sdk-feature/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
eclipse.preferences.version=1
encoding/.project=UTF-8
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 93f1bdb055..4eba043f66 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.sdk"
label="%featureName"
- version="5.9.0.qualifier"
+ version="5.12.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
@@ -64,6 +64,10 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.emf.cdo.ecore.dependencies"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.emf.cdo.examples.installer"
version="0.0.0"/>
diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
index b0b5a8e8f2..09e4af3931 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.sdk</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index 9831d2d54d..ccda5c4e66 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.server"
label="%featureName"
- version="4.16.0.qualifier"
+ version="4.19.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 69e07c4570..f1a47ab91e 100644
--- a/features/org.eclipse.emf.cdo.server-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.server</artifactId>
- <version>4.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.db-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.db-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.db-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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 82dd3876cc..35781b103f 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2010-2022 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.server.db"
label="%featureName"
- version="4.11.0.qualifier"
+ version="4.11.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.server.db-feature/pom.xml b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
index 59b01e28cb..0b96311be2 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.db-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.server.db</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.11.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.embedded-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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 2488e63f01..9094a6225c 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2016-2022 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.server.embedded"
label="%featureName"
- version="4.16.0.qualifier"
+ version="4.19.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 be6a0399a6..3f6a187b3e 100644
--- a/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.embedded-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.server.embedded</artifactId>
- <version>4.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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 d073173895..e4f6314203 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.3.qualifier"
+ version="4.3.5.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 2309a670a8..b375f54289 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.3-SNAPSHOT</version>
+ <version>4.3.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.mongodb-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
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 f50e52e326..10dd74c076 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.4.qualifier"
+ version="5.1.5.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 0f666d5056..af72df188b 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.4-SNAPSHOT</version>
+ <version>5.1.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.tests-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.tests-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.tests-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index d9b17e5bbf..d7a3e44e2a 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.tests"
label="%featureName"
- version="4.5.2.qualifier"
+ version="4.6.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
@@ -42,6 +42,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.emf.cdo.tests.lm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.emf.cdo.tests.db"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.cdo.tests-feature/pom.xml b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
index ac21a0bf16..6c5d95a72a 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.tests</artifactId>
- <version>4.5.2-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 2067f57b66..fc166f7b91 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.16.0.qualifier"
+ version="4.19.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 39fa87ef26..41bbb8b6e6 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml
index 01926832c7..1730da9c1b 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.15.0.qualifier"
+ version="4.18.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 580ac1523d..17e964d5d4 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.15.0-SNAPSHOT</version>
+ <version>4.18.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 79f5993f94..e5e1f5c47b 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-2021 Eike Stepper (Berlin, Germany) and others.
+Copyright (c) 2004-2022 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/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.derby-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.derby-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.derby-feature/feature.xml b/features/org.eclipse.net4j.db.derby-feature/feature.xml
index 31d7b02c5c..1d600e510c 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.502.qualifier"
+ version="4.2.503.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 bb3ecff43b..e12f9818d7 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.502-SNAPSHOT</version>
+ <version>4.2.503-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.doc-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.doc-feature/feature.xml b/features/org.eclipse.net4j.db.doc-feature/feature.xml
index c36be9e581..b7ea6888ce 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.4.qualifier"
+ version="4.3.5.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 857385dedc..57a310b259 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.4-SNAPSHOT</version>
+ <version>4.3.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.h2-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.h2-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.h2-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index fce2a53031..5b2218c007 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.5.1.qualifier"
+ version="4.5.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.db.h2-feature/pom.xml b/features/org.eclipse.net4j.db.h2-feature/pom.xml
index b92f116ea5..2d0e3341cc 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.5.1-SNAPSHOT</version>
+ <version>4.5.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.hsqldb-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.hsqldb-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml
index d2b205e056..3bb12cdc8c 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.4.1.qualifier"
+ version="4.4.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.db.hsqldb-feature/pom.xml b/features/org.eclipse.net4j.db.hsqldb-feature/pom.xml
index 6220f2948d..25084811dc 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.4.1-SNAPSHOT</version>
+ <version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.mysql-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.mysql-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.mysql-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.mysql-feature/feature.xml b/features/org.eclipse.net4j.db.mysql-feature/feature.xml
index 4b846bab01..c322f76bce 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.4.1.qualifier"
+ version="4.4.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.db.mysql-feature/pom.xml b/features/org.eclipse.net4j.db.mysql-feature/pom.xml
index ce5670f5f6..ea4ee6a123 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.4.1-SNAPSHOT</version>
+ <version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.oracle-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.oracle-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.oracle-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.oracle-feature/feature.xml b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
index 043c938d39..d24be097ce 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.3.1.qualifier"
+ version="1.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.db.oracle-feature/pom.xml b/features/org.eclipse.net4j.db.oracle-feature/pom.xml
index f51e2b98fc..13a1639fb2 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.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.postgresql-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.db.postgresql-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml
index bfa6b73bb1..c15ba1eee6 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.4.1.qualifier"
+ version="4.4.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.db.postgresql-feature/pom.xml b/features/org.eclipse.net4j.db.postgresql-feature/pom.xml
index 4a3ea2b333..53db306377 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.4.1-SNAPSHOT</version>
+ <version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.doc-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.doc-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.doc-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.doc-feature/feature.xml b/features/org.eclipse.net4j.doc-feature/feature.xml
index 9a55d949a7..0382689124 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.4.qualifier"
+ version="4.3.5.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 112671146f..662771232b 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.4-SNAPSHOT</version>
+ <version>4.3.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.examples-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.examples-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index 86059283f1..5f6935ad70 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2013, 2015-2022 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.6.qualifier"
+ version="4.3.8.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 54a27977b0..9f00584031 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.6-SNAPSHOT</version>
+ <version>4.3.8-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples.installer-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.examples.installer-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.examples.installer-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.examples.installer-feature/feature.xml b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
index d5b2a6c024..064ef0787d 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2012, 2013, 2015-2022 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.5.qualifier"
+ version="4.3.7.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 3247c771a8..c8e22dd3f6 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.5-SNAPSHOT</version>
+ <version>4.3.7-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.sdk-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.sdk-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.sdk-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index a35e03fc7d..f35463fffd 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2022 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.16.0.qualifier"
+ version="4.19.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 12b785617f..230b83919b 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.16.0-SNAPSHOT</version>
+ <version>4.19.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.tests-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.tests-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.tests-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index 585c3ef895..0b3e7caae3 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.6.qualifier"
+ version="4.3.7.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 07f3fe52a5..f49e683ddb 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.6-SNAPSHOT</version>
+ <version>4.3.7-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.ui-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.ui-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.ui-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml
index 643d52774f..3aa72e4ae7 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.ui-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007-2012, 2015-2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2007-2012, 2015-2017, 2019-2022 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.ui"
label="%featureName"
- version="4.6.0.qualifier"
+ version="4.7.0.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 ddfd5b4a27..8b4e019134 100644
--- a/features/org.eclipse.net4j.ui-feature/pom.xml
+++ b/features/org.eclipse.net4j.ui-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019-2022 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.ui</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.util-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.util-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.util-feature/feature.xml b/features/org.eclipse.net4j.util-feature/feature.xml
index c18626b364..8098f2da3d 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2011-2022 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.15.0.qualifier"
+ version="4.18.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 5de8f14666..60b03bb4e3 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.15.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.util.doc-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.util.doc-feature/feature.xml b/features/org.eclipse.net4j.util.doc-feature/feature.xml
index 035376470b..5ad6ae037b 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.4.qualifier"
+ version="4.3.5.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 a854fae53e..d01421627d 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.4-SNAPSHOT</version>
+ <version>4.3.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.util.ui-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.util.ui-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.util.ui-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.util.ui-feature/feature.xml b/features/org.eclipse.net4j.util.ui-feature/feature.xml
index e0324c4194..3fac147110 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2011-2022 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.15.0.qualifier"
+ version="4.18.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 a1b96647a8..1c98a0465f 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.15.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.ws-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.ws-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/features/org.eclipse.net4j.ws-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.net4j.ws-feature/feature.xml b/features/org.eclipse.net4j.ws-feature/feature.xml
index ede58d0c06..29c5d864e2 100644
--- a/features/org.eclipse.net4j.ws-feature/feature.xml
+++ b/features/org.eclipse.net4j.ws-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ws"
label="%featureName"
- version="1.2.0.qualifier"
+ version="1.2.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 4ef7ee34f9..f71e081e34 100644
--- a/features/org.eclipse.net4j.ws-feature/pom.xml
+++ b/features/org.eclipse.net4j.ws-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.ws</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
index 31269a7b24..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.admin/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:59:04 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 2605b19243..a8ae660a7d 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) 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>
+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) 2022 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/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
index 63a1f4de1a..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 13:00:51 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 2605b19243..a8ae660a7d 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) 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>
+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) 2022 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 71eea1fea5..6a102301d6 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.15.0.qualifier
+Bundle-Version: 4.18.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.15.0",
- org.eclipse.emf.cdo.common.admin;version="4.15.0",
- org.eclipse.emf.cdo.common.branch;version="4.15.0",
- org.eclipse.emf.cdo.common.commit;version="4.15.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.15.0",
- org.eclipse.emf.cdo.common.id;version="4.15.0",
- org.eclipse.emf.cdo.common.lob;version="4.15.0",
- org.eclipse.emf.cdo.common.lock;version="4.15.0",
- org.eclipse.emf.cdo.common.model;version="4.15.0",
- org.eclipse.emf.cdo.common.protocol;version="4.15.0",
- org.eclipse.emf.cdo.common.revision;version="4.15.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.15.0",
- org.eclipse.emf.cdo.common.security;version="4.15.0",
- org.eclipse.emf.cdo.common.util;version="4.15.0",
- org.eclipse.emf.cdo.internal.common;version="4.15.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.18.0",
+ org.eclipse.emf.cdo.common.admin;version="4.18.0",
+ org.eclipse.emf.cdo.common.branch;version="4.18.0",
+ org.eclipse.emf.cdo.common.commit;version="4.18.0",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.18.0",
+ org.eclipse.emf.cdo.common.id;version="4.18.0",
+ org.eclipse.emf.cdo.common.lob;version="4.18.0",
+ org.eclipse.emf.cdo.common.lock;version="4.18.0",
+ org.eclipse.emf.cdo.common.model;version="4.18.0",
+ org.eclipse.emf.cdo.common.protocol;version="4.18.0",
+ org.eclipse.emf.cdo.common.revision;version="4.18.0",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.18.0",
+ org.eclipse.emf.cdo.common.security;version="4.18.0",
+ org.eclipse.emf.cdo.common.util;version="4.18.0",
+ org.eclipse.emf.cdo.internal.common;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -38,9 +38,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.18.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -49,7 +49,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -60,9 +60,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.15.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.18.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -71,7 +71,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -80,7 +80,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -89,7 +89,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.util;version="4.15.0";
+ org.eclipse.emf.cdo.internal.common.util;version="4.18.0";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -98,15 +98,15 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.15.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.15.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.15.0",
- org.eclipse.emf.cdo.spi.common.util;version="4.15.0"
+ org.eclipse.emf.cdo.spi.common;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.id;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.model;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.18.0",
+ org.eclipse.emf.cdo.spi.common.util;version="4.18.0"
Automatic-Module-Name: org.eclipse.emf.cdo.common
Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/plugin.xml b/plugins/org.eclipse.emf.cdo.common/plugin.xml
index 5eb70e7e4d..b331ff7431 100644
--- a/plugins/org.eclipse.emf.cdo.common/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.common/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2018, 2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2018, 2021, 2022 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
@@ -13,7 +13,12 @@
<plugin>
- <extension point="org.eclipse.core.expressions.propertyTesters">
+ <extension point="org.eclipse.net4j.util.productGroups">
+ <productGroup id="org.eclipse.emf.cdo.common.util.uriHandlers" name="URI Handlers"/>
+ <productGroup id="org.eclipse.emf.cdo.common.ResourceSetConfigurers" name="Resource Set Configurers"/>
+ </extension>
+
+ <extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
id="org.eclipse.emf.cdo.repository.properties"
type="org.eclipse.emf.cdo.common.CDOCommonRepository"
@@ -26,6 +31,6 @@
namespace="org.eclipse.emf.cdo.branch"
properties="id,name,pathName,baseBranchID,baseBranchID,baseTimeStamp,deleted,local,main,proxy"
class="org.eclipse.emf.cdo.internal.common.branch.BranchProperties$Tester"/>
- </extension>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index 707fa57dac..28c77f3869 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-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017-2022 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.15.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index 001a1105ed..ea7e5f3f92 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2015, 2016, 2019-2022 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
@@ -101,7 +101,7 @@ public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<C
/**
* @since 4.4
*/
- public void setName(String name);
+ public void setName(String name) throws CDODuplicateBranchException;
/**
* Returns the fully qualified path name of this branch, a concatenation of the names of all branches from the
@@ -190,13 +190,13 @@ public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<C
* special time stamp <i> {@link CDOBranchPoint#UNSPECIFIED_DATE unspecified}</i>
* @see #createBranch(String)
*/
- public CDOBranch createBranch(String name, long timeStamp);
+ public CDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException;
/**
* Creates a sub branch of this branch with the given name, {@link #getBase() based} at the {@link CDOTimeProvider
* current time}.
*/
- public CDOBranch createBranch(String name);
+ public CDOBranch createBranch(String name) throws CDODuplicateBranchException;
/**
* Deletes this branch and all its sub branches.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java
new file mode 100644
index 0000000000..7fcb9779f6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDODuplicateBranchException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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.branch;
+
+/**
+ * @author Eike Stepper
+ * @since 4.16
+ */
+public class CDODuplicateBranchException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ public CDODuplicateBranchException(CDOBranch branch)
+ {
+ super("The branch " + branch.getPathName() + " already exists");
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
index ace54e4779..f3bbb68cc3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOClassInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011-2013, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011-2013, 2019, 2020, 2022 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
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.common.model;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOClassInfo;
import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -73,6 +74,11 @@ public interface CDOClassInfo extends Adapter
public EStructuralFeature[] getAllPersistentMapFeatures();
/**
+ * @since 4.16
+ */
+ public EAttribute[] getAllPersistentLobAttributes();
+
+ /**
* @deprecated As of 4.2 pushed down to {@link InternalCDOClassInfo#getPersistentFeatureIndex(EStructuralFeature)}.
*/
@Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
index 24d037bc09..786e451db7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2017 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 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
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
index a18b36ffb3..63dbeb5329 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016, 2017, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2017, 2020, 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
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
index 22b7cafe5c..ffcff1f169 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2018, 2020, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2018, 2020-2022 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
@@ -338,6 +338,11 @@ public interface CDOProtocolConstants
*/
public static final short SIGNAL_AUTHORIZE_OPERATIONS = 68;
+ /**
+ * @since 4.17
+ */
+ public static final short SIGNAL_REMOTE_TOPIC = 69;
+
// //////////////////////////////////////////////////////////////////////
// Session Refresh
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
index 63bd4b1d6e..4fe8b0a298 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2021, 2022 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
@@ -19,8 +19,9 @@ class CDOProtocolVersion
static
{
- VALUE = 45; // SIGNAL_AUTHORIZE_OPERATIONS
+ VALUE = 46; // SIGNAL_REMOTE_TOPIC
+ // VALUE = 45; // SIGNAL_AUTHORIZE_OPERATIONS
// VALUE = 44; // SIGNAL_VIEW_CLOSED_NOTIFICATION
// VALUE = 43; // SIGNAL_DELETE_BRANCH
// VALUE = 42; // CDOPrefetcherManager, see bug 576893
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index 7a046d81e6..22bde8f587 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2016, 2018-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2016, 2018-2022 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
@@ -796,7 +796,7 @@ public final class CDORevisionUtil
out.println("<tr>");
out.println("<td>");
- out.println("<h4>" + branch.getName() + "[" + branch.getID() + "]</h4>");
+ out.println("<h4>" + branch.getName() + " [" + branch.getID() + "]</h4>");
out.println("</td>");
out.println("<td>");
out.println("<h4>" + CDOCommonUtil.formatTimeStamp(branch.getBase().getTimeStamp()) + " / "
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
index 218fadf69c..8f1bf95805 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2016 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2016, 2022 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
@@ -31,13 +31,19 @@ public interface CDOQueryInfo
public static final int UNLIMITED_RESULTS = -1;
/**
- * The name of a {@link Boolean} typed {@link #getParameters() parameter} to influence automatic response flushing (the default) after each query result.
+ * The name of a {@link Boolean}-typed {@link #getParameters() parameter} to influence automatic response flushing (the default) after each query result.
*
* @since 4.2
*/
public static final String PARAM_DISABLE_RESPONSE_FLUSHING = "disable.response.flushing";
/**
+ * The name of a {@link Boolean}-typed {@link #getParameters() parameter} that can suppress timeouts during slow query execution on the server.
+ * @since 4.18
+ */
+ public static final String PARAM_DISABLE_RESPONSE_TIMEOUT = "disable.response.timeout";
+
+ /**
* Returns the language identifier of this query, never <code>null</code>.
*/
public String getQueryLanguage();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
index ca4e0ab48c..4fa2c9ba7c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2016, 2019, 2021, 2022 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
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchChangedEvent.ChangeKind;
import org.eclipse.emf.cdo.common.branch.CDOBranchCreationContext;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader;
@@ -28,6 +29,7 @@ import org.eclipse.net4j.util.AdapterUtil;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.container.Container;
import org.eclipse.net4j.util.event.Event;
+import org.eclipse.net4j.util.io.RemoteException;
import org.eclipse.net4j.util.om.monitor.Monitor;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
@@ -126,10 +128,12 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
}
@Override
- public void setName(String name)
+ public void setName(String name) throws CDODuplicateBranchException
{
checkActive();
+ CDOBranchManagerImpl.checkBranchName(name);
+
BranchLoader branchLoader = branchManager.getBranchLoader();
if (!(branchLoader instanceof BranchLoader3))
{
@@ -139,7 +143,15 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
String oldName = getName();
if (!ObjectUtil.equals(name, oldName))
{
- ((BranchLoader3)branchLoader).renameBranch(id, oldName, name);
+ try
+ {
+ ((BranchLoader3)branchLoader).renameBranch(id, oldName, name);
+ }
+ catch (RemoteException ex)
+ {
+ throw ex.unwrap();
+ }
+
basicSetName(name);
}
}
@@ -245,18 +257,13 @@ public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBr
}
@Override
- public InternalCDOBranch createBranch(String name, long timeStamp)
+ public InternalCDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException
{
- if (!branchManager.getRepository().isSupportingBranches())
- {
- throw new IllegalStateException("Branching is not supported");
- }
-
return branchManager.createBranch(BranchLoader.NEW_BRANCH, name, this, timeStamp);
}
@Override
- public InternalCDOBranch createBranch(String name)
+ public InternalCDOBranch createBranch(String name) throws CDODuplicateBranchException
{
return createBranch(name, CDOBranchPoint.UNSPECIFIED_DATE);
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index 626d446aee..e4be9149bd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2016, 2019-2022 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
@@ -22,6 +22,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag.TagEvent;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag.TagMovedEvent;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.common.util.CDOException;
import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
import org.eclipse.emf.cdo.internal.common.bundle.OM;
@@ -30,12 +31,14 @@ import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.BranchInfo;
+import org.eclipse.net4j.util.StringUtil;
import org.eclipse.net4j.util.collection.Pair;
import org.eclipse.net4j.util.container.Container;
import org.eclipse.net4j.util.container.ContainerEvent;
import org.eclipse.net4j.util.container.IContainerDelta;
import org.eclipse.net4j.util.event.Event;
import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.io.RemoteException;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
import org.eclipse.net4j.util.ref.ReferenceValueMap;
@@ -344,11 +347,27 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
}
@Override
- public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp)
+ public InternalCDOBranch createBranch(int branchID, String name, InternalCDOBranch baseBranch, long baseTimeStamp) throws CDODuplicateBranchException
{
checkActive();
- Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+ if (!repository.isSupportingBranches())
+ {
+ throw new IllegalStateException("Branching is not supported");
+ }
+
+ checkBranchName(name);
+
+ Pair<Integer, Long> result;
+ try
+ {
+ result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
+ }
+ catch (RemoteException ex)
+ {
+ throw ex.unwrap();
+ }
+
int actualBranchID = result.getElement1();
long actualBaseTimeStamp = result.getElement2();
@@ -767,6 +786,19 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
checkState(branchLoader, "branchLoader"); //$NON-NLS-1$
}
+ public static void checkBranchName(String name) throws IllegalArgumentException
+ {
+ if (StringUtil.isEmpty(name))
+ {
+ throw new IllegalArgumentException("Branch name is empty");
+ }
+
+ if (name.indexOf('/') != -1)
+ {
+ throw new IllegalArgumentException("Branch name contains '/'");
+ }
+ }
+
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
index 9d76250189..77d68b97b7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2017, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2017, 2019, 2020, 2022 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
@@ -115,7 +115,7 @@ public final class CDOIDObjectLongImpl extends AbstractCDOID implements Internal
@Override
protected int doCompareTo(CDOID o) throws ClassCastException
{
- return Long.valueOf(value).compareTo(((CDOIDObjectLongImpl)o).value);
+ return Long.compare(value, ((CDOIDObjectLongImpl)o).value);
}
private Object readResolve() throws ObjectStreamException
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
index 6a036ce475..1b3384ed85 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectUUIDImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2019, 2022 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
@@ -115,28 +115,15 @@ public final class CDOIDObjectUUIDImpl extends AbstractCDOID implements Internal
{
byte thisByte = value[i];
byte thatByte = thatValue[i];
- if (thisByte < thatByte)
- {
- return -1;
- }
- if (thisByte > thatByte)
+ int result = Byte.compare(thisByte, thatByte);
+ if (result != 0)
{
- return 1;
+ return result;
}
}
- if (value.length < thatValue.length)
- {
- return -1;
- }
-
- if (value.length > thatValue.length)
- {
- return 1;
- }
-
- return 0;
+ return Integer.compare(value.length, thatValue.length);
}
private Object readResolve() throws ObjectStreamException
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
index 1c6b0af494..46b410d8a7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDTempObjectImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2013, 2017, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2008-2013, 2017, 2019, 2022 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
@@ -105,18 +105,7 @@ public final class CDOIDTempObjectImpl extends AbstractCDOID implements CDOIDTem
@Override
protected int doCompareTo(CDOID o) throws ClassCastException
{
- CDOIDTempObjectImpl that = (CDOIDTempObjectImpl)o;
- if (value < that.value)
- {
- return -1;
- }
-
- if (value > that.value)
- {
- return 1;
- }
-
- return 0;
+ return Integer.compare(value, ((CDOIDTempObjectImpl)o).value);
}
private static int getHashCode(int value)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
index baf8afda82..c245d71fbb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/NormalCDOLockOwner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, 2015, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * 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
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index 8af925d42a..e523ffbfa6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011-2013, 2016, 2018-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009, 2011-2013, 2016, 2018-2022 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
@@ -28,6 +28,7 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -73,6 +74,8 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
private EStructuralFeature[] allPersistentMapFeatures;
+ private EAttribute[] allPersistentLobAttributes;
+
private int[] persistentFeatureIndices;
private int settingsFeatureCount;
@@ -213,6 +216,12 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
}
@Override
+ public EAttribute[] getAllPersistentLobAttributes()
+ {
+ return allPersistentLobAttributes;
+ }
+
+ @Override
public int getPersistentFeatureIndex(EStructuralFeature feature) throws IllegalArgumentException
{
int featureID = eClass.getFeatureID(feature);
@@ -305,6 +314,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
List<EReference> persistentReferences = new ArrayList<>();
List<EStructuralFeature> persistentContainments = new ArrayList<>();
List<EStructuralFeature> persistentMapFeatures = new ArrayList<>();
+ List<EAttribute> persistentLobAttributes = new ArrayList<>();
// Used for tests for containment
EStructuralFeature[] containments = ((EClassImpl.FeatureSubsetSupplier)eClass.getEAllStructuralFeatures()).containments();
@@ -338,6 +348,10 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
persistentOppositeBits.set(featureID);
}
}
+ else if (CDOModelUtil.isLob(feature.getEType()))
+ {
+ persistentLobAttributes.add((EAttribute)feature);
+ }
if (isMap(feature))
{
@@ -382,6 +396,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
allPersistentReferences = persistentReferences.toArray(new EReference[persistentReferences.size()]);
allPersistentContainments = persistentContainments.toArray(new EStructuralFeature[persistentContainments.size()]);
allPersistentMapFeatures = persistentMapFeatures.toArray(new EStructuralFeature[persistentMapFeatures.size()]);
+ allPersistentLobAttributes = persistentLobAttributes.toArray(new EAttribute[persistentLobAttributes.size()]);
persistentFeatureIndices = new int[allFeatures.size()];
Arrays.fill(persistentFeatureIndices, NO_SLOT);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
index 6a77bcaf00..e7daa3910b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranch.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2019, 2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2019, 2021, 2022 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
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.spi.common.branch;
import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager.BranchLoader.BranchInfo;
/**
@@ -40,10 +41,10 @@ public interface InternalCDOBranch extends CDOBranch
public InternalCDOBranch getBranch(String path);
@Override
- public InternalCDOBranch createBranch(String name, long timeStamp);
+ public InternalCDOBranch createBranch(String name, long timeStamp) throws CDODuplicateBranchException;
@Override
- public InternalCDOBranch createBranch(String name);
+ public InternalCDOBranch createBranch(String name) throws CDODuplicateBranchException;
public BranchInfo getBranchInfo();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
index 8974b985b8..752ea66254 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/InternalCDOBranchManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013, 2015, 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2010-2013, 2015, 2017, 2019-2022 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
@@ -17,6 +17,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchHandler;
import org.eclipse.emf.cdo.common.branch.CDOBranchManager;
import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.branch.CDOBranchTag;
+import org.eclipse.emf.cdo.common.branch.CDODuplicateBranchException;
import org.eclipse.emf.cdo.common.protocol.CDODataInput;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
@@ -75,7 +76,7 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle
@Override
public InternalCDOBranch getBranch(String path);
- public InternalCDOBranch createBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp);
+ public InternalCDOBranch createBranch(int id, String name, InternalCDOBranch baseBranch, long baseTimeStamp) throws CDODuplicateBranchException;
/**
* @since 4.15
@@ -358,7 +359,7 @@ public interface InternalCDOBranchManager extends CDOBranchManager, ILifecycle
*/
public interface BranchLoader3 extends BranchLoader2
{
- public void renameBranch(int branchID, String oldName, String newName);
+ public void renameBranch(int branchID, String oldName, String newName) throws CDODuplicateBranchException;
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
index d269ee6e13..b9ad8bad65 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/AbstractCDOID.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009-2013, 2018, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2009-2013, 2018, 2019, 2022 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,6 +12,7 @@
package org.eclipse.emf.cdo.spi.common.id;
import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDUtil;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
import org.eclipse.net4j.util.io.ExtendedDataInput;
@@ -103,6 +104,12 @@ public abstract class AbstractCDOID implements CDOID
@Override
public final int compareTo(CDOID o)
{
+ if (CDOIDUtil.isNull(o))
+ {
+ // All non-null IDs are greater than the null ID.
+ return 1;
+ }
+
try
{
return doCompareTo(o);
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
index 31269a7b24..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:59:04 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 2605b19243..a8ae660a7d 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) 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>
+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) 2022 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 797f64bf34..8d1007fb35 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.compare;singleton:=true
-Bundle-Version: 4.5.1.qualifier
+Bundle-Version: 4.6.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,8 +11,8 @@ 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,
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.1",
- org.eclipse.emf.cdo.internal.compare.bundle;version="4.5.1";x-friends:="org.eclipse.emf.cdo.tests"
+Export-Package: org.eclipse.emf.cdo.compare;version="4.6.1",
+ org.eclipse.emf.cdo.internal.compare.bundle;version="4.6.1";x-friends:="org.eclipse.emf.cdo.tests"
Bundle-ActivationPolicy: lazy
Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
com.google.common.collect;version="[27.0.0,30.2.0)",
diff --git a/plugins/org.eclipse.emf.cdo.compare/plugin.xml b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
index 0495b2fa77..477a8c90a3 100644
--- a/plugins/org.eclipse.emf.cdo.compare/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2021, 2022 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
@@ -19,4 +19,21 @@
uri="http://www.eclipse.org/emf/compare"/>
</extension>
+ <extension point="org.eclipse.emf.compare.rcp.matchEngine">
+ <engineFactory
+ class="org.eclipse.emf.cdo.compare.CDOCompare$CDOMatchEngine$Factory"
+ description="A CDO-specific match engine"
+ label="CDO Match Engine"
+ ranking="10"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.compare.rcp.diffEngine">
+ <descriptor
+ id="org.eclipse.emf.compare.rcp.cdo.diffEngine"
+ description="A diff engine that creates and uses CDO-specific feature filters"
+ impl="org.eclipse.emf.cdo.compare.CDOCompare$CDODiffEngine"
+ label="CDO Diff Engine"
+ ranking="200"/>
+ </extension>
+
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.compare/pom.xml b/plugins/org.eclipse.emf.cdo.compare/pom.xml
index 0bbbb77651..267adebe39 100644
--- a/plugins/org.eclipse.emf.cdo.compare/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.compare/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019-2022 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.compare</artifactId>
- <version>4.5.1-SNAPSHOT</version>
+ <version>4.6.1-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 552f856110..7c18bcf94d 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, 2016, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2013, 2015, 2016, 2019-2022 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
@@ -107,6 +107,14 @@ public class CDOCompare
}
}
+ /**
+ * @since 4.6
+ */
+ public boolean useRCPRegistries()
+ {
+ return USE_RCP_REGISTRIES;
+ }
+
public Comparison compare(IComparisonScope scope)
{
Function<EObject, String> idFunction = createIDFunction();
@@ -146,7 +154,7 @@ public class CDOCompare
{
Builder builder = EMFCompare.builder();
- if (USE_RCP_REGISTRIES)
+ if (useRCPRegistries())
{
org.eclipse.emf.compare.rcp.internal.extension.IEMFCompareBuilderConfigurator configurator = //
org.eclipse.emf.compare.rcp.internal.extension.impl.EMFCompareBuilderConfigurator.createDefault();
@@ -202,6 +210,11 @@ public class CDOCompare
protected IMatchEngine.Factory.Registry createMatchEngineFactoryRegistry(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
+ if (useRCPRegistries())
+ {
+ return null;
+ }
+
IMatchEngine.Factory.Registry registry = new MatchEngineFactoryRegistryImpl();
registry.add(new CDOMatchEngine.Factory(matcher, comparisonFactory));
return registry;
@@ -209,6 +222,11 @@ public class CDOCompare
protected IDiffEngine createDiffEngine()
{
+ if (useRCPRegistries())
+ {
+ return null;
+ }
+
return new CDODiffEngine();
}
@@ -460,7 +478,10 @@ public class CDOCompare
*/
public static class CDOMatchEngine extends DefaultMatchEngine
{
- CDOMatchEngine(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
+ /**
+ * @since 4.6
+ */
+ public CDOMatchEngine(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
super(matcher, comparisonFactory);
}
@@ -483,6 +504,21 @@ public class CDOCompare
private int ranking;
+ /**
+ * Default factory configuration used by EMF Compare diff engine factory extension point
+ *
+ * @since 4.6
+ */
+ public Factory()
+ {
+ CDOCompare compare = new CDOCompare();
+ CDOIDFunction idFunction = compare.createIDFunction();
+ IdentifierEObjectMatcher matcher = compare.createMatcher(idFunction);
+ IEqualityHelperFactory equalityHelperFactory = compare.createEqualityHelperFactory();
+ IComparisonFactory comparisonFactory = compare.createComparisonFactory(equalityHelperFactory);
+ matchEngine = createMatchEngine(matcher, comparisonFactory);
+ }
+
public Factory(IEObjectMatcher matcher, IComparisonFactory comparisonFactory)
{
matchEngine = createMatchEngine(matcher, comparisonFactory);
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 66379b2e3b..d25c415a7e 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, 2015-2017, 2019-2021 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2013, 2015-2017, 2019-2022 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
@@ -27,14 +27,18 @@ import org.eclipse.emf.cdo.util.ObjectNotFoundException;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.cdo.view.CDOViewOpener;
+import org.eclipse.net4j.util.om.OMPlatform;
+
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.AbstractTreeIterator;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.scope.AbstractComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.EcoreUtil.ProperContentIterator;
@@ -60,6 +64,8 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
{
private static final CDOViewOpener DEFAULT_VIEW_OPENER = CDOCompareUtil.DEFAULT_VIEW_OPENER;
+ private static final boolean COLLECT_RESOURCE_URIS = OMPlatform.INSTANCE.isProperty("org.eclipse.emf.cdo.compare.CDOComparisonScope.COLLECT_RESOURCE_URIS");
+
private boolean resolveProxies = true;
public CDOComparisonScope(Notifier left, Notifier right, Notifier origin)
@@ -317,6 +323,18 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
CDOObject object = view.getObject(id);
if (object != null)
{
+ if (collectResourceURIs() && object instanceof Resource)
+ {
+ URI resourceURI = ((Resource)object).getURI();
+ if (resourceURI != null)
+ {
+ Set<String> resourceURIs = getResourceURIs();
+
+ URIConverter uriConverter = view.getResourceSet().getURIConverter();
+ resourceURIs.add(uriConverter.normalize(resourceURI).toString());
+ }
+ }
+
collectRequiredParentIDs(object, requiredParentIDs);
}
}
@@ -326,6 +344,14 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
}
}
+ /**
+ * @since 4.6
+ */
+ protected boolean collectResourceURIs()
+ {
+ return COLLECT_RESOURCE_URIS;
+ }
+
public static IComparisonScope create(CDOView leftView, CDOView rightView, CDOView[] originView)
{
return create(leftView, rightView, originView, DEFAULT_VIEW_OPENER);
@@ -444,7 +470,7 @@ public abstract class CDOComparisonScope extends AbstractComparisonScope
//$FALL-THROUGH$
}
}
-
+
return null;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
index a3454c7516..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:56 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 8a2c539fa0..fbcd9791d4 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) 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>
+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) 2022 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/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
index 0288f7493e..1fa96c18f5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
-
+encoding/<project>=UTF-8
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 c993e80543..e9ed36ce21 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) 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>
+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) 2022 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.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF
index 7eb8611dc7..21f97e8b92 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/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.gmf;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.1.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.gmf.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -23,16 +23,16 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.resources;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.3.0",
- org.eclipse.emf.cdo.dawn.gmf.util;version="2.3.0",
+Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.resources;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.3.1",
+ org.eclipse.emf.cdo.dawn.gmf.util;version="2.3.1",
org.eclipse.emf.cdo.dawn.transaction;version="2.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.emf.cdo.dawn.gmf
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml b/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
index 7179e7a7ad..a3d26dbad9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ Copyright (c) 2017, 2019, 2020, 2022 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.dawn.gmf</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
index 6bd53f51f3..1a9f4fd3a5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013, 2015, 2019 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2011-2013, 2015, 2019, 2022 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
@@ -205,11 +205,15 @@ public class DawnGMFEditorSupport extends DawnAbstractEditorSupport
@Override
public void handleRemoteLockChanges(Map<Object, DawnState> changedObjects)
{
- for (Object o : changedObjects.keySet())
+ if (!changedObjects.isEmpty())
{
- handleLock((CDOObject)o, getView());
+ for (Object o : changedObjects.keySet())
+ {
+ handleLock((CDOObject)o, getView());
+ }
+
+ refresh();
}
- refresh();
}
private void handleLock(CDOObject object, CDOView cdoView)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
index a3454c7516..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:56 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 8a2c539fa0..fbcd9791d4 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) 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>
+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) 2022 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/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
index 989987b650..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 13:05:14 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 8a2c539fa0..fbcd9791d4 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) 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>
+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) 2022 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/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
index d55dc78437..99f26c0203 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 12:54:22 CEST 2011
eclipse.preferences.version=1
-
+encoding/<project>=UTF-8
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 8a2c539fa0..fbcd9791d4 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) 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\="interfa