Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KOGITO-9831: SWF Editor - final migration to j2cl #1990

Merged
merged 30 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2fc7d70
KOGITO-9536: SWF Editor - Simplifying the hierarchy of canvas elements.
treblereel Jul 15, 2023
7897408
Kogito 9537 (#21)
treblereel Aug 1, 2023
c438906
KOGITO-9695: SWF Editor - Refactor GWT components
romartin Aug 18, 2023
5e4324f
added j2cl compatible Timer and Scheduler
treblereel Aug 26, 2023
35735d0
removed jsni from gwtbootsrap; removed useless classes
treblereel Aug 30, 2023
03feb48
errai removed, migrated to jakarta
treblereel Sep 5, 2023
b129a36
added crysknife
treblereel Sep 5, 2023
e454e35
cycle solved
treblereel Sep 8, 2023
d04073a
its working
treblereel Sep 11, 2023
7bd452d
fixed zoom and css injection order
treblereel Sep 17, 2023
e339dbf
models and tooltips
treblereel Sep 19, 2023
4d0065f
removed gwt modules
treblereel Sep 19, 2023
f00c748
css and js resources refactoring
treblereel Sep 20, 2023
aca427c
optimized fonts
treblereel Sep 20, 2023
4a52e79
removed uberfire-workbench-processors
treblereel Sep 20, 2023
0703ef6
combo editor works
treblereel Sep 22, 2023
6a8f11f
tests fixed
treblereel Sep 30, 2023
d75222b
restore InlineTextEditorBoxViewImpl.onChangeName
treblereel Oct 1, 2023
a7cbdd0
bump crysknife to sonatype release
treblereel Oct 2, 2023
5abc00f
fix resources processing
treblereel Oct 3, 2023
c60dad4
replaced license headers
treblereel Oct 4, 2023
758d844
fixed export canvas apis
treblereel Oct 5, 2023
b058d52
load ClientBundle resources from maven deps
treblereel Oct 12, 2023
7da07c1
process resources with bootstrap install.js
treblereel Oct 19, 2023
47b0e37
fixed dep versions location
treblereel Oct 19, 2023
a6bffa5
removed stylesheets module
treblereel Oct 20, 2023
944bc70
do not format external resources
treblereel Oct 20, 2023
dc64e8a
versions moved from package.json to env/index.js
treblereel Oct 21, 2023
e145eec
retest this please
treblereel Oct 22, 2023
da1443f
post review
treblereel Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/deploy/
packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/lib/
packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/model/
packages/serverless-workflow-diagram-editor/**/src/main/webapp/model/
packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/


# dashbuilder
packages/dashbuilder/**/org.uberfire
Expand Down Expand Up @@ -267,4 +269,4 @@ fabric.properties
# xml-parser-ts-codegen on some packages
packages/bpmn-marshaller/**/ts-gen
packages/dmn-marshaller/**/ts-gen
packages/scesim-marshaller/**/ts-gen
packages/scesim-marshaller/**/ts-gen
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@ export function getServerlessWorkflowLanguageData(resourcesPathPrefix: string):
editorId: editors.swf.id,
gwtModuleName: editors.swf.name,
resources: [
{
type: "css",
paths: [`${resourcesPathPrefix}/${editors.swf.name}/css/patternfly.min.css`],
},
{
type: "js",
paths: [`${resourcesPathPrefix}/${editors.swf.name}/${editors.swf.name}.nocache.js`],
paths: [`${resourcesPathPrefix}/${editors.swf.name}/${editors.swf.name}.js`],
},
],
};
Expand Down
6 changes: 6 additions & 0 deletions packages/serverless-workflow-diagram-editor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@ lienzo-webapp/src/main/webapp/org.kie.lienzo.LienzoShowcase/
.idea
sw-editor/sw-editor-kogito-app/src/main/webapp/org.kie.workbench.common.stunner.sw.KogitoSWEditor/

kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/animate.min.css
kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/font-awesome.min.css
kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/patternfly-additions.min.css
kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/patternfly.min.css
kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/css/uberfire-patternfly.css
kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/js/
107 changes: 21 additions & 86 deletions packages/serverless-workflow-diagram-editor/appformer-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
~ under the License.
-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
Expand Down Expand Up @@ -241,19 +241,7 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor</groupId>
<artifactId>uberfire-workbench-processors</artifactId>
<version>${project.version}</version>
</dependency>

<!-- 3rd-party dependencies -->
<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor</groupId>
<artifactId>errai-cdi-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
Expand Down Expand Up @@ -298,33 +286,6 @@
</exclusions>
</dependency>

<!-- GWT and GWT Extensions -->
<dependency>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<version>${version.org.gwtproject}</version>
</dependency>

<dependency>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<version>${version.org.gwtproject}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.google.jsinterop</groupId>
<artifactId>base</artifactId>
Expand Down Expand Up @@ -490,6 +451,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor.third_party</groupId>
<artifactId>errai</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor.third_party.tooling.marshalling.json</groupId>
<artifactId>common</artifactId>
Expand Down Expand Up @@ -531,56 +498,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor.third_party</groupId>
<artifactId>stylesheets</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.kie.kogito.stunner.serverless.editor</groupId>
<artifactId>lienzo-tests</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${version.com.jcraft}</version>
</dependency>

<!-- Required to run the ElasticSearch server when performing the unit test executions.
The ELS data provider requires groovy scripts enabled on the server.-->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<classifier>indy</classifier>
<version>${version.org.codehaus.groovy}</version>
</dependency>

<!-- Test deps -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${version.org.mysql-driver}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${version.org.postgres-driver}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${version.org.mariadb.jdbc}</version>
<scope>test</scope>
</dependency>


<!-- ARQUILLIAN -->

<dependency>
Expand Down Expand Up @@ -618,6 +541,18 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<version>2.10.0</version>
</dependency>

<dependency>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<version>2.10.0</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
~ under the License.
-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
Expand All @@ -36,13 +36,13 @@

<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>com.google.jsinterop</groupId>
<artifactId>jsinterop-annotations</artifactId>
</dependency>

<dependency>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
<groupId>io.crysknife</groupId>
<artifactId>crysknife-core</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* under the License.
*/


package org.appformer.client.context;

import java.util.Optional;

import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class DefaultEditorContextProviderImpl implements EditorContextProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* under the License.
*/


Expand All @@ -25,6 +25,7 @@
import java.util.Deque;
import java.util.List;

import jakarta.enterprise.context.Dependent;
import org.appformer.client.stateControl.registry.DefaultRegistry;
import org.appformer.client.stateControl.registry.Registry;
import org.appformer.client.stateControl.registry.RegistryChangeListener;
Expand All @@ -35,6 +36,7 @@
* Note: The Stack class behavior when using the iterator is not the expected one, so used
* ArrayDeque instead of an Stack to provide right iteration order.
*/
@Dependent
public class DefaultRegistryImpl<C> implements DefaultRegistry<C> {

private final Deque<C> items = new ArrayDeque<>();
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading