Develop

.classpath

@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

.github/workflows/maven.yml

@@ -15,16 +15,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v4.5
+      with:
+        maven-version: 3.9.0
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Copy toolchain      
       run: |
        mkdir -p ~/.m2/
-       echo "<toolchains xmlns=\"http://maven.apache.org/TOOLCHAINS/1.1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd\"><toolchain><type>jdk</type><provides><version>17</version><vendor>eclipse</vendor></provides><configuration><jdkHome>/$JAVA_HOME</jdkHome></configuration></toolchain></toolchains>" > ~/.m2/toolchains.xml
+       echo "<toolchains xmlns=\"http://maven.apache.org/TOOLCHAINS/1.1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd\"><toolchain><type>jdk</type><provides><id>JavaSE-21</id><version>21</version><vendor>eclipse</vendor></provides><configuration><jdkHome>/$JAVA_HOME</jdkHome></configuration></toolchain></toolchains>" > ~/.m2/toolchains.xml
     - name: Build with Maven      
       run:
        mvn -B clean package --file pom.xml

.mvn/extensions.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
-		<version>0.25.0</version>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>4.0.8</version>
 	</extension>
 </extensions>

bundles/org.enterprisedomain.classmaker.cdo.ui/.classpath

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21" />
+	<classpathentry kind="output" path="bin" />
 </classpath>

bundles/org.enterprisedomain.classmaker.cdo.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,10 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17

bundles/org.enterprisedomain.classmaker.cdo.ui/META-INF/MANIFEST.MF

@@ -1,17 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO UI Support
-Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui
-Bundle-Version: 0.8.55.qualifier
+Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui;singleton:=true
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.1",
- org.eclipse.emf.cdo.ui.shared;bundle-version="4.5.0",
- org.eclipse.emf.cdo.ui;bundle-version="4.9.1",
- org.eclipse.emf.cdo.explorer.ui;bundle-version="4.7.1",
- org.eclipse.net4j.tcp;bundle-version="4.2.1",
- org.eclipse.emf.ecp.view.context;bundle-version="1.26.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="1.26.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="1.26.0",
+ org.eclipse.emf.cdo.ui.shared;bundle-version="[4.5.0,5.0.0)",
+ org.eclipse.emf.cdo.ui;bundle-version="[4.9.1,5.0.0)",
+ org.eclipse.emf.cdo.explorer.ui;bundle-version="[4.7.1,5.0.0)",
+ org.eclipse.net4j.tcp;bundle-version="[4.2.1,5.0.0)",
  org.eclipse.equinox.concurrent;bundle-version="1.2.0"
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21

bundles/org.enterprisedomain.classmaker.cdo.ui/build.properties

@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml

bundles/org.enterprisedomain.classmaker.cdo.ui/plugin.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+	<extension
+		point="org.eclipse.emf.cdo.ui.editorOpeners">
+		<editorOpener
+			class="org.enterprisedomain.classmaker.cdo.ui.CDOEditorOpener"
+			icon="platform:/plugin/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/cdo_editor.gif"
+			id="org.enterprisedomain.classmaker.cdo.ui.editorOpener"
+			name="CDO Editor"
+			priority="700"
+			regex="cdo.*">
+		</editorOpener>
+	</extension>
+
+</plugin>

bundles/org.enterprisedomain.classmaker.cdo.ui/pom.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.enterprisedomain</groupId>
 		<artifactId>org.enterprisedomain.root</artifactId>
-		<version>0.8.55-SNAPSHOT</version>
+		<version>0.8.55</version>
 		<relativePath>../../</relativePath>
 	</parent>
 

bundles/org.enterprisedomain.classmaker.cdo.ui/src/org/enterprisedomain/classmaker/cdo/ui/CDOEditorOpener.java

@@ -0,0 +1,54 @@
+package org.enterprisedomain.classmaker.cdo.ui;
+
+import org.eclipse.emf.cdo.explorer.ui.checkouts.CDOModelEditorInput;
+import org.eclipse.emf.cdo.transaction.CDOCommitContext;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionHandler2;
+import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.enterprisedomain.classmaker.core.ClassMakerPlugin;
+
+public class CDOEditorOpener extends org.eclipse.emf.cdo.ui.CDOEditorOpener.Default {
+
+	public CDOEditorOpener() {
+	}
+
+	@Override
+	protected IEditorPart doOpenEditor(IWorkbenchPage page, URI uri) {
+		CDOModelEditorInput editorInput = new CDOModelEditorInput(uri) {
+
+			@Override
+			protected void configureTransaction(CDOTransaction transaction) {
+				transaction.addTransactionHandler(new CDOTransactionHandler2() {
+
+					@Override
+					public void rolledBackTransaction(CDOTransaction transaction) {
+						System.out.println("rolledBackTransaction " + transaction);
+					}
+
+					@Override
+					public void committingTransaction(CDOTransaction transaction, CDOCommitContext commitContext) {
+						System.out.println("committingTransaction " + transaction);
+					}
+
+					@Override
+					public void committedTransaction(CDOTransaction transaction, CDOCommitContext commitContext) {
+						System.out.println("committedTransaction " + transaction);
+					}
+				});
+				super.configureTransaction(transaction);
+			}
+
+		};
+		String editorID = CDOEditorUtil.getEditorID();
+		try {
+			return page.openEditor(editorInput, editorID);
+		} catch (Exception ex) {
+			ClassMakerPlugin.getInstance().getLog().log(ClassMakerPlugin.createErrorStatus(ex));
+			return null;
+		}
+	}
+
+}

bundles/org.enterprisedomain.classmaker.cdo.ui/target/MANIFEST.MF

@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO UI Support
-Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui
-Bundle-Version: 0.8.55.202208170821
+Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo.ui;singleton:=t
+ rue
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Require-Bundle: org.enterprisedomain.classmaker.cdo;bundle-version="0.0.
- 1",org.eclipse.emf.cdo.ui.shared;bundle-version="4.5.0",org.eclipse.emf
- .cdo.ui;bundle-version="4.9.1",org.eclipse.emf.cdo.explorer.ui;bundle-v
- ersion="4.7.1",org.eclipse.net4j.tcp;bundle-version="4.2.1",org.eclipse
- .emf.ecp.view.context;bundle-version="1.26.0",org.eclipse.emf.ecp.ui.vi
- ew;bundle-version="1.26.0",org.eclipse.emf.ecp.ui.view.swt;bundle-versi
- on="1.26.0",org.eclipse.equinox.concurrent;bundle-version="1.2.0"
+ 1",org.eclipse.emf.cdo.ui.shared;bundle-version="[4.5.0,5.0.0)",org.ecl
+ ipse.emf.cdo.ui;bundle-version="[4.9.1,5.0.0)",org.eclipse.emf.cdo.expl
+ orer.ui;bundle-version="[4.7.1,5.0.0)",org.eclipse.net4j.tcp;bundle-ver
+ sion="[4.2.1,5.0.0)",org.eclipse.equinox.concurrent;bundle-version="1.2
+ .0"
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
 

bundles/org.enterprisedomain.classmaker.cdo/.classpath

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="module" value="true" />
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="output" path="bin" />
 </classpath>

bundles/org.enterprisedomain.classmaker.cdo/META-INF/MANIFEST.MF

@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ClassMaker CDO Support
 Bundle-SymbolicName: org.enterprisedomain.classmaker.cdo;singleton:=true
-Bundle-Version: 0.8.55.qualifier
+Bundle-Version: 0.8.55
 Bundle-Vendor: Kyrill Zotkin
 Automatic-Module-Name: org.enterprisedomain.classmaker.cdo
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Activator: org.enterprisedomain.classmaker.cdo.Activator
-Require-Bundle: org.eclipse.osgi;bundle-version="[3.16.200,4.0.0)",
- org.enterprisedomain.classmaker;bundle-version="0.8.55",
- org.eclipse.emf.cdo;bundle-version="4.15.0";visibility:=reexport,
- org.eclipse.emf.cdo.edit;bundle-version="4.5.6";visibility:=reexport
+Require-Bundle: org.eclipse.osgi;bundle-version="[3.18.200,4.0.0)",
+ org.enterprisedomain.classmaker;bundle-version="0.8.55";visibility:=reexport,
+ org.eclipse.emf.cdo;bundle-version="[4.21.0,5.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.edit;bundle-version="[4.5.6,5.0.0)";visibility:=reexport
 Export-Package: org.enterprisedomain.classmaker.cdo