Skip to content

Commit

Permalink
Merge main-apache and exclude white-listed changes from the merge
Browse files Browse the repository at this point in the history
  • Loading branch information
fantonangeli committed Sep 9, 2024
2 parents 1b3ab5c + 30505c3 commit 51f3ab5
Show file tree
Hide file tree
Showing 243 changed files with 15,233 additions and 17,248 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ node/
## dev-deployment-dmn-form-webapp
!packages/dev-deployment-dmn-form-webapp/build

## sonataflow-management-console-webapp
!packages/sonataflow-management-console-webapp/build

## vscode-*
**/.vscode-test/
**/.vscode-test-web/
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,10 @@ The Apache KIE Tools project contains several applications. To develop each one
#### Serverless Logic Web Tools

1. After you've successfully built the project following the instructions above, go to `packages/serverless-logic-web-tools`.
1. Open a terminal and run `pnpm start`. This will start a `webpack serve` instance with the Serverless Logic Web Tools resources.
1. From now on you can use the development version of the Serverless Logic Web Tools by accessing `https://localhost:9020`.
1. Run the CORS Proxy by running `pnpm start` at `packages/cors-proxy`.
2. Open a terminal and run `pnpm start`. This will start a `webpack serve` instance with the Serverless Logic Web Tools resources.
3. From now on you can use the development version of the Serverless Logic Web Tools by accessing `https://localhost:9020`.
4. Run the CORS Proxy by running `pnpm start` at `packages/cors-proxy`.
5. (Optional) To try the "Runtime Tools" functionalities, run the SonataFlow Dev App by running `pnpm start` at `packages/sonataflow-dev-app`, then open `https://localhost:9020/#/settings/runtime-tools` and set `http://localhost:4000/graphql` in the "Data Index URL" field

#### Standalone Editors (DMN and BPMN)

Expand Down
2 changes: 1 addition & 1 deletion examples/base64png-editor-chrome-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"copy-webpack-plugin": "^11.0.0",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/base64png-editor-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@vscode/vsce": "^2.22.0",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/dmn-editor-standalone-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"raw-loader": "^4.0.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@

#https://quarkus.io/guides/openapi-swaggerui
quarkus.http.cors=true
quarkus.http.cors.origins=*
quarkus.dev-ui.cors.enabled=false
quarkus.smallrye-openapi.path=/docs/openapi.json
quarkus.swagger-ui.always-include=true
quarkus.kogito.data-index.graphql.ui.always-include=true
quarkus.http.test-port=0

# Kogito-service
kogito.service.url=http://localhost:8080
kogito.service.url=http://0.0.0.0:8080

#Job-service
kogito.jobs-service.url=http://localhost:8080
kogito.dataindex.http.url=http://localhost:8080
kogito.jobs-service.url=http://0.0.0.0:8080
kogito.data-index.url=http://0.0.0.0:8080

# run create tables scripts
quarkus.flyway.migrate-at-start=true
Expand All @@ -26,8 +28,8 @@ kogito.persistence.type=jdbc
quarkus.datasource.db-kind=postgresql
%prod.quarkus.datasource.username=kogito-user
%prod.quarkus.datasource.password=kogito-pass
%prod.quarkus.datasource.jdbc.url=${QUARKUS_DATASOURCE_JDBC_URL:jdbc:postgresql://localhost:5432/kogito}
%prod.quarkus.datasource.reactive.url=${QUARKUS_DATASOURCE_REACTIVE_URL:postgresql://localhost:5432/kogito}
%prod.quarkus.datasource.jdbc.url=${QUARKUS_DATASOURCE_JDBC_URL:jdbc:postgresql://0.0.0.0:5432/kogito}
%prod.quarkus.datasource.reactive.url=${QUARKUS_DATASOURCE_REACTIVE_URL:postgresql://0.0.0.0:5432/kogito}

quarkus.native.native-image-xmx=8g

Expand Down
2 changes: 1 addition & 1 deletion examples/ping-pong-view-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
"@kie-tools/tsconfig": "workspace:*",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1"
"webpack": "^5.94.0"
}
}
2 changes: 1 addition & 1 deletion examples/todo-list-view-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@vscode/vsce": "^2.22.0",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/uniforms-patternfly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"react-router-dom": "^5.3.4",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"react-router-dom": "^5.3.4",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/boxed-expression-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"storybook": "^7.3.2",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/bpmn-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"copy-webpack-plugin": "^11.0.0",
"process": "^0.11.10",
"rimraf": "^3.0.2",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"start-server-and-test": "^2.0.3",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"typescript": "^5.5.3",
"vscode-languageserver-textdocument": "^1.0.4",
"vscode-languageserver-types": "^3.16.0",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cors-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"run-script-os": "^1.1.6",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-merge": "^5.9.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-assembler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"copy-webpack-plugin": "^11.0.0",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-echarts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-svg-heatmap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-timeseries/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-uniforms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-component-victory-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"start-server-and-test": "^2.0.3",
"typescript": "^5.5.3",
"vscode-json-languageservice": "^4.2.1",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-viewer-deployment-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"html-webpack-plugin": "^5.3.2",
"rimraf": "^3.0.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"start-server-and-test": "^2.0.3",
"typescript": "^5.5.3",
"vscode-json-languageservice": "^4.2.1",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-dmn-form-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"ts-jest": "^29.1.5",
"ts-node": "^10.9.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dmn-editor-standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"run-script-os": "^1.1.6",
"storybook": "^7.3.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/dmn-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"start-server-and-test": "^2.0.3",
"storybook": "^7.3.2",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dmn-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"process": "^0.11.10",
"rimraf": "^3.0.2",
"stream-browserify": "3.0.0",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/extended-services-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"copy-webpack-plugin": "^11.0.0",
"node-fetch": "^3.3.1",
"rimraf": "^3.0.2",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/feel-input-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"rimraf": "^3.0.2",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/form-generation-tool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"run-script-os": "^1.1.6",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/image-env-to-json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"rimraf": "^3.0.2",
"run-script-os": "^1.1.6",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/import-java-classes-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"rimraf": "^3.0.2",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ kogito.service.url=http://0.0.0.0:8080/kie

#Job-service
kogito.jobs-service.url=http://0.0.0.0:8080/kie
kogito.dataindex.http.url=http://0.0.0.0:8080/kie
kogito.data-index.url=http://0.0.0.0:8080/kie

quarkus.kogito.data-index.graphql.ui.always-include=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@ public CardPageBuildItem pages(
managementInterfaceBuildTimeConfig, launchModeBuildItem, true);

String devUIUrl = getProperty(configurationBuildItem, systemPropertyBuildItems, "kogito.dev-ui.url");
String dataIndexUrl = getProperty(configurationBuildItem, systemPropertyBuildItems, "kogito.dataindex.http.url");
String trustyServiceUrl = getProperty(configurationBuildItem, systemPropertyBuildItems, "kogito.trusty.http.url");
String quarkusHttpHost = ConfigProvider.getConfig().getValue("quarkus.http.host", String.class);
String quarkusHttpPort = ConfigProvider.getConfig().getValue("quarkus.http.port", String.class);
String dataIndexUrl = getProperty(configurationBuildItem, systemPropertyBuildItems, "kogito.data-index.url");
String quarkusHttpHost = ConfigProvider.getConfig().getOptionalValue("quarkus.http.host", String.class).orElse("0.0.0.0");
String quarkusHttpPort = ConfigProvider.getConfig().getOptionalValue("quarkus.http.port", String.class).orElse("8080");

CardPageBuildItem cardPageBuildItem = new CardPageBuildItem();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static java.lang.Integer.parseInt;

@ApplicationScoped
public class JBPMDevuiJsonRPCService {
private static final String DATA_INDEX_URL = "kogito.data-index.url";
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-editors-dev-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"sanitize-filename-ts": "^1.0.2",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.3.1",
"webpack": "^5.92.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-editors-standalone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Available parameters:
- `Promise.resolve("")`
- `Promise.resolve("<DIAGRAM_CONTENT_DIRECTLY_HERE>")`
- `fetch("MyDmnModel.dmn").then(content => content.text())`
- `readOnly` (optional, defaults to `false`): Use `false` to allow content edition, and `true` for read-only mode, in which the Editor will not allow changes.
- `readOnly` (optional, defaults to `true`): Use `false` to allow content edition, and `true` for read-only mode, in which the Editor will not allow changes.
- `origin` (optional, defaults to `*` when accessing the application with the `file` protocol, `window.location.origin` otherwise): If for some reason your application needs to change this parameter, you can use it.
- `onError` (optional, defaults to `() => {}`): If there's an error opening the Editor, this function will be called.

Expand Down
Loading

0 comments on commit 51f3ab5

Please sign in to comment.