From 4d0054488b6e9174e1b3fd6a396271bdbb96536d Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Tue, 19 Aug 2025 10:48:29 +0200 Subject: [PATCH 01/16] builds to a successfully materialized app --- .classpath | 7 +- .gitignore | 1 + inez-model.testing/.classpath | 2 +- .../org.eclipse.core.resources.prefs | 2 + inez-model.testing/META-INF/MANIFEST.MF | 11 +- inez-model.testing/pom.xml | 2 +- inez-parser.testing/.classpath | 2 +- .../org.eclipse.core.resources.prefs | 2 + inez-parser.testing/META-INF/MANIFEST.MF | 6 +- inez-parser.testing/pom.xml | 2 +- inez-target/inez.target | 332 +++++++----------- inez-target/pom.xml | 2 +- io.github.magwas.inez.ui.product/Inez.product | 117 ++---- io.github.magwas.inez.ui.product/pom.xml | 2 +- io.github.magwas.inez.ui.tests/.classpath | 2 +- .../org.eclipse.core.resources.prefs | 2 + .../META-INF/MANIFEST.MF | 8 +- io.github.magwas.inez.ui.tests/pom.xml | 2 +- io.github.magwas.inez.ui/.classpath | 2 +- io.github.magwas.inez.ui/META-INF/MANIFEST.MF | 52 +-- io.github.magwas.inez.ui/plugin.xml | 2 +- io.github.magwas.inez.ui/pom.xml | 2 +- .../inez/ui/tree/ModelTreeLabelProvider.java | 2 + model/.classpath | 6 +- model/META-INF/MANIFEST.MF | 13 +- model/pom.xml | 2 +- parser/.classpath | 6 +- parser/META-INF/MANIFEST.MF | 12 +- parser/pom.xml | 2 +- pom.xml | 2 +- tools/testRun | 7 + tools/updateManifestVersion | 11 +- 32 files changed, 224 insertions(+), 401 deletions(-) create mode 100644 inez-model.testing/.settings/org.eclipse.core.resources.prefs create mode 100644 inez-parser.testing/.settings/org.eclipse.core.resources.prefs create mode 100644 io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs create mode 100755 tools/testRun diff --git a/.classpath b/.classpath index e8e9c83..0457885 100644 --- a/.classpath +++ b/.classpath @@ -14,20 +14,21 @@ + - - + - + + diff --git a/.gitignore b/.gitignore index 64b1e19..93afadc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .git-versioned-pom.xml xslt .konveyor +workspace diff --git a/inez-model.testing/.classpath b/inez-model.testing/.classpath index 2a8d832..e0b077c 100644 --- a/inez-model.testing/.classpath +++ b/inez-model.testing/.classpath @@ -2,7 +2,7 @@ - + diff --git a/inez-model.testing/.settings/org.eclipse.core.resources.prefs b/inez-model.testing/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/inez-model.testing/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/inez-model.testing/META-INF/MANIFEST.MF b/inez-model.testing/META-INF/MANIFEST.MF index c19fa93..c51b4be 100644 --- a/inez-model.testing/META-INF/MANIFEST.MF +++ b/inez-model.testing/META-INF/MANIFEST.MF @@ -2,18 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing Bundle-SymbolicName: inez-model.testing -Bundle-Version: 0.4.6 -Fragment-Host: inez-model;bundle-version="0.4.6" +Bundle-Version: 0.4.8 +Fragment-Host: inez-model;bundle-version="0.0.1" Import-Package: io.github.magwas.inez.parse, io.github.magwas.inez.parser Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", - junit-jupiter-api;bundle-version="5.12.2", wrapped.org.springframework.spring-test;bundle-version="6.2.9", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", - junit-jupiter-engine;bundle-version="5.12.2", - junit-platform-commons;bundle-version="1.12.2", - junit-platform-engine;bundle-version="1.12.2", - junit-platform-launcher;bundle-version="1.12.2", - junit-platform-runner;bundle-version="1.12.2" + junit-jupiter-api;bundle-version="5.11.4" Automatic-Module-Name: inez.model.testing Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez-model.testing/pom.xml b/inez-model.testing/pom.xml index cc20518..e19d1a8 100644 --- a/inez-model.testing/pom.xml +++ b/inez-model.testing/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/inez-parser.testing/.classpath b/inez-parser.testing/.classpath index 9e9d16a..26c99ff 100644 --- a/inez-parser.testing/.classpath +++ b/inez-parser.testing/.classpath @@ -1,7 +1,7 @@ - + diff --git a/inez-parser.testing/.settings/org.eclipse.core.resources.prefs b/inez-parser.testing/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/inez-parser.testing/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/inez-parser.testing/META-INF/MANIFEST.MF b/inez-parser.testing/META-INF/MANIFEST.MF index fbbaf36..f969bd8 100644 --- a/inez-parser.testing/META-INF/MANIFEST.MF +++ b/inez-parser.testing/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing Bundle-SymbolicName: inez-parser.testing -Bundle-Version: 0.4.6 -Fragment-Host: inez-parser;bundle-version="0.4.6" +Bundle-Version: 0.4.8 +Fragment-Host: inez-parser;bundle-version="0.0.1" Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", - junit-jupiter-api;bundle-version="5.12.2" + junit-jupiter-api;bundle-version="5.11.4" Automatic-Module-Name: inez.parser.testing Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez-parser.testing/pom.xml b/inez-parser.testing/pom.xml index 18144c7..99f9402 100644 --- a/inez-parser.testing/pom.xml +++ b/inez-parser.testing/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml eclipse-plugin diff --git a/inez-target/inez.target b/inez-target/inez.target index d5beafc..c6d84ce 100644 --- a/inez-target/inez.target +++ b/inez-target/inez.target @@ -1,202 +1,136 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.github.magwas - konveyor-base-testing - 0.4.0 - jar - - - io.github.magwas - konveyor-base - 0.4.0 - jar - - - io.micrometer - micrometer-commons - 1.14.8 - jar - - - io.micrometer - micrometer-observation - 1.14.8 - jar - - - org.antlr - antlr4-runtime - 4.13.2 - jar - - - org.eclipse.xtext - org.eclipse.xtext.xbase.lib - 2.39.0 - jar - - - org.mockito - mockito-core - 5.18.0 - jar - - - org.openjfx - javafx-base - 21.0.8 - jar - - - org.openjfx - javafx-controls - 21.0.8 - jar - - - org.openjfx - javafx-graphics - 21.0.8 - jar - - - org.slf4j - slf4j-api - 2.0.2 - jar - - - org.springframework.boot - spring-boot-autoconfigure - 3.5.3 - jar - - - org.springframework.boot - spring-boot - 3.5.3 - jar - - - org.springframework.data - spring-data-commons - 3.5.1 - jar - - - org.springframework.data - spring-data-keyvalue - 3.5.1 - jar - - - org.springframework - spring-aop - 6.2.8 - jar - - - org.springframework - spring-beans - 6.2.8 - jar - - - org.springframework - spring-context - 6.2.8 - jar - - - org.springframework - spring-core - 6.2.8 - jar - - - org.springframework - spring-expression - 6.2.8 - jar - - - org.springframework - spring-jcl - 6.2.8 - jar - - - org.springframework - spring-test - 6.2.9 - jar - - - org.springframework - spring-tx - 6.2.8 - jar - - - - + + + + + + + + + + + + + + + + + + io.github.magwas + konveyor-base-testing + 0.4.0 + jar + + + io.github.magwas + konveyor-base + 0.4.0 + jar + + + io.micrometer + micrometer-commons + 1.14.8 + jar + + + io.micrometer + micrometer-observation + 1.14.8 + jar + + + org.antlr + antlr4-runtime + 4.13.2 + jar + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.7 + jar + + + org.mockito + mockito-core + 5.18.0 + jar + + + org.springframework.boot + spring-boot-autoconfigure + 3.5.3 + jar + + + org.springframework.boot + spring-boot + 3.5.3 + jar + + + org.springframework.data + spring-data-commons + 3.5.1 + jar + + + org.springframework.data + spring-data-keyvalue + 3.5.1 + jar + + + org.springframework + spring-aop + 6.2.8 + jar + + + org.springframework + spring-beans + 6.2.8 + jar + + + org.springframework + spring-context + 6.2.8 + jar + + + org.springframework + spring-core + 6.2.8 + jar + + + org.springframework + spring-expression + 6.2.8 + jar + + + org.springframework + spring-jcl + 6.2.8 + jar + + + org.springframework + spring-test + 6.2.9 + jar + + + org.springframework + spring-tx + 6.2.8 + jar + + + + \ No newline at end of file diff --git a/inez-target/pom.xml b/inez-target/pom.xml index d8b52e2..541fc55 100644 --- a/inez-target/pom.xml +++ b/inez-target/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/io.github.magwas.inez.ui.product/Inez.product b/io.github.magwas.inez.ui.product/Inez.product index 6f26402..560ed27 100644 --- a/io.github.magwas.inez.ui.product/Inez.product +++ b/io.github.magwas.inez.ui.product/Inez.product @@ -1,7 +1,7 @@ - + @@ -30,59 +30,48 @@ - + + - - - + + + - - - + + + + + - + + - - - - - - - - - - - - - - - @@ -90,7 +79,6 @@ - @@ -105,127 +93,72 @@ - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + - - - + - - - - - - - - + - + + + + diff --git a/io.github.magwas.inez.ui.product/pom.xml b/io.github.magwas.inez.ui.product/pom.xml index ed4c4d3..03381b9 100644 --- a/io.github.magwas.inez.ui.product/pom.xml +++ b/io.github.magwas.inez.ui.product/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/io.github.magwas.inez.ui.tests/.classpath b/io.github.magwas.inez.ui.tests/.classpath index 088e131..4e10d0d 100644 --- a/io.github.magwas.inez.ui.tests/.classpath +++ b/io.github.magwas.inez.ui.tests/.classpath @@ -1,7 +1,7 @@ - + diff --git a/io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs b/io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF b/io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF index ca7423f..d541d11 100644 --- a/io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF +++ b/io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: io.github.magwas.inez.ui.tests -Bundle-Version: 0.4.6 -Fragment-Host: io.github.magwas.inez.ui;bundle-version="0.4.6" -Require-Bundle: junit-jupiter-api;bundle-version="5.12.2", - org.mockito.mockito-core;bundle-version="5.18.0" +Bundle-Version: 0.4.8 +Fragment-Host: io.github.magwas.inez.ui;bundle-version="0.0.1" +Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", + junit-jupiter-api;bundle-version="5.11.4" Automatic-Module-Name: io.github.magwas.inez.ui.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/io.github.magwas.inez.ui.tests/pom.xml b/io.github.magwas.inez.ui.tests/pom.xml index 70bea17..fcc38e1 100644 --- a/io.github.magwas.inez.ui.tests/pom.xml +++ b/io.github.magwas.inez.ui.tests/pom.xml @@ -8,7 +8,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/io.github.magwas.inez.ui/.classpath b/io.github.magwas.inez.ui/.classpath index d2911f2..d8b7890 100644 --- a/io.github.magwas.inez.ui/.classpath +++ b/io.github.magwas.inez.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/io.github.magwas.inez.ui/META-INF/MANIFEST.MF b/io.github.magwas.inez.ui/META-INF/MANIFEST.MF index ee5d06a..d14fb5c 100644 --- a/io.github.magwas.inez.ui/META-INF/MANIFEST.MF +++ b/io.github.magwas.inez.ui/META-INF/MANIFEST.MF @@ -2,74 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ui Bundle-SymbolicName: io.github.magwas.inez.ui;singleton:=true -Bundle-Version: 0.4.6 -Require-Bundle: inez-model;bundle-version="0.4.4", +Bundle-Version: 0.4.8 +Require-Bundle: inez-model;bundle-version="0.0.1", org.eclipse.ui;bundle-version="3.108.1", - org.eclipse.ui.source;bundle-version="3.108.1", org.eclipse.equinox.app;bundle-version="1.3.400", - org.eclipse.equinox.app.source;bundle-version="1.3.400", org.eclipse.gef.geometry;bundle-version="5.0.0", - org.eclipse.gef.geometry.doc;bundle-version="5.0.2", - org.eclipse.gef.geometry.source;bundle-version="5.0.0", org.eclipse.e4.core.commands;bundle-version="0.11.100", - org.eclipse.e4.core.commands.source;bundle-version="0.11.100", org.eclipse.e4.core.contexts;bundle-version="1.5.1", - org.eclipse.e4.core.contexts.source;bundle-version="1.5.1", org.eclipse.e4.core.di;bundle-version="1.6.1", org.eclipse.e4.core.di.annotations;bundle-version="1.5.0", - org.eclipse.e4.core.di.annotations.source;bundle-version="1.5.0", org.eclipse.e4.core.di.extensions;bundle-version="0.14.0", - org.eclipse.e4.core.di.extensions.source;bundle-version="0.14.0", - org.eclipse.e4.core.di.source;bundle-version="1.6.1", org.eclipse.e4.core.services;bundle-version="2.0.100", - org.eclipse.e4.core.services.source;bundle-version="2.0.100", org.eclipse.gef.zest.fx;bundle-version="5.1.1", org.eclipse.gef.zest.fx.jface;bundle-version="5.1.1", - org.eclipse.gef.zest.fx.jface.source;bundle-version="5.1.1", - org.eclipse.gef.zest.fx.source;bundle-version="5.1.1", org.eclipse.gef.zest.fx.ui;bundle-version="5.0.3", - org.eclipse.gef.zest.fx.ui.source;bundle-version="5.0.3", org.eclipse.gef.mvc.fx;bundle-version="5.2.0", - org.eclipse.gef.mvc.fx.source;bundle-version="5.2.0", org.eclipse.gef.mvc.fx.ui;bundle-version="5.1.1", - org.eclipse.gef.mvc.fx.ui.source;bundle-version="5.1.1", org.eclipse.gef.fx;bundle-version="5.0.5", - org.eclipse.gef.fx.doc;bundle-version="5.0.5", org.eclipse.gef.fx.jface;bundle-version="5.0.2", - org.eclipse.gef.fx.jface.source;bundle-version="5.0.2", - org.eclipse.gef.fx.source;bundle-version="5.0.5", org.eclipse.gef.fx.swt;bundle-version="5.0.2", - org.eclipse.gef.fx.swt.source;bundle-version="5.0.2", org.eclipse.gef.geometry.convert.fx;bundle-version="5.0.0", - org.eclipse.gef.geometry.convert.fx.source;bundle-version="5.0.0", - jakarta.annotation-api;bundle-version="2.1.1", - jakarta.annotation-api.source;bundle-version="2.1.1", jakarta.inject.jakarta.inject-api;bundle-version="2.0.1", - jakarta.inject.jakarta.inject-api.source;bundle-version="2.0.1", - org.eclipse.ui.editors;bundle-version="3.20.0", - org.eclipse.ui.editors.source;bundle-version="3.20.0", - org.eclipse.ui.forms;bundle-version="3.13.500", - org.eclipse.ui.forms.source;bundle-version="3.13.500", - org.eclipse.ui.ide;bundle-version="3.22.600", - org.eclipse.ui.ide.source;bundle-version="3.22.600", - org.eclipse.ui.navigator;bundle-version="3.13.100", - org.eclipse.ui.navigator.resources;bundle-version="3.9.700", - org.eclipse.ui.navigator.resources.source;bundle-version="3.9.700", - org.eclipse.ui.navigator.source;bundle-version="3.13.100", - org.eclipse.ui.views;bundle-version="3.12.600", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.10.400", - org.eclipse.ui.views.properties.tabbed.source;bundle-version="3.10.400", - org.eclipse.ui.views.source;bundle-version="3.12.600", - org.eclipse.ui.workbench.source;bundle-version="3.135.100", - org.eclipse.ui.workbench.texteditor;bundle-version="3.19.200", - org.eclipse.ui.workbench.texteditor.source;bundle-version="3.19.200", - org.eclipse.core.runtime;bundle-version="3.33.100", - org.eclipse.core.runtime.source;bundle-version="3.33.100", - org.eclipse.ui.genericeditor;bundle-version="1.3.600", - org.eclipse.ui.genericeditor.source;bundle-version="1.3.600", com.google.inject;bundle-version="5.0.1", - wrapped.org.openjfx.javafx-graphics;bundle-version="21.0.8", - wrapped.org.openjfx.javafx-base;bundle-version="21.0.8", - wrapped.org.openjfx.javafx-controls;bundle-version="21.0.8" + org.eclipse.core.runtime;bundle-version="3.33.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.github.magwas.inez.ui diff --git a/io.github.magwas.inez.ui/plugin.xml b/io.github.magwas.inez.ui/plugin.xml index 86a8028..fdfc3d3 100644 --- a/io.github.magwas.inez.ui/plugin.xml +++ b/io.github.magwas.inez.ui/plugin.xml @@ -78,7 +78,7 @@ id="inezproduct" point="org.eclipse.core.runtime.products"> io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java b/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java index e9b45bc..95bf2c9 100644 --- a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java +++ b/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java @@ -1,5 +1,6 @@ package io.github.magwas.inez.ui.tree; +import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.swt.graphics.Image; @@ -12,6 +13,7 @@ public class ModelTreeLabelProvider implements ILabelProvider { @Inject + @Optional IWorkbench workbench; @Override diff --git a/model/.classpath b/model/.classpath index 375657a..a010343 100644 --- a/model/.classpath +++ b/model/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/model/META-INF/MANIFEST.MF b/model/META-INF/MANIFEST.MF index 25cc59e..8d3bbfa 100644 --- a/model/META-INF/MANIFEST.MF +++ b/model/META-INF/MANIFEST.MF @@ -5,33 +5,22 @@ Bundle-Name: inez-model Bundle-SymbolicName: inez-model;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.osgi.SpringBootBundleActivator -Bundle-Version: 0.4.6 +Bundle-Version: 0.4.8 Bundle-Vendor: Árpád Magosányi Export-Package: io.github.magwas.inez, io.github.magwas.inez.element, io.github.magwas.inez.osgi Require-Bundle: wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot-autoconfigure.source;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot.source;bundle-version="3.5.3", wrapped.org.springframework.data.spring-data-commons;bundle-version="3.5.1", - wrapped.org.springframework.data.spring-data-commons.source;bundle-version="3.5.1", wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1", - wrapped.org.springframework.data.spring-data-keyvalue.source;bundle-version="3.5.1", wrapped.org.springframework.spring-aop;bundle-version="6.2.8", - wrapped.org.springframework.spring-beans.source;bundle-version="6.2.8", wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.spring-core.source;bundle-version="6.2.8", - wrapped.org.springframework.spring-jcl.source;bundle-version="6.2.8", wrapped.org.springframework.spring-tx;bundle-version="6.2.8", - wrapped.org.springframework.spring-tx.source;bundle-version="6.2.8", wrapped.org.springframework.spring-beans;bundle-version="6.2.8", wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.org.springframework.spring-context.source;bundle-version="6.2.8", wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", - wrapped.io.github.magwas.konveyor-base.source;bundle-version="0.3.0", org.antlr.antlr4-runtime;bundle-version="4.13.2", - org.antlr.antlr4-runtime.source;bundle-version="4.13.2", inez-parser, org.eclipse.core.runtime;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/model/pom.xml b/model/pom.xml index 4af7776..7e62cfc 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml diff --git a/parser/.classpath b/parser/.classpath index 16b0163..284032a 100644 --- a/parser/.classpath +++ b/parser/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/parser/META-INF/MANIFEST.MF b/parser/META-INF/MANIFEST.MF index 0e5c345..c8a8ac0 100644 --- a/parser/META-INF/MANIFEST.MF +++ b/parser/META-INF/MANIFEST.MF @@ -5,26 +5,18 @@ Bundle-Name: inez-parser Bundle-SymbolicName: inez-parser;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.parse.ParserBundleActivator -Bundle-Version: 0.4.6 +Bundle-Version: 0.4.8 Bundle-Vendor: Árpád Magosányi Export-Package: io.github.magwas.inez.parse, io.github.magwas.inez.parser;x-friends:="inez-parser-testing" Require-Bundle: wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", - wrapped.io.github.magwas.konveyor-base.source;bundle-version="0.3.0", org.antlr.antlr4-runtime;bundle-version="4.13.2", - org.antlr.antlr4-runtime.source;bundle-version="4.13.2", wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot-autoconfigure.source;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot.source;bundle-version="3.5.3", wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.org.springframework.spring-context.source;bundle-version="6.2.8", wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.spring-core.source;bundle-version="6.2.8", wrapped.org.springframework.spring-beans;bundle-version="6.2.8", - wrapped.org.springframework.spring-beans.source;bundle-version="6.2.8", - org.eclipse.core.runtime;bundle-version="3.12.0", - org.eclipse.core.runtime.source;bundle-version="3.12.0" + org.eclipse.core.runtime;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.github.magwas.inez.parser Bundle-ClassPath: ., diff --git a/parser/pom.xml b/parser/pom.xml index 062e166..b3a0793 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.0.1 + 0.4.8 ../pom.xml eclipse-plugin diff --git a/pom.xml b/pom.xml index 2edd0c0..288fecd 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ inez - 0.0.1 + 0.4.8 pom inez diff --git a/tools/testRun b/tools/testRun new file mode 100755 index 0000000..c3bc5de --- /dev/null +++ b/tools/testRun @@ -0,0 +1,7 @@ +#!/bin/bash +set -xe +rm -rf ~/tmp/Inez +tar -C ~/tmp -xzf io.github.magwas.inez.ui.product/target/products/Inez-linux.gtk.x86_64.tar.gz +export GDK_BACKEND=x11 +~/tmp/Inez/Inez + diff --git a/tools/updateManifestVersion b/tools/updateManifestVersion index 2d829c1..f3c6d13 100755 --- a/tools/updateManifestVersion +++ b/tools/updateManifestVersion @@ -6,8 +6,9 @@ then else VERSION=$1 fi -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" io.github.magwas.inez.ui/META-INF/MANIFEST.MF -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" model/META-INF/MANIFEST.MF -sed -i 's/inez-parser;bundle-version=".*"/inez-parser;bundle-version="'$VERSION'"/' model/META-INF/MANIFEST.MF -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" parser/META-INF/MANIFEST.MF -sed -i 's/application="io.github.magwas.inez.ui.application" version="[^"]*"/application="io.github.magwas.inez.ui.application" version="'$VERSION'"/' io.github.magwas.inez.ui.product/Inez.product +mvn org.eclipse.tycho:tycho-versions-plugin:4.0.12:set-version -DnewVersion=$VERSION +#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" io.github.magwas.inez.ui/META-INF/MANIFEST.MF +#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" model/META-INF/MANIFEST.MF +#sed -i 's/inez-parser;bundle-version=".*"/inez-parser;bundle-version="'$VERSION'"/' model/META-INF/MANIFEST.MF +#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" parser/META-INF/MANIFEST.MF +#sed -i 's/application="io.github.magwas.inez.ui.application" version="[^"]*"/application="io.github.magwas.inez.ui.application" version="'$VERSION'"/' io.github.magwas.inez.ui.product/Inez.product From dee77314ac48533823241d3774c3e40d7b79fc7c Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 19:34:29 +0200 Subject: [PATCH 02/16] consolidated module and artifact naming --- .../.classpath | 2 +- .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 6 ++-- .../build.properties | 0 .../pom.xml | 3 +- .../io/github/magwas/inez/BridiTestData.java | 0 .../io/github/magwas/inez/InezImplStub.java | 0 .../io/github/magwas/inez/TestConfig.java | 0 .../element/BridiElementEndToEndTest.java | 0 .../inez/element/BridiElementFactoryStub.java | 0 .../inez/element/BridiElementTestData.java | 0 .../CreateBridiElementServiceTest.java | 0 ...GetRelativeForBridiElementServiceStub.java | 0 .../inez/element/IsInstanceServiceTest.java | 0 .../osgi/SpringBootBundleActivatorStub.java | 0 .../CreateBridisFromParserOutputTest.java | 0 .../query/QueryProcessorEndToEndTest.java | 0 .../magwas/inez/query/QueryProcessorTest.java | 0 .../storage/AddReferencesServiceStub.java | 0 .../storage/AddReferencesServiceTest.java | 0 .../inez/storage/AddReferencesTest.java | 0 .../BridiStoreChangeListenersServiceStub.java | 0 .../inez/storage/BridiStoreEndToEndTest.java | 0 .../storage/BridiStoreHistoryServiceStub.java | 0 .../CreateBridiFromSumtiServiceStub.java | 0 .../storage/CreateBridiFromSumtiTest.java | 0 .../inez/storage/DeleteBridiServiceStub.java | 0 .../magwas/inez/storage/DeleteBridiTest.java | 0 .../FindAllByRepresentationServiceStub.java | 0 .../storage/FindAllByRepresentationTest.java | 0 .../FindAllIdByRepresentationServiceStub.java | 0 .../FindAllIdByRepresentationTest.java | 0 .../storage/FindBridiByIdServiceStub.java | 0 .../inez/storage/FindBridiByIdTest.java | 0 ...BridiIdBySelbriAndSumtiIdsServiceStub.java | 0 .../GetBridiIdBySelbriAndSumtiIdsTest.java | 0 .../storage/NotifyStoreChangeServiceStub.java | 0 .../storage/RemoveReferencesServiceStub.java | 0 .../inez/storage/RemoveReferencesTest.java | 0 .../inez/storage/SaveBridiServiceStub.java | 0 .../magwas/inez/storage/SaveBridiTest.java | 0 .../storage/model/BridiReferenceTestData.java | 0 .../inez/storage/model/SumtiTestData.java | 0 .../BridiReferenceRepositoryStub.java | 0 .../repository/SumtiRepositoryStub.java | 0 .../src/main/resources/mymodel.definition | 0 .../src/main/resources/mymodel.xml | 0 .../src/main/resources/root.xml | 0 {model => inez.model}/.classpath | 0 {model => inez.model}/.eclipse-pmd | 0 inez.model/.gitignore | 2 ++ {model => inez.model}/.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 {model => inez.model}/META-INF/MANIFEST.MF | 6 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 0 {model => inez.model}/README | 0 {model => inez.model}/build.properties | 0 {model => inez.model}/plugin.xml | 0 {model => inez.model}/pom.xml | 3 +- .../java/io/github/magwas/inez/Bridi.java | 0 .../magwas/inez/BridiStoreChangeListener.java | 0 .../magwas/inez/BridiStoreOperation.java | 0 .../main/java/io/github/magwas/inez/Inez.java | 0 .../java/io/github/magwas/inez/InezImpl.java | 0 .../io/github/magwas/inez/InezPlugin.java | 0 .../main/java/io/github/magwas/inez/Main.java | 0 .../io/github/magwas/inez/StoreCommand.java | 0 .../magwas/inez/element/BridiElement.java | 0 .../inez/element/BridiElementFactory.java | 0 ...idiElementSystemInitializationService.java | 0 .../element/CreateBridiElementService.java | 0 .../magwas/inez/element/ElementConstants.java | 0 .../GetBridiElementChildrenService.java | 0 .../element/GetBridiElementParentService.java | 0 .../GetBridiElementReferencesService.java | 0 .../GetBridiElementRepresentationService.java | 0 .../element/GetBridiElementTypeService.java | 0 .../GetRelativeForBridiElementService.java | 0 .../inez/element/IsInstanceService.java | 0 .../element/RepresentBridiElementService.java | 0 .../io/github/magwas/inez/functions/Save.java | 0 .../magwas/inez/osgi/MyBeanRegistrar.java | 0 .../inez/osgi/SpringBootBundleActivator.java | 0 .../magwas/inez/query/BridiFunction.java | 0 .../CreateBridisFromParserOutputService.java | 0 .../inez/query/QueryProcessorService.java | 0 .../inez/storage/AddReferencesService.java | 0 .../BridiStoreChangeListenersService.java | 0 .../storage/BridiStoreHistoryRepository.java | 0 .../storage/CreateBridiFromSumtiService.java | 0 .../inez/storage/DeleteBridiService.java | 0 .../FindAllByRepresentationService.java | 0 .../FindAllIdByRepresentationService.java | 0 .../inez/storage/FindBridiByIdService.java | 0 .../GetBridiIdBySelbriAndSumtiIdsService.java | 0 .../storage/NotifyStoreChangeService.java | 0 .../inez/storage/RemoveReferencesService.java | 0 .../magwas/inez/storage/SaveBridiService.java | 0 .../inez/storage/model/BridiReference.java | 0 .../magwas/inez/storage/model/Sumti.java | 0 .../repository/BridiReferenceRepository.java | 0 .../storage/repository/SumtiRepository.java | 0 .../src/main/resources/element.definition | 0 .../src/main/resources/test.properties | 0 {model => inez.model}/src/site/site.xml | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 6 ++-- .../build.properties | 0 .../pom.xml | 3 +- .../magwas/inez/parse/BridiFieldTestData.java | 0 .../CreateParserFromTokensServiceStub.java | 0 .../inez/parse/ParseTextServiceStub.java | 0 .../magwas/inez/parse/ParseTextTest.java | 0 .../inez/parse/ParserOutputTestData.java | 0 {parser => inez.parser}/.classpath | 0 {parser => inez.parser}/.eclipse-pmd | 0 inez.parser/.gitignore | 1 + {parser => inez.parser}/.mvn/jvm.config | 0 {parser => inez.parser}/.mvn/maven.config | 0 {parser => inez.parser}/.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 {parser => inez.parser}/META-INF/MANIFEST.MF | 7 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 0 {parser => inez.parser}/README | 0 {parser => inez.parser}/build.properties | 0 {parser => inez.parser}/hooks/pre-site | 0 {parser => inez.parser}/pom.xml | 3 +- .../io/github/magwas/inez/parser/Bridi.g4 | 0 .../parse/CreateParserFromTokensService.java | 0 .../io/github/magwas/inez/parse/IdUtil.java | 0 .../magwas/inez/parse/ParseTextService.java | 0 .../inez/parse/ParserBundleActivator.java | 0 .../magwas/inez/parse/ParserConstants.java | 0 .../magwas/inez/parse/ParserOutput.java | 0 .../inez/parse/ThrowingErrorListener.java | 0 {parser => inez.parser}/src/site/site.xml | 0 {inez-target => inez.target}/.gitignore | 0 {inez-target => inez.target}/.project | 2 +- .../org.eclipse.core.resources.prefs | 0 {inez-target => inez.target}/inez.target | 0 {inez-target => inez.target}/pom.xml | 3 +- .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../Inez.product | 8 ++--- .../README | 0 .../hooks/pre-site | 0 .../hooks/site-deploy | 0 .../hooks/validate | 0 .../icons/eclipse128.png | Bin .../icons/eclipse16.png | Bin .../icons/eclipse256.png | Bin .../icons/eclipse32.png | Bin .../icons/eclipse48.png | Bin .../icons/eclipse512.png | Bin .../icons/eclipse64.png | Bin .../pom.xml | 1 - .../src/site/site.xml | 0 .../.classpath | 4 +-- .../.gitignore | 0 inez.ui.tests/.project | 34 ++++++++++++++++++ .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../pom.xml | 1 - .../inez/ui/tree/MyEditorInputTest.java | 0 .../.classpath | 0 .../.gitignore | 0 inez.ui/.project | 34 ++++++++++++++++++ .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 0 {io.github.magwas.inez.ui => inez.ui}/README | 0 .../build.properties | 0 .../icons/eclipse128.png | Bin .../icons/eclipse16.png | Bin .../icons/eclipse256.png | Bin .../icons/eclipse32.png | Bin .../icons/eclipse48.png | Bin .../icons/eclipse512.png | Bin .../icons/eclipse64.png | Bin .../plugin.xml | 0 {io.github.magwas.inez.ui => inez.ui}/pom.xml | 1 - .../io/github/magwas/inez/ui/Application.java | 0 .../inez/ui/ApplicationActionBarAdvisor.java | 0 .../inez/ui/ApplicationWorkbenchAdvisor.java | 0 .../ui/ApplicationWorkbenchWindowAdvisor.java | 0 .../io/github/magwas/inez/ui/Perspective.java | 0 .../inez/ui/editor/ModelEditorView.java | 0 .../inez/ui/mindmap/AbstractMindMapItem.java | 0 .../inez/ui/mindmap/MindMapConnection.java | 0 .../magwas/inez/ui/mindmap/MindMapNode.java | 0 .../magwas/inez/ui/mindmap/SimpleMindMap.java | 0 .../mindmap/SimpleMindMapExampleFactory.java | 0 .../visuals/MindMapConnectionVisual.java | 0 .../ui/mindmap/visuals/MindMapNodeVisual.java | 0 .../ui/tree/ModelTreeContentProvider.java | 0 .../inez/ui/tree/ModelTreeLabelProvider.java | 0 .../magwas/inez/ui/tree/MyEditorInput.java | 0 .../magwas/inez/ui/tree/NewDiagramAction.java | 0 .../ui/tree/TreeModelDragSourceLIstener.java | 0 .../ui/tree/TreeModelDropTargetListener.java | 0 .../magwas/inez/ui/tree/TreeModelView.java | 0 io.github.magwas.inez.ui.product/.project | 34 ------------------ io.github.magwas.inez.ui.tests/.project | 34 ------------------ model/.gitignore | 3 -- parser/.gitignore | 2 -- pom.xml | 20 +++++------ tools/testRun | 2 +- tools/updateManifestVersion | 6 +--- 229 files changed, 114 insertions(+), 129 deletions(-) rename {inez-model.testing => inez.model.tests}/.classpath (96%) rename {inez-model.testing => inez.model.tests}/.gitignore (100%) rename {inez-model.testing => inez.model.tests}/.project (95%) rename {inez-model.testing => inez.model.tests}/.settings/org.eclipse.core.resources.prefs (100%) rename {inez-model.testing => inez.model.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {inez-model.testing => inez.model.tests}/META-INF/MANIFEST.MF (72%) rename {inez-model.testing => inez.model.tests}/build.properties (100%) rename {inez-model.testing => inez.model.tests}/pom.xml (95%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/BridiTestData.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/InezImplStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/TestConfig.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java (100%) rename {inez-model.testing => inez.model.tests}/src/main/resources/mymodel.definition (100%) rename {inez-model.testing => inez.model.tests}/src/main/resources/mymodel.xml (100%) rename {inez-model.testing => inez.model.tests}/src/main/resources/root.xml (100%) rename {model => inez.model}/.classpath (100%) rename {model => inez.model}/.eclipse-pmd (100%) create mode 100644 inez.model/.gitignore rename {model => inez.model}/.project (97%) rename {io.github.magwas.inez.ui.product => inez.model}/.settings/org.eclipse.core.resources.prefs (100%) rename {io.github.magwas.inez.ui => inez.model}/.settings/org.eclipse.jdt.core.prefs (100%) rename {io.github.magwas.inez.ui => inez.model}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {model => inez.model}/.settings/org.eclipse.m2e.core.prefs (100%) rename {model => inez.model}/META-INF/MANIFEST.MF (88%) rename {model => inez.model}/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {model => inez.model}/README (100%) rename {model => inez.model}/build.properties (100%) rename {model => inez.model}/plugin.xml (100%) rename {model => inez.model}/pom.xml (97%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/Bridi.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/BridiStoreOperation.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/Inez.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/InezImpl.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/InezPlugin.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/Main.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/StoreCommand.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/BridiElement.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/BridiElementFactory.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/CreateBridiElementService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/ElementConstants.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetBridiElementChildrenService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetBridiElementParentService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetBridiElementReferencesService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetBridiElementRepresentationService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/IsInstanceService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/functions/Save.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/query/BridiFunction.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/AddReferencesService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryRepository.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/DeleteBridiService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/FindBridiByIdService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/RemoveReferencesService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/model/BridiReference.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/model/Sumti.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepository.java (100%) rename {model => inez.model}/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepository.java (100%) rename {model => inez.model}/src/main/resources/element.definition (100%) rename {model => inez.model}/src/main/resources/test.properties (100%) rename {model => inez.model}/src/site/site.xml (100%) rename {inez-parser.testing => inez.parser.tests}/.classpath (100%) rename {inez-parser.testing => inez.parser.tests}/.gitignore (100%) rename {inez-parser.testing => inez.parser.tests}/.project (95%) rename {inez-parser.testing => inez.parser.tests}/.settings/org.eclipse.core.resources.prefs (100%) rename {inez-parser.testing => inez.parser.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {inez-parser.testing => inez.parser.tests}/META-INF/MANIFEST.MF (63%) rename {inez-parser.testing => inez.parser.tests}/build.properties (100%) rename {inez-parser.testing => inez.parser.tests}/pom.xml (95%) rename {inez-parser.testing => inez.parser.tests}/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java (100%) rename {inez-parser.testing => inez.parser.tests}/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java (100%) rename {inez-parser.testing => inez.parser.tests}/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java (100%) rename {inez-parser.testing => inez.parser.tests}/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java (100%) rename {inez-parser.testing => inez.parser.tests}/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java (100%) rename {parser => inez.parser}/.classpath (100%) rename {parser => inez.parser}/.eclipse-pmd (100%) create mode 100644 inez.parser/.gitignore rename {parser => inez.parser}/.mvn/jvm.config (100%) rename {parser => inez.parser}/.mvn/maven.config (100%) rename {parser => inez.parser}/.project (96%) rename {parser => inez.parser}/.settings/org.eclipse.core.resources.prefs (100%) rename {parser => inez.parser}/.settings/org.eclipse.jdt.core.prefs (100%) rename {io.github.magwas.inez.ui.product => inez.parser}/.settings/org.eclipse.m2e.core.prefs (100%) rename {parser => inez.parser}/META-INF/MANIFEST.MF (83%) rename {parser => inez.parser}/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {parser => inez.parser}/README (100%) rename {parser => inez.parser}/build.properties (100%) rename {parser => inez.parser}/hooks/pre-site (100%) rename {parser => inez.parser}/pom.xml (98%) rename {parser => inez.parser}/src/main/antlr4/io/github/magwas/inez/parser/Bridi.g4 (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/IdUtil.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/ParseTextService.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/ParserConstants.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/ParserOutput.java (100%) rename {parser => inez.parser}/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java (100%) rename {parser => inez.parser}/src/site/site.xml (100%) rename {inez-target => inez.target}/.gitignore (100%) rename {inez-target => inez.target}/.project (87%) rename {inez-target => inez.target}/.settings/org.eclipse.core.resources.prefs (100%) rename {inez-target => inez.target}/inez.target (100%) rename {inez-target => inez.target}/pom.xml (96%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/.gitignore (100%) rename {io.github.magwas.inez.ui => inez.ui.product}/.project (95%) rename {io.github.magwas.inez.ui => inez.ui.product}/.settings/org.eclipse.core.resources.prefs (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/.settings/org.eclipse.jdt.core.prefs (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {io.github.magwas.inez.ui => inez.ui.product}/.settings/org.eclipse.m2e.core.prefs (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/Inez.product (96%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/README (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/hooks/pre-site (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/hooks/site-deploy (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/hooks/validate (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse128.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse16.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse256.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse32.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse48.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse512.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/icons/eclipse64.png (100%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/pom.xml (99%) rename {io.github.magwas.inez.ui.product => inez.ui.product}/src/site/site.xml (100%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/.classpath (92%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/.gitignore (100%) create mode 100644 inez.ui.tests/.project rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/.settings/org.eclipse.core.resources.prefs (100%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/META-INF/MANIFEST.MF (100%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/build.properties (100%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/pom.xml (97%) rename {io.github.magwas.inez.ui.tests => inez.ui.tests}/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/.classpath (100%) rename {io.github.magwas.inez.ui => inez.ui}/.gitignore (100%) create mode 100644 inez.ui/.project rename {model => inez.ui}/.settings/org.eclipse.core.resources.prefs (100%) rename {model => inez.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename {model => inez.ui}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {parser => inez.ui}/.settings/org.eclipse.m2e.core.prefs (100%) rename {io.github.magwas.inez.ui => inez.ui}/META-INF/MANIFEST.MF (96%) rename {io.github.magwas.inez.ui => inez.ui}/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {io.github.magwas.inez.ui => inez.ui}/README (100%) rename {io.github.magwas.inez.ui => inez.ui}/build.properties (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse128.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse16.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse256.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse32.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse48.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse512.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/icons/eclipse64.png (100%) rename {io.github.magwas.inez.ui => inez.ui}/plugin.xml (100%) rename {io.github.magwas.inez.ui => inez.ui}/pom.xml (99%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/Application.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/Perspective.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/editor/ModelEditorView.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/MyEditorInput.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java (100%) rename {io.github.magwas.inez.ui => inez.ui}/src/io/github/magwas/inez/ui/tree/TreeModelView.java (100%) delete mode 100644 io.github.magwas.inez.ui.product/.project delete mode 100644 io.github.magwas.inez.ui.tests/.project delete mode 100644 model/.gitignore delete mode 100644 parser/.gitignore diff --git a/inez-model.testing/.classpath b/inez.model.tests/.classpath similarity index 96% rename from inez-model.testing/.classpath rename to inez.model.tests/.classpath index e0b077c..0060337 100644 --- a/inez-model.testing/.classpath +++ b/inez.model.tests/.classpath @@ -8,6 +8,6 @@ - + diff --git a/inez-model.testing/.gitignore b/inez.model.tests/.gitignore similarity index 100% rename from inez-model.testing/.gitignore rename to inez.model.tests/.gitignore diff --git a/inez-model.testing/.project b/inez.model.tests/.project similarity index 95% rename from inez-model.testing/.project rename to inez.model.tests/.project index 359802d..2ce9497 100644 --- a/inez-model.testing/.project +++ b/inez.model.tests/.project @@ -1,6 +1,6 @@ - inez-model.testing + inez.model.tests diff --git a/inez-model.testing/.settings/org.eclipse.core.resources.prefs b/inez.model.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from inez-model.testing/.settings/org.eclipse.core.resources.prefs rename to inez.model.tests/.settings/org.eclipse.core.resources.prefs diff --git a/inez-model.testing/.settings/org.eclipse.jdt.core.prefs b/inez.model.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from inez-model.testing/.settings/org.eclipse.jdt.core.prefs rename to inez.model.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/inez-model.testing/META-INF/MANIFEST.MF b/inez.model.tests/META-INF/MANIFEST.MF similarity index 72% rename from inez-model.testing/META-INF/MANIFEST.MF rename to inez.model.tests/META-INF/MANIFEST.MF index c51b4be..22202bd 100644 --- a/inez-model.testing/META-INF/MANIFEST.MF +++ b/inez.model.tests/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing -Bundle-SymbolicName: inez-model.testing +Bundle-SymbolicName: io.github.magwas.inez.model.tests Bundle-Version: 0.4.8 -Fragment-Host: inez-model;bundle-version="0.0.1" +Fragment-Host: io.github.magwas.inez.model;bundle-version="0.0.1" Import-Package: io.github.magwas.inez.parse, io.github.magwas.inez.parser Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.org.springframework.spring-test;bundle-version="6.2.9", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", junit-jupiter-api;bundle-version="5.11.4" -Automatic-Module-Name: inez.model.testing +Automatic-Module-Name: io.github.magwas.inez.model.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez-model.testing/build.properties b/inez.model.tests/build.properties similarity index 100% rename from inez-model.testing/build.properties rename to inez.model.tests/build.properties diff --git a/inez-model.testing/pom.xml b/inez.model.tests/pom.xml similarity index 95% rename from inez-model.testing/pom.xml rename to inez.model.tests/pom.xml index e19d1a8..f91f82c 100644 --- a/inez-model.testing/pom.xml +++ b/inez.model.tests/pom.xml @@ -12,8 +12,7 @@ eclipse-plugin - inez-model.testing - inez-model.testing + io.github.magwas.inez.model.tests model layer for Inez diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/BridiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/BridiTestData.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/InezImplStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/InezImplStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/TestConfig.java b/inez.model.tests/src/main/java/io/github/magwas/inez/TestConfig.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/TestConfig.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/TestConfig.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java diff --git a/inez-model.testing/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java similarity index 100% rename from inez-model.testing/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java rename to inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java diff --git a/inez-model.testing/src/main/resources/mymodel.definition b/inez.model.tests/src/main/resources/mymodel.definition similarity index 100% rename from inez-model.testing/src/main/resources/mymodel.definition rename to inez.model.tests/src/main/resources/mymodel.definition diff --git a/inez-model.testing/src/main/resources/mymodel.xml b/inez.model.tests/src/main/resources/mymodel.xml similarity index 100% rename from inez-model.testing/src/main/resources/mymodel.xml rename to inez.model.tests/src/main/resources/mymodel.xml diff --git a/inez-model.testing/src/main/resources/root.xml b/inez.model.tests/src/main/resources/root.xml similarity index 100% rename from inez-model.testing/src/main/resources/root.xml rename to inez.model.tests/src/main/resources/root.xml diff --git a/model/.classpath b/inez.model/.classpath similarity index 100% rename from model/.classpath rename to inez.model/.classpath diff --git a/model/.eclipse-pmd b/inez.model/.eclipse-pmd similarity index 100% rename from model/.eclipse-pmd rename to inez.model/.eclipse-pmd diff --git a/inez.model/.gitignore b/inez.model/.gitignore new file mode 100644 index 0000000..51510ec --- /dev/null +++ b/inez.model/.gitignore @@ -0,0 +1,2 @@ +/target/ +bin/ diff --git a/model/.project b/inez.model/.project similarity index 97% rename from model/.project rename to inez.model/.project index cb1aa37..a41a282 100644 --- a/model/.project +++ b/inez.model/.project @@ -1,6 +1,6 @@ - inez-model + inez.model diff --git a/io.github.magwas.inez.ui.product/.settings/org.eclipse.core.resources.prefs b/inez.model/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from io.github.magwas.inez.ui.product/.settings/org.eclipse.core.resources.prefs rename to inez.model/.settings/org.eclipse.core.resources.prefs diff --git a/io.github.magwas.inez.ui/.settings/org.eclipse.jdt.core.prefs b/inez.model/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from io.github.magwas.inez.ui/.settings/org.eclipse.jdt.core.prefs rename to inez.model/.settings/org.eclipse.jdt.core.prefs diff --git a/io.github.magwas.inez.ui/.settings/org.eclipse.jdt.ui.prefs b/inez.model/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from io.github.magwas.inez.ui/.settings/org.eclipse.jdt.ui.prefs rename to inez.model/.settings/org.eclipse.jdt.ui.prefs diff --git a/model/.settings/org.eclipse.m2e.core.prefs b/inez.model/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from model/.settings/org.eclipse.m2e.core.prefs rename to inez.model/.settings/org.eclipse.m2e.core.prefs diff --git a/model/META-INF/MANIFEST.MF b/inez.model/META-INF/MANIFEST.MF similarity index 88% rename from model/META-INF/MANIFEST.MF rename to inez.model/META-INF/MANIFEST.MF index 8d3bbfa..b749dd6 100644 --- a/model/META-INF/MANIFEST.MF +++ b/inez.model/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Main-Class: io.github.magwas.inez.Main -Bundle-Name: inez-model -Bundle-SymbolicName: inez-model;singleton:=true +Bundle-Name: io.github.magwas.inez.model +Bundle-SymbolicName: io.github.magwas.inez.model;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.osgi.SpringBootBundleActivator Bundle-Version: 0.4.8 @@ -21,7 +21,7 @@ Require-Bundle: wrapped.org.springframework.boot.spring-boot;bundle-version="3.5 wrapped.org.springframework.spring-context;bundle-version="6.2.8", wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", org.antlr.antlr4-runtime;bundle-version="4.13.2", - inez-parser, + io.github.magwas.inez.parser, org.eclipse.core.runtime;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.github.magwas.inez.model diff --git a/model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/model/README b/inez.model/README similarity index 100% rename from model/README rename to inez.model/README diff --git a/model/build.properties b/inez.model/build.properties similarity index 100% rename from model/build.properties rename to inez.model/build.properties diff --git a/model/plugin.xml b/inez.model/plugin.xml similarity index 100% rename from model/plugin.xml rename to inez.model/plugin.xml diff --git a/model/pom.xml b/inez.model/pom.xml similarity index 97% rename from model/pom.xml rename to inez.model/pom.xml index 7e62cfc..5b58793 100644 --- a/model/pom.xml +++ b/inez.model/pom.xml @@ -12,8 +12,7 @@ eclipse-plugin - inez-model - inez-model + io.github.magwas.inez.model model layer for Inez diff --git a/model/src/main/java/io/github/magwas/inez/Bridi.java b/inez.model/src/main/java/io/github/magwas/inez/Bridi.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/Bridi.java rename to inez.model/src/main/java/io/github/magwas/inez/Bridi.java diff --git a/model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java b/inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java rename to inez.model/src/main/java/io/github/magwas/inez/BridiStoreChangeListener.java diff --git a/model/src/main/java/io/github/magwas/inez/BridiStoreOperation.java b/inez.model/src/main/java/io/github/magwas/inez/BridiStoreOperation.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/BridiStoreOperation.java rename to inez.model/src/main/java/io/github/magwas/inez/BridiStoreOperation.java diff --git a/model/src/main/java/io/github/magwas/inez/Inez.java b/inez.model/src/main/java/io/github/magwas/inez/Inez.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/Inez.java rename to inez.model/src/main/java/io/github/magwas/inez/Inez.java diff --git a/model/src/main/java/io/github/magwas/inez/InezImpl.java b/inez.model/src/main/java/io/github/magwas/inez/InezImpl.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/InezImpl.java rename to inez.model/src/main/java/io/github/magwas/inez/InezImpl.java diff --git a/model/src/main/java/io/github/magwas/inez/InezPlugin.java b/inez.model/src/main/java/io/github/magwas/inez/InezPlugin.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/InezPlugin.java rename to inez.model/src/main/java/io/github/magwas/inez/InezPlugin.java diff --git a/model/src/main/java/io/github/magwas/inez/Main.java b/inez.model/src/main/java/io/github/magwas/inez/Main.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/Main.java rename to inez.model/src/main/java/io/github/magwas/inez/Main.java diff --git a/model/src/main/java/io/github/magwas/inez/StoreCommand.java b/inez.model/src/main/java/io/github/magwas/inez/StoreCommand.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/StoreCommand.java rename to inez.model/src/main/java/io/github/magwas/inez/StoreCommand.java diff --git a/model/src/main/java/io/github/magwas/inez/element/BridiElement.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/BridiElement.java rename to inez.model/src/main/java/io/github/magwas/inez/element/BridiElement.java diff --git a/model/src/main/java/io/github/magwas/inez/element/BridiElementFactory.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementFactory.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/BridiElementFactory.java rename to inez.model/src/main/java/io/github/magwas/inez/element/BridiElementFactory.java diff --git a/model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java b/inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/CreateBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/CreateBridiElementService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/CreateBridiElementService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/CreateBridiElementService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/ElementConstants.java b/inez.model/src/main/java/io/github/magwas/inez/element/ElementConstants.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/ElementConstants.java rename to inez.model/src/main/java/io/github/magwas/inez/element/ElementConstants.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetBridiElementChildrenService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementChildrenService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetBridiElementChildrenService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementChildrenService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetBridiElementParentService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementParentService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetBridiElementParentService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementParentService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetBridiElementReferencesService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementReferencesService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetBridiElementReferencesService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementReferencesService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetBridiElementRepresentationService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementRepresentationService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetBridiElementRepresentationService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementRepresentationService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetBridiElementTypeService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/IsInstanceService.java b/inez.model/src/main/java/io/github/magwas/inez/element/IsInstanceService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/IsInstanceService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/IsInstanceService.java diff --git a/model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java b/inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java rename to inez.model/src/main/java/io/github/magwas/inez/element/RepresentBridiElementService.java diff --git a/model/src/main/java/io/github/magwas/inez/functions/Save.java b/inez.model/src/main/java/io/github/magwas/inez/functions/Save.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/functions/Save.java rename to inez.model/src/main/java/io/github/magwas/inez/functions/Save.java diff --git a/model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java b/inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java rename to inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java diff --git a/model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java b/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java rename to inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java diff --git a/model/src/main/java/io/github/magwas/inez/query/BridiFunction.java b/inez.model/src/main/java/io/github/magwas/inez/query/BridiFunction.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/query/BridiFunction.java rename to inez.model/src/main/java/io/github/magwas/inez/query/BridiFunction.java diff --git a/model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java rename to inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java diff --git a/model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java rename to inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/AddReferencesService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/AddReferencesService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/AddReferencesService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/AddReferencesService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryRepository.java b/inez.model/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryRepository.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryRepository.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/BridiStoreHistoryRepository.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/DeleteBridiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/DeleteBridiService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/DeleteBridiService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/DeleteBridiService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/FindBridiByIdService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/FindBridiByIdService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/FindBridiByIdService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/FindBridiByIdService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/RemoveReferencesService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/RemoveReferencesService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/RemoveReferencesService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/RemoveReferencesService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java b/inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/SaveBridiService.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/model/BridiReference.java b/inez.model/src/main/java/io/github/magwas/inez/storage/model/BridiReference.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/model/BridiReference.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/model/BridiReference.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/model/Sumti.java b/inez.model/src/main/java/io/github/magwas/inez/storage/model/Sumti.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/model/Sumti.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/model/Sumti.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepository.java b/inez.model/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepository.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepository.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepository.java diff --git a/model/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepository.java b/inez.model/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepository.java similarity index 100% rename from model/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepository.java rename to inez.model/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepository.java diff --git a/model/src/main/resources/element.definition b/inez.model/src/main/resources/element.definition similarity index 100% rename from model/src/main/resources/element.definition rename to inez.model/src/main/resources/element.definition diff --git a/model/src/main/resources/test.properties b/inez.model/src/main/resources/test.properties similarity index 100% rename from model/src/main/resources/test.properties rename to inez.model/src/main/resources/test.properties diff --git a/model/src/site/site.xml b/inez.model/src/site/site.xml similarity index 100% rename from model/src/site/site.xml rename to inez.model/src/site/site.xml diff --git a/inez-parser.testing/.classpath b/inez.parser.tests/.classpath similarity index 100% rename from inez-parser.testing/.classpath rename to inez.parser.tests/.classpath diff --git a/inez-parser.testing/.gitignore b/inez.parser.tests/.gitignore similarity index 100% rename from inez-parser.testing/.gitignore rename to inez.parser.tests/.gitignore diff --git a/inez-parser.testing/.project b/inez.parser.tests/.project similarity index 95% rename from inez-parser.testing/.project rename to inez.parser.tests/.project index 04aa139..6344a26 100644 --- a/inez-parser.testing/.project +++ b/inez.parser.tests/.project @@ -1,6 +1,6 @@ - inez-parser.testing + inez.parser.tests diff --git a/inez-parser.testing/.settings/org.eclipse.core.resources.prefs b/inez.parser.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from inez-parser.testing/.settings/org.eclipse.core.resources.prefs rename to inez.parser.tests/.settings/org.eclipse.core.resources.prefs diff --git a/inez-parser.testing/.settings/org.eclipse.jdt.core.prefs b/inez.parser.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from inez-parser.testing/.settings/org.eclipse.jdt.core.prefs rename to inez.parser.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/inez-parser.testing/META-INF/MANIFEST.MF b/inez.parser.tests/META-INF/MANIFEST.MF similarity index 63% rename from inez-parser.testing/META-INF/MANIFEST.MF rename to inez.parser.tests/META-INF/MANIFEST.MF index f969bd8..eac0acb 100644 --- a/inez-parser.testing/META-INF/MANIFEST.MF +++ b/inez.parser.tests/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing -Bundle-SymbolicName: inez-parser.testing +Bundle-SymbolicName: io.github.magwas.inez.parser.tests Bundle-Version: 0.4.8 -Fragment-Host: inez-parser;bundle-version="0.0.1" +Fragment-Host: io.github.magwas.inez.parser;bundle-version="0.0.1" Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", junit-jupiter-api;bundle-version="5.11.4" -Automatic-Module-Name: inez.parser.testing +Automatic-Module-Name: io.github.magwas.inez.parser.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez-parser.testing/build.properties b/inez.parser.tests/build.properties similarity index 100% rename from inez-parser.testing/build.properties rename to inez.parser.tests/build.properties diff --git a/inez-parser.testing/pom.xml b/inez.parser.tests/pom.xml similarity index 95% rename from inez-parser.testing/pom.xml rename to inez.parser.tests/pom.xml index 99f9402..d492025 100644 --- a/inez-parser.testing/pom.xml +++ b/inez.parser.tests/pom.xml @@ -11,8 +11,7 @@ ../pom.xml eclipse-plugin - inez-parser.testing - inez-parser.testing + io.github.magwas.inez.parser.tests Parser for Inez diff --git a/inez-parser.testing/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java similarity index 100% rename from inez-parser.testing/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java rename to inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java diff --git a/inez-parser.testing/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java similarity index 100% rename from inez-parser.testing/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java rename to inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java diff --git a/inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java similarity index 100% rename from inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java rename to inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java diff --git a/inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java similarity index 100% rename from inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java rename to inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java diff --git a/inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java similarity index 100% rename from inez-parser.testing/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java rename to inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java diff --git a/parser/.classpath b/inez.parser/.classpath similarity index 100% rename from parser/.classpath rename to inez.parser/.classpath diff --git a/parser/.eclipse-pmd b/inez.parser/.eclipse-pmd similarity index 100% rename from parser/.eclipse-pmd rename to inez.parser/.eclipse-pmd diff --git a/inez.parser/.gitignore b/inez.parser/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/inez.parser/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/parser/.mvn/jvm.config b/inez.parser/.mvn/jvm.config similarity index 100% rename from parser/.mvn/jvm.config rename to inez.parser/.mvn/jvm.config diff --git a/parser/.mvn/maven.config b/inez.parser/.mvn/maven.config similarity index 100% rename from parser/.mvn/maven.config rename to inez.parser/.mvn/maven.config diff --git a/parser/.project b/inez.parser/.project similarity index 96% rename from parser/.project rename to inez.parser/.project index 7403eb1..66e64b9 100644 --- a/parser/.project +++ b/inez.parser/.project @@ -1,6 +1,6 @@ - inez-parser + inez.parser diff --git a/parser/.settings/org.eclipse.core.resources.prefs b/inez.parser/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from parser/.settings/org.eclipse.core.resources.prefs rename to inez.parser/.settings/org.eclipse.core.resources.prefs diff --git a/parser/.settings/org.eclipse.jdt.core.prefs b/inez.parser/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from parser/.settings/org.eclipse.jdt.core.prefs rename to inez.parser/.settings/org.eclipse.jdt.core.prefs diff --git a/io.github.magwas.inez.ui.product/.settings/org.eclipse.m2e.core.prefs b/inez.parser/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from io.github.magwas.inez.ui.product/.settings/org.eclipse.m2e.core.prefs rename to inez.parser/.settings/org.eclipse.m2e.core.prefs diff --git a/parser/META-INF/MANIFEST.MF b/inez.parser/META-INF/MANIFEST.MF similarity index 83% rename from parser/META-INF/MANIFEST.MF rename to inez.parser/META-INF/MANIFEST.MF index c8a8ac0..0482577 100644 --- a/parser/META-INF/MANIFEST.MF +++ b/inez.parser/META-INF/MANIFEST.MF @@ -1,14 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Main-Class: io.github.magwas.inez.Main -Bundle-Name: inez-parser -Bundle-SymbolicName: inez-parser;singleton:=true +Bundle-Name: io.github.magwas.inez.parser +Bundle-SymbolicName: io.github.magwas.inez.parser;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.parse.ParserBundleActivator Bundle-Version: 0.4.8 Bundle-Vendor: Árpád Magosányi Export-Package: io.github.magwas.inez.parse, - io.github.magwas.inez.parser;x-friends:="inez-parser-testing" + io.github.magwas.inez.parser;x-friends:="io.github.magwas.inez.parser.tests" Require-Bundle: wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", org.antlr.antlr4-runtime;bundle-version="4.13.2", wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", diff --git a/parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/parser/README b/inez.parser/README similarity index 100% rename from parser/README rename to inez.parser/README diff --git a/parser/build.properties b/inez.parser/build.properties similarity index 100% rename from parser/build.properties rename to inez.parser/build.properties diff --git a/parser/hooks/pre-site b/inez.parser/hooks/pre-site similarity index 100% rename from parser/hooks/pre-site rename to inez.parser/hooks/pre-site diff --git a/parser/pom.xml b/inez.parser/pom.xml similarity index 98% rename from parser/pom.xml rename to inez.parser/pom.xml index b3a0793..59766ba 100644 --- a/parser/pom.xml +++ b/inez.parser/pom.xml @@ -11,8 +11,7 @@ ../pom.xml eclipse-plugin - inez-parser - inez-parser + io.github.magwas.inez.parser true diff --git a/parser/src/main/antlr4/io/github/magwas/inez/parser/Bridi.g4 b/inez.parser/src/main/antlr4/io/github/magwas/inez/parser/Bridi.g4 similarity index 100% rename from parser/src/main/antlr4/io/github/magwas/inez/parser/Bridi.g4 rename to inez.parser/src/main/antlr4/io/github/magwas/inez/parser/Bridi.g4 diff --git a/parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensService.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/IdUtil.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/IdUtil.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/IdUtil.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/IdUtil.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/ParseTextService.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/ParserConstants.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserConstants.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/ParserConstants.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/ParserConstants.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/ParserOutput.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserOutput.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/ParserOutput.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/ParserOutput.java diff --git a/parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java similarity index 100% rename from parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java rename to inez.parser/src/main/java/io/github/magwas/inez/parse/ThrowingErrorListener.java diff --git a/parser/src/site/site.xml b/inez.parser/src/site/site.xml similarity index 100% rename from parser/src/site/site.xml rename to inez.parser/src/site/site.xml diff --git a/inez-target/.gitignore b/inez.target/.gitignore similarity index 100% rename from inez-target/.gitignore rename to inez.target/.gitignore diff --git a/inez-target/.project b/inez.target/.project similarity index 87% rename from inez-target/.project rename to inez.target/.project index 6e38252..7b71985 100644 --- a/inez-target/.project +++ b/inez.target/.project @@ -1,6 +1,6 @@ - inez-target + inez.target diff --git a/inez-target/.settings/org.eclipse.core.resources.prefs b/inez.target/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from inez-target/.settings/org.eclipse.core.resources.prefs rename to inez.target/.settings/org.eclipse.core.resources.prefs diff --git a/inez-target/inez.target b/inez.target/inez.target similarity index 100% rename from inez-target/inez.target rename to inez.target/inez.target diff --git a/inez-target/pom.xml b/inez.target/pom.xml similarity index 96% rename from inez-target/pom.xml rename to inez.target/pom.xml index 541fc55..5041a12 100644 --- a/inez-target/pom.xml +++ b/inez.target/pom.xml @@ -11,8 +11,7 @@ ../pom.xml - inez-target - inez-target + io.github.magwas.inez.target eclipse-target-definition Eclipse target description for Inez diff --git a/io.github.magwas.inez.ui.product/.gitignore b/inez.ui.product/.gitignore similarity index 100% rename from io.github.magwas.inez.ui.product/.gitignore rename to inez.ui.product/.gitignore diff --git a/io.github.magwas.inez.ui/.project b/inez.ui.product/.project similarity index 95% rename from io.github.magwas.inez.ui/.project rename to inez.ui.product/.project index f18c9de..9c89f41 100644 --- a/io.github.magwas.inez.ui/.project +++ b/inez.ui.product/.project @@ -1,6 +1,6 @@ - io.github.magwas.inez.ui + inez.ui.product diff --git a/io.github.magwas.inez.ui/.settings/org.eclipse.core.resources.prefs b/inez.ui.product/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from io.github.magwas.inez.ui/.settings/org.eclipse.core.resources.prefs rename to inez.ui.product/.settings/org.eclipse.core.resources.prefs diff --git a/io.github.magwas.inez.ui.product/.settings/org.eclipse.jdt.core.prefs b/inez.ui.product/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from io.github.magwas.inez.ui.product/.settings/org.eclipse.jdt.core.prefs rename to inez.ui.product/.settings/org.eclipse.jdt.core.prefs diff --git a/io.github.magwas.inez.ui.product/.settings/org.eclipse.jdt.ui.prefs b/inez.ui.product/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from io.github.magwas.inez.ui.product/.settings/org.eclipse.jdt.ui.prefs rename to inez.ui.product/.settings/org.eclipse.jdt.ui.prefs diff --git a/io.github.magwas.inez.ui/.settings/org.eclipse.m2e.core.prefs b/inez.ui.product/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from io.github.magwas.inez.ui/.settings/org.eclipse.m2e.core.prefs rename to inez.ui.product/.settings/org.eclipse.m2e.core.prefs diff --git a/io.github.magwas.inez.ui.product/Inez.product b/inez.ui.product/Inez.product similarity index 96% rename from io.github.magwas.inez.ui.product/Inez.product rename to inez.ui.product/Inez.product index 560ed27..8f3d887 100644 --- a/io.github.magwas.inez.ui.product/Inez.product +++ b/inez.ui.product/Inez.product @@ -38,8 +38,8 @@ - - + + @@ -152,8 +152,8 @@ - - + + diff --git a/io.github.magwas.inez.ui.product/README b/inez.ui.product/README similarity index 100% rename from io.github.magwas.inez.ui.product/README rename to inez.ui.product/README diff --git a/io.github.magwas.inez.ui.product/hooks/pre-site b/inez.ui.product/hooks/pre-site similarity index 100% rename from io.github.magwas.inez.ui.product/hooks/pre-site rename to inez.ui.product/hooks/pre-site diff --git a/io.github.magwas.inez.ui.product/hooks/site-deploy b/inez.ui.product/hooks/site-deploy similarity index 100% rename from io.github.magwas.inez.ui.product/hooks/site-deploy rename to inez.ui.product/hooks/site-deploy diff --git a/io.github.magwas.inez.ui.product/hooks/validate b/inez.ui.product/hooks/validate similarity index 100% rename from io.github.magwas.inez.ui.product/hooks/validate rename to inez.ui.product/hooks/validate diff --git a/io.github.magwas.inez.ui.product/icons/eclipse128.png b/inez.ui.product/icons/eclipse128.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse128.png rename to inez.ui.product/icons/eclipse128.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse16.png b/inez.ui.product/icons/eclipse16.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse16.png rename to inez.ui.product/icons/eclipse16.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse256.png b/inez.ui.product/icons/eclipse256.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse256.png rename to inez.ui.product/icons/eclipse256.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse32.png b/inez.ui.product/icons/eclipse32.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse32.png rename to inez.ui.product/icons/eclipse32.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse48.png b/inez.ui.product/icons/eclipse48.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse48.png rename to inez.ui.product/icons/eclipse48.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse512.png b/inez.ui.product/icons/eclipse512.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse512.png rename to inez.ui.product/icons/eclipse512.png diff --git a/io.github.magwas.inez.ui.product/icons/eclipse64.png b/inez.ui.product/icons/eclipse64.png similarity index 100% rename from io.github.magwas.inez.ui.product/icons/eclipse64.png rename to inez.ui.product/icons/eclipse64.png diff --git a/io.github.magwas.inez.ui.product/pom.xml b/inez.ui.product/pom.xml similarity index 99% rename from io.github.magwas.inez.ui.product/pom.xml rename to inez.ui.product/pom.xml index 03381b9..c48fcb5 100644 --- a/io.github.magwas.inez.ui.product/pom.xml +++ b/inez.ui.product/pom.xml @@ -12,7 +12,6 @@ io.github.magwas.inez.ui.product - inez-ui-product eclipse-repository true diff --git a/io.github.magwas.inez.ui.product/src/site/site.xml b/inez.ui.product/src/site/site.xml similarity index 100% rename from io.github.magwas.inez.ui.product/src/site/site.xml rename to inez.ui.product/src/site/site.xml diff --git a/io.github.magwas.inez.ui.tests/.classpath b/inez.ui.tests/.classpath similarity index 92% rename from io.github.magwas.inez.ui.tests/.classpath rename to inez.ui.tests/.classpath index 4e10d0d..001961e 100644 --- a/io.github.magwas.inez.ui.tests/.classpath +++ b/inez.ui.tests/.classpath @@ -7,7 +7,7 @@ - - + + diff --git a/io.github.magwas.inez.ui.tests/.gitignore b/inez.ui.tests/.gitignore similarity index 100% rename from io.github.magwas.inez.ui.tests/.gitignore rename to inez.ui.tests/.gitignore diff --git a/inez.ui.tests/.project b/inez.ui.tests/.project new file mode 100644 index 0000000..b77c13b --- /dev/null +++ b/inez.ui.tests/.project @@ -0,0 +1,34 @@ + + + inez.ui.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs b/inez.ui.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from io.github.magwas.inez.ui.tests/.settings/org.eclipse.core.resources.prefs rename to inez.ui.tests/.settings/org.eclipse.core.resources.prefs diff --git a/io.github.magwas.inez.ui.tests/.settings/org.eclipse.jdt.core.prefs b/inez.ui.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from io.github.magwas.inez.ui.tests/.settings/org.eclipse.jdt.core.prefs rename to inez.ui.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF b/inez.ui.tests/META-INF/MANIFEST.MF similarity index 100% rename from io.github.magwas.inez.ui.tests/META-INF/MANIFEST.MF rename to inez.ui.tests/META-INF/MANIFEST.MF diff --git a/io.github.magwas.inez.ui.tests/build.properties b/inez.ui.tests/build.properties similarity index 100% rename from io.github.magwas.inez.ui.tests/build.properties rename to inez.ui.tests/build.properties diff --git a/io.github.magwas.inez.ui.tests/pom.xml b/inez.ui.tests/pom.xml similarity index 97% rename from io.github.magwas.inez.ui.tests/pom.xml rename to inez.ui.tests/pom.xml index fcc38e1..0e5b058 100644 --- a/io.github.magwas.inez.ui.tests/pom.xml +++ b/inez.ui.tests/pom.xml @@ -14,7 +14,6 @@ eclipse-plugin io.github.magwas.inez.ui.tests - io.github.magwas.inez.ui.tests model layer for Inez diff --git a/io.github.magwas.inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java b/inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java similarity index 100% rename from io.github.magwas.inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java rename to inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java diff --git a/io.github.magwas.inez.ui/.classpath b/inez.ui/.classpath similarity index 100% rename from io.github.magwas.inez.ui/.classpath rename to inez.ui/.classpath diff --git a/io.github.magwas.inez.ui/.gitignore b/inez.ui/.gitignore similarity index 100% rename from io.github.magwas.inez.ui/.gitignore rename to inez.ui/.gitignore diff --git a/inez.ui/.project b/inez.ui/.project new file mode 100644 index 0000000..cd182cd --- /dev/null +++ b/inez.ui/.project @@ -0,0 +1,34 @@ + + + inez.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/model/.settings/org.eclipse.core.resources.prefs b/inez.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from model/.settings/org.eclipse.core.resources.prefs rename to inez.ui/.settings/org.eclipse.core.resources.prefs diff --git a/model/.settings/org.eclipse.jdt.core.prefs b/inez.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from model/.settings/org.eclipse.jdt.core.prefs rename to inez.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/model/.settings/org.eclipse.jdt.ui.prefs b/inez.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from model/.settings/org.eclipse.jdt.ui.prefs rename to inez.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/parser/.settings/org.eclipse.m2e.core.prefs b/inez.ui/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from parser/.settings/org.eclipse.m2e.core.prefs rename to inez.ui/.settings/org.eclipse.m2e.core.prefs diff --git a/io.github.magwas.inez.ui/META-INF/MANIFEST.MF b/inez.ui/META-INF/MANIFEST.MF similarity index 96% rename from io.github.magwas.inez.ui/META-INF/MANIFEST.MF rename to inez.ui/META-INF/MANIFEST.MF index d14fb5c..7d0e6da 100644 --- a/io.github.magwas.inez.ui/META-INF/MANIFEST.MF +++ b/inez.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Ui Bundle-SymbolicName: io.github.magwas.inez.ui;singleton:=true Bundle-Version: 0.4.8 -Require-Bundle: inez-model;bundle-version="0.0.1", +Require-Bundle: io.github.magwas.inez.model, org.eclipse.ui;bundle-version="3.108.1", org.eclipse.equinox.app;bundle-version="1.3.400", org.eclipse.gef.geometry;bundle-version="5.0.0", diff --git a/io.github.magwas.inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from io.github.magwas.inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/io.github.magwas.inez.ui/README b/inez.ui/README similarity index 100% rename from io.github.magwas.inez.ui/README rename to inez.ui/README diff --git a/io.github.magwas.inez.ui/build.properties b/inez.ui/build.properties similarity index 100% rename from io.github.magwas.inez.ui/build.properties rename to inez.ui/build.properties diff --git a/io.github.magwas.inez.ui/icons/eclipse128.png b/inez.ui/icons/eclipse128.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse128.png rename to inez.ui/icons/eclipse128.png diff --git a/io.github.magwas.inez.ui/icons/eclipse16.png b/inez.ui/icons/eclipse16.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse16.png rename to inez.ui/icons/eclipse16.png diff --git a/io.github.magwas.inez.ui/icons/eclipse256.png b/inez.ui/icons/eclipse256.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse256.png rename to inez.ui/icons/eclipse256.png diff --git a/io.github.magwas.inez.ui/icons/eclipse32.png b/inez.ui/icons/eclipse32.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse32.png rename to inez.ui/icons/eclipse32.png diff --git a/io.github.magwas.inez.ui/icons/eclipse48.png b/inez.ui/icons/eclipse48.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse48.png rename to inez.ui/icons/eclipse48.png diff --git a/io.github.magwas.inez.ui/icons/eclipse512.png b/inez.ui/icons/eclipse512.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse512.png rename to inez.ui/icons/eclipse512.png diff --git a/io.github.magwas.inez.ui/icons/eclipse64.png b/inez.ui/icons/eclipse64.png similarity index 100% rename from io.github.magwas.inez.ui/icons/eclipse64.png rename to inez.ui/icons/eclipse64.png diff --git a/io.github.magwas.inez.ui/plugin.xml b/inez.ui/plugin.xml similarity index 100% rename from io.github.magwas.inez.ui/plugin.xml rename to inez.ui/plugin.xml diff --git a/io.github.magwas.inez.ui/pom.xml b/inez.ui/pom.xml similarity index 99% rename from io.github.magwas.inez.ui/pom.xml rename to inez.ui/pom.xml index bd51e3c..e4b7514 100644 --- a/io.github.magwas.inez.ui/pom.xml +++ b/inez.ui/pom.xml @@ -12,7 +12,6 @@ io.github.magwas.inez.ui - inez-ui eclipse-plugin Inez GUI diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/Application.java b/inez.ui/src/io/github/magwas/inez/ui/Application.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/Application.java rename to inez.ui/src/io/github/magwas/inez/ui/Application.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java rename to inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java rename to inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java rename to inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/Perspective.java b/inez.ui/src/io/github/magwas/inez/ui/Perspective.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/Perspective.java rename to inez.ui/src/io/github/magwas/inez/ui/Perspective.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java b/inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java rename to inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java rename to inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java b/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java b/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java b/inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java b/inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java diff --git a/io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java similarity index 100% rename from io.github.magwas.inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java rename to inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java diff --git a/io.github.magwas.inez.ui.product/.project b/io.github.magwas.inez.ui.product/.project deleted file mode 100644 index abb5646..0000000 --- a/io.github.magwas.inez.ui.product/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - io.github.magwas.inez.ui.product - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/io.github.magwas.inez.ui.tests/.project b/io.github.magwas.inez.ui.tests/.project deleted file mode 100644 index 6f7acbe..0000000 --- a/io.github.magwas.inez.ui.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - io.github.magwas.inez.ui.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/model/.gitignore b/model/.gitignore deleted file mode 100644 index b1a3bd5..0000000 --- a/model/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -bin/ -io.github.magwas.inez.model.jar diff --git a/parser/.gitignore b/parser/.gitignore deleted file mode 100644 index 16e35ff..0000000 --- a/parser/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/inez-parser/ diff --git a/pom.xml b/pom.xml index 288fecd..b00a85f 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ inez 0.4.8 pom - inez + ${project.artifactId} Inez is Not Even Zenta @@ -56,14 +56,14 @@ - inez-target - parser - inez-parser.testing - model - inez-model.testing - io.github.magwas.inez.ui - io.github.magwas.inez.ui.tests - io.github.magwas.inez.ui.product + inez.target + inez.parser + inez.parser.tests + inez.model + inez.model.tests + inez.ui + inez.ui.tests + inez.ui.product @@ -90,7 +90,7 @@ io.github.magwas - inez-target + inez.target ${project.version} diff --git a/tools/testRun b/tools/testRun index c3bc5de..f6c608b 100755 --- a/tools/testRun +++ b/tools/testRun @@ -1,7 +1,7 @@ #!/bin/bash set -xe rm -rf ~/tmp/Inez -tar -C ~/tmp -xzf io.github.magwas.inez.ui.product/target/products/Inez-linux.gtk.x86_64.tar.gz +tar -C ~/tmp -xzf inez.ui.product/target/products/Inez-linux.gtk.x86_64.tar.gz export GDK_BACKEND=x11 ~/tmp/Inez/Inez diff --git a/tools/updateManifestVersion b/tools/updateManifestVersion index f3c6d13..1afac93 100755 --- a/tools/updateManifestVersion +++ b/tools/updateManifestVersion @@ -7,8 +7,4 @@ else VERSION=$1 fi mvn org.eclipse.tycho:tycho-versions-plugin:4.0.12:set-version -DnewVersion=$VERSION -#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" io.github.magwas.inez.ui/META-INF/MANIFEST.MF -#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" model/META-INF/MANIFEST.MF -#sed -i 's/inez-parser;bundle-version=".*"/inez-parser;bundle-version="'$VERSION'"/' model/META-INF/MANIFEST.MF -#sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" parser/META-INF/MANIFEST.MF -#sed -i 's/application="io.github.magwas.inez.ui.application" version="[^"]*"/application="io.github.magwas.inez.ui.application" version="'$VERSION'"/' io.github.magwas.inez.ui.product/Inez.product + From 58b89dd82a1199dbce147495594d89d4d90f67a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20Magos=C3=A1nyi?= Date: Fri, 22 Aug 2025 19:48:24 +0200 Subject: [PATCH 03/16] Create maven.yml --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..a661e89 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From 7bf918e4b7f3d5f566ceab5e8eb4490d195ce765 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 19:50:18 +0200 Subject: [PATCH 04/16] full checkout, updating version --- .github/workflows/maven.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a661e89..368d0b0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,6 +21,9 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - run: tools/updateManifestVersion - name: Set up JDK 21 uses: actions/setup-java@v4 with: From a15f400bb981c87284e5ab87d5a3fc1718a49d46 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 20:12:28 +0200 Subject: [PATCH 05/16] removed comments from action --- .github/workflows/maven.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 368d0b0..ce9c44f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,11 +1,3 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - name: Java CI with Maven on: From 69a098e4f0f4913992e0212f457fcc22674dda25 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 20:36:52 +0200 Subject: [PATCH 06/16] updateManifestVersion fixed --- tools/updateManifestVersion | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/updateManifestVersion b/tools/updateManifestVersion index 2d829c1..1afac93 100755 --- a/tools/updateManifestVersion +++ b/tools/updateManifestVersion @@ -6,8 +6,5 @@ then else VERSION=$1 fi -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" io.github.magwas.inez.ui/META-INF/MANIFEST.MF -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" model/META-INF/MANIFEST.MF -sed -i 's/inez-parser;bundle-version=".*"/inez-parser;bundle-version="'$VERSION'"/' model/META-INF/MANIFEST.MF -sed -i "s/Bundle-Version:.*/Bundle-Version: $VERSION/" parser/META-INF/MANIFEST.MF -sed -i 's/application="io.github.magwas.inez.ui.application" version="[^"]*"/application="io.github.magwas.inez.ui.application" version="'$VERSION'"/' io.github.magwas.inez.ui.product/Inez.product +mvn org.eclipse.tycho:tycho-versions-plugin:4.0.12:set-version -DnewVersion=$VERSION + From 79a9d7aaa9e62048be9d93535b749fc572ac0a5a Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 21:47:10 +0200 Subject: [PATCH 07/16] updateManifestVersion computes the version correctly. fix target artifact id --- pom.xml | 2 +- tools/updateManifestVersion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b00a85f..9562baa 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ io.github.magwas - inez.target + io.github.magwas.inez.target ${project.version} diff --git a/tools/updateManifestVersion b/tools/updateManifestVersion index 1afac93..5b05896 100755 --- a/tools/updateManifestVersion +++ b/tools/updateManifestVersion @@ -2,7 +2,7 @@ set -xe if [ x$1 = x ] then - VERSION=$(git describe |sed 's/-/./;s/-.*//') + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) else VERSION=$1 fi From af7262526edd1d595ffc2486dd1b9240ce5beca3 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 22:10:26 +0200 Subject: [PATCH 08/16] maven s/package/install --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ce9c44f..aae8a9c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B install --file pom.xml # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph From 38dbec0875c4bacc6f182cc96eb9fbd51df4cebd Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Fri, 22 Aug 2025 22:19:15 +0200 Subject: [PATCH 09/16] skip gpg signing in CI --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index aae8a9c..10f30fc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - run: mvn -B install --file pom.xml + run: mvn -B install -Dgpg.skip --file pom.xml # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph From 6f2bd1968ca3769c44d48f00540b90ed86c65224 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 08:02:16 +0200 Subject: [PATCH 10/16] github build cache, detached build version is 0.0.1, ui test dep fix --- .github/workflows/maven.yml | 6 ++++++ .mvn/maven-git-versioning-extension.xml | 2 +- inez.model.tests/META-INF/MANIFEST.MF | 1 + inez.ui.tests/META-INF/MANIFEST.MF | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 10f30fc..4bb0202 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,6 +22,12 @@ jobs: java-version: '21' distribution: 'temurin' cache: maven + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build with Maven run: mvn -B install -Dgpg.skip --file pom.xml diff --git a/.mvn/maven-git-versioning-extension.xml b/.mvn/maven-git-versioning-extension.xml index 69f685f..c818359 100644 --- a/.mvn/maven-git-versioning-extension.xml +++ b/.mvn/maven-git-versioning-extension.xml @@ -14,7 +14,7 @@ - ${describe.tag}.${describe.distance} + 0.0.1 diff --git a/inez.model.tests/META-INF/MANIFEST.MF b/inez.model.tests/META-INF/MANIFEST.MF index 22202bd..de25b31 100644 --- a/inez.model.tests/META-INF/MANIFEST.MF +++ b/inez.model.tests/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Import-Package: io.github.magwas.inez.parse, Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.org.springframework.spring-test;bundle-version="6.2.9", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", + io.github.magwas.inez.parser, junit-jupiter-api;bundle-version="5.11.4" Automatic-Module-Name: io.github.magwas.inez.model.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.ui.tests/META-INF/MANIFEST.MF b/inez.ui.tests/META-INF/MANIFEST.MF index d541d11..b11ab4b 100644 --- a/inez.ui.tests/META-INF/MANIFEST.MF +++ b/inez.ui.tests/META-INF/MANIFEST.MF @@ -5,6 +5,8 @@ Bundle-SymbolicName: io.github.magwas.inez.ui.tests Bundle-Version: 0.4.8 Fragment-Host: io.github.magwas.inez.ui;bundle-version="0.0.1" Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", - junit-jupiter-api;bundle-version="5.11.4" + junit-jupiter-api;bundle-version="5.11.4", + io.github.magwas.inez.parser, + io.github.magwas.inez.model Automatic-Module-Name: io.github.magwas.inez.ui.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 From 2843189ab79a57270b38a9b899ec8a62c347a277 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 08:07:38 +0200 Subject: [PATCH 11/16] fixup: workflow --- .github/workflows/maven.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4bb0202..b73a320 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,10 +23,10 @@ jobs: distribution: 'temurin' cache: maven - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | ${{ runner.os }}-maven- - name: Build with Maven run: mvn -B install -Dgpg.skip --file pom.xml From d1b6c651a6ba432e9d2aa563c2fdb3be6ec31924 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 08:09:31 +0200 Subject: [PATCH 12/16] fixup: cache version in gh action --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b73a320..a32c606 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,7 +22,7 @@ jobs: java-version: '21' distribution: 'temurin' cache: maven - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 8d1d55ea8d0d8bf375324f89d50556397870b126 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 20:53:15 +0200 Subject: [PATCH 13/16] unfragmented tests --- tools/testRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testRun b/tools/testRun index f6c608b..ca9d6af 100755 --- a/tools/testRun +++ b/tools/testRun @@ -1,7 +1,7 @@ #!/bin/bash set -xe rm -rf ~/tmp/Inez -tar -C ~/tmp -xzf inez.ui.product/target/products/Inez-linux.gtk.x86_64.tar.gz +tar -C ~/tmp --warning=no-unknown-keyword -xzf inez.ui.product/target/products/Inez-linux.gtk.x86_64.tar.gz export GDK_BACKEND=x11 ~/tmp/Inez/Inez From 8d5ceca94420663b19171453b40abfcf9a05caba Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 20:53:27 +0200 Subject: [PATCH 14/16] fixup: files --- inez.model.tests/.classpath | 1 - inez.model.tests/META-INF/MANIFEST.MF | 22 +++++++++++++++++----- inez.model.tests/pom.xml | 2 +- inez.model/META-INF/MANIFEST.MF | 9 +++++++-- inez.model/pom.xml | 2 +- inez.parser.tests/META-INF/MANIFEST.MF | 9 ++++++--- inez.parser.tests/pom.xml | 2 +- inez.parser/META-INF/MANIFEST.MF | 5 +++-- inez.parser/pom.xml | 2 +- inez.target/pom.xml | 2 +- inez.ui.product/pom.xml | 2 +- inez.ui.tests/META-INF/MANIFEST.MF | 8 +++++--- inez.ui.tests/pom.xml | 2 +- inez.ui/META-INF/MANIFEST.MF | 3 ++- inez.ui/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 49 insertions(+), 26 deletions(-) diff --git a/inez.model.tests/.classpath b/inez.model.tests/.classpath index 0060337..c64c7bd 100644 --- a/inez.model.tests/.classpath +++ b/inez.model.tests/.classpath @@ -8,6 +8,5 @@ - diff --git a/inez.model.tests/META-INF/MANIFEST.MF b/inez.model.tests/META-INF/MANIFEST.MF index de25b31..e0fc9c8 100644 --- a/inez.model.tests/META-INF/MANIFEST.MF +++ b/inez.model.tests/META-INF/MANIFEST.MF @@ -2,14 +2,26 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing Bundle-SymbolicName: io.github.magwas.inez.model.tests -Bundle-Version: 0.4.8 -Fragment-Host: io.github.magwas.inez.model;bundle-version="0.0.1" -Import-Package: io.github.magwas.inez.parse, - io.github.magwas.inez.parser +Bundle-Version: 0.4.18 +Export-Package: io.github.magwas.inez, + io.github.magwas.inez.element, + io.github.magwas.inez.osgi, + io.github.magwas.inez.query, + io.github.magwas.inez.storage, + io.github.magwas.inez.storage.model, + io.github.magwas.inez.storage.repository Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.org.springframework.spring-test;bundle-version="6.2.9", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", io.github.magwas.inez.parser, - junit-jupiter-api;bundle-version="5.11.4" + io.github.magwas.inez.parser.tests, + io.github.magwas.inez.model, + junit-jupiter-api;bundle-version="5.11.4", + wrapped.org.springframework.spring-beans;bundle-version="6.2.8", + wrapped.io.github.magwas.konveyor-base;bundle-version="0.4.0", + org.eclipse.core.runtime;bundle-version="3.33.0", + wrapped.org.springframework.spring-context;bundle-version="6.2.8", + wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1", + org.antlr.antlr4-runtime;bundle-version="4.13.2" Automatic-Module-Name: io.github.magwas.inez.model.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.model.tests/pom.xml b/inez.model.tests/pom.xml index f91f82c..13e4031 100644 --- a/inez.model.tests/pom.xml +++ b/inez.model.tests/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/inez.model/META-INF/MANIFEST.MF b/inez.model/META-INF/MANIFEST.MF index b749dd6..2f2b4c7 100644 --- a/inez.model/META-INF/MANIFEST.MF +++ b/inez.model/META-INF/MANIFEST.MF @@ -5,11 +5,16 @@ Bundle-Name: io.github.magwas.inez.model Bundle-SymbolicName: io.github.magwas.inez.model;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.osgi.SpringBootBundleActivator -Bundle-Version: 0.4.8 +Bundle-Version: 0.4.18 Bundle-Vendor: Árpád Magosányi Export-Package: io.github.magwas.inez, io.github.magwas.inez.element, - io.github.magwas.inez.osgi + io.github.magwas.inez.functions;x-friends:="io.github.magwas.inez.model.tests", + io.github.magwas.inez.osgi, + io.github.magwas.inez.query;x-friends:="io.github.magwas.inez.model.tests", + io.github.magwas.inez.storage;x-friends:="io.github.magwas.inez.model.tests", + io.github.magwas.inez.storage.model;x-friends:="io.github.magwas.inez.model.tests", + io.github.magwas.inez.storage.repository;x-friends:="io.github.magwas.inez.model.tests" Require-Bundle: wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", wrapped.org.springframework.data.spring-data-commons;bundle-version="3.5.1", diff --git a/inez.model/pom.xml b/inez.model/pom.xml index 5b58793..3fc09ab 100644 --- a/inez.model/pom.xml +++ b/inez.model/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/inez.parser.tests/META-INF/MANIFEST.MF b/inez.parser.tests/META-INF/MANIFEST.MF index eac0acb..a9ab179 100644 --- a/inez.parser.tests/META-INF/MANIFEST.MF +++ b/inez.parser.tests/META-INF/MANIFEST.MF @@ -2,10 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testing Bundle-SymbolicName: io.github.magwas.inez.parser.tests -Bundle-Version: 0.4.8 -Fragment-Host: io.github.magwas.inez.parser;bundle-version="0.0.1" +Bundle-Version: 0.4.18 +Export-Package: io.github.magwas.inez.parse Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", - junit-jupiter-api;bundle-version="5.11.4" + junit-jupiter-api;bundle-version="5.11.4", + io.github.magwas.inez.parser;bundle-version="0.4.18", + org.antlr.antlr4-runtime;bundle-version="4.13.2", + wrapped.io.github.magwas.konveyor-base;bundle-version="0.4.0" Automatic-Module-Name: io.github.magwas.inez.parser.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.parser.tests/pom.xml b/inez.parser.tests/pom.xml index d492025..3cb2c33 100644 --- a/inez.parser.tests/pom.xml +++ b/inez.parser.tests/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml eclipse-plugin diff --git a/inez.parser/META-INF/MANIFEST.MF b/inez.parser/META-INF/MANIFEST.MF index 0482577..e9a000f 100644 --- a/inez.parser/META-INF/MANIFEST.MF +++ b/inez.parser/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: io.github.magwas.inez.parser Bundle-SymbolicName: io.github.magwas.inez.parser;singleton:=true Spring-Context: *;create-asynchronously:=false Bundle-Activator: io.github.magwas.inez.parse.ParserBundleActivator -Bundle-Version: 0.4.8 +Bundle-Version: 0.4.18 Bundle-Vendor: Árpád Magosányi Export-Package: io.github.magwas.inez.parse, - io.github.magwas.inez.parser;x-friends:="io.github.magwas.inez.parser.tests" + io.github.magwas.inez.parser Require-Bundle: wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", org.antlr.antlr4-runtime;bundle-version="4.13.2", wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", @@ -15,6 +15,7 @@ Require-Bundle: wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", wrapped.org.springframework.spring-context;bundle-version="6.2.8", wrapped.org.springframework.spring-core;bundle-version="6.2.8", wrapped.org.springframework.spring-beans;bundle-version="6.2.8", + io.github.magwas.inez.parser, org.eclipse.core.runtime;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.github.magwas.inez.parser diff --git a/inez.parser/pom.xml b/inez.parser/pom.xml index 59766ba..1bac898 100644 --- a/inez.parser/pom.xml +++ b/inez.parser/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml eclipse-plugin diff --git a/inez.target/pom.xml b/inez.target/pom.xml index 5041a12..8bc6b79 100644 --- a/inez.target/pom.xml +++ b/inez.target/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/inez.ui.product/pom.xml b/inez.ui.product/pom.xml index c48fcb5..c288ab3 100644 --- a/inez.ui.product/pom.xml +++ b/inez.ui.product/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/inez.ui.tests/META-INF/MANIFEST.MF b/inez.ui.tests/META-INF/MANIFEST.MF index b11ab4b..6731841 100644 --- a/inez.ui.tests/META-INF/MANIFEST.MF +++ b/inez.ui.tests/META-INF/MANIFEST.MF @@ -2,11 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: io.github.magwas.inez.ui.tests -Bundle-Version: 0.4.8 -Fragment-Host: io.github.magwas.inez.ui;bundle-version="0.0.1" +Bundle-Version: 0.4.18 Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", junit-jupiter-api;bundle-version="5.11.4", io.github.magwas.inez.parser, - io.github.magwas.inez.model + io.github.magwas.inez.model, + io.github.magwas.inez.model.tests;bundle-version="0.4.18", + io.github.magwas.inez.parser.tests;bundle-version="0.4.18", + io.github.magwas.inez.ui;bundle-version="0.4.18" Automatic-Module-Name: io.github.magwas.inez.ui.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.ui.tests/pom.xml b/inez.ui.tests/pom.xml index 0e5b058..b04b943 100644 --- a/inez.ui.tests/pom.xml +++ b/inez.ui.tests/pom.xml @@ -8,7 +8,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/inez.ui/META-INF/MANIFEST.MF b/inez.ui/META-INF/MANIFEST.MF index 7d0e6da..4c80ef5 100644 --- a/inez.ui/META-INF/MANIFEST.MF +++ b/inez.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ui Bundle-SymbolicName: io.github.magwas.inez.ui;singleton:=true -Bundle-Version: 0.4.8 +Bundle-Version: 0.4.18 Require-Bundle: io.github.magwas.inez.model, org.eclipse.ui;bundle-version="3.108.1", org.eclipse.equinox.app;bundle-version="1.3.400", @@ -27,3 +27,4 @@ Require-Bundle: io.github.magwas.inez.model, org.eclipse.core.runtime;bundle-version="3.33.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.github.magwas.inez.ui +Export-Package: io.github.magwas.inez.ui.tree;x-friends:="io.github.magwas.inez.ui.tests" diff --git a/inez.ui/pom.xml b/inez.ui/pom.xml index e4b7514..3184584 100644 --- a/inez.ui/pom.xml +++ b/inez.ui/pom.xml @@ -7,7 +7,7 @@ io.github.magwas inez - 0.4.8 + 0.4.18 ../pom.xml diff --git a/pom.xml b/pom.xml index 9562baa..4331056 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ inez - 0.4.8 + 0.4.18 pom ${project.artifactId} From aa2684af67494f9a39c191c99c9aaf3db2173868 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 22:23:34 +0200 Subject: [PATCH 15/16] no external javafx for building --- inez.target/inez.target | 4 ++++ inez.ui.product/Inez.product | 1 - inez.ui/.classpath | 13 +++++-------- inez.ui/hooks/initialize | 4 ++++ inez.ui/pom.xml | 5 +++++ 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100755 inez.ui/hooks/initialize diff --git a/inez.target/inez.target b/inez.target/inez.target index c6d84ce..c9c1fb8 100644 --- a/inez.target/inez.target +++ b/inez.target/inez.target @@ -14,6 +14,10 @@ + + + + diff --git a/inez.ui.product/Inez.product b/inez.ui.product/Inez.product index 8f3d887..1fe1202 100644 --- a/inez.ui.product/Inez.product +++ b/inez.ui.product/Inez.product @@ -54,7 +54,6 @@ - diff --git a/inez.ui/.classpath b/inez.ui/.classpath index d8b7890..41a4ec2 100644 --- a/inez.ui/.classpath +++ b/inez.ui/.classpath @@ -7,13 +7,10 @@ - - - - - - - - + + + + + diff --git a/inez.ui/hooks/initialize b/inez.ui/hooks/initialize new file mode 100755 index 0000000..8c7ab3d --- /dev/null +++ b/inez.ui/hooks/initialize @@ -0,0 +1,4 @@ +#!/bin/bash +set -xe +pwd +unzip -o target/dependency/javafx-graphics-linux.jar -d target/dependency javafx-swt.jar diff --git a/inez.ui/pom.xml b/inez.ui/pom.xml index 3184584..1d4b4c8 100644 --- a/inez.ui/pom.xml +++ b/inez.ui/pom.xml @@ -61,6 +61,11 @@ javafx-graphics 21.0.8 + + org.openjfx + javafx-controls + 21.0.8 + From 4300aa02f19afb0be92f7ba3a1bc286baa6c0f67 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 23 Aug 2025 22:55:41 +0200 Subject: [PATCH 16/16] moved obtaining javafx to target --- {inez.ui => inez.target}/hooks/initialize | 3 +++ inez.target/pom.xml | 33 +++++++++++++++++++++++ inez.ui/pom.xml | 33 ----------------------- 3 files changed, 36 insertions(+), 33 deletions(-) rename {inez.ui => inez.target}/hooks/initialize (62%) diff --git a/inez.ui/hooks/initialize b/inez.target/hooks/initialize similarity index 62% rename from inez.ui/hooks/initialize rename to inez.target/hooks/initialize index 8c7ab3d..ff2d23a 100755 --- a/inez.ui/hooks/initialize +++ b/inez.target/hooks/initialize @@ -2,3 +2,6 @@ set -xe pwd unzip -o target/dependency/javafx-graphics-linux.jar -d target/dependency javafx-swt.jar +mkdir -p ../inez.ui/target/ +mv target/dependency ../inez.ui/target + diff --git a/inez.target/pom.xml b/inez.target/pom.xml index 8bc6b79..79c99d4 100644 --- a/inez.target/pom.xml +++ b/inez.target/pom.xml @@ -48,6 +48,24 @@ https://repo.kodekonveyor.com/${project.artifactId} + + + org.osgi + osgi.core + 6.0.0 + provided + + + org.openjfx + javafx-graphics + 21.0.8 + + + org.openjfx + javafx-controls + 21.0.8 + + @@ -66,6 +84,21 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + initialize + + copy-dependencies + + + true + + + + diff --git a/inez.ui/pom.xml b/inez.ui/pom.xml index 1d4b4c8..7804f67 100644 --- a/inez.ui/pom.xml +++ b/inez.ui/pom.xml @@ -49,41 +49,8 @@ - - - org.osgi - osgi.core - 6.0.0 - provided - - - org.openjfx - javafx-graphics - 21.0.8 - - - org.openjfx - javafx-controls - 21.0.8 - - - - org.apache.maven.plugins - maven-dependency-plugin - - - initialize - - copy-dependencies - - - true - - - - org.eclipse.tycho tycho-packaging-plugin