diff --git a/README.md b/README.md index d4969b2e100..ffb765ab83e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Camunda BPM - The open source BPM platform +# Camunda Platform - The open source BPMN platform [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.camunda.bpm/camunda-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.camunda.bpm/camunda-parent) [![camunda manual latest](https://img.shields.io/badge/manual-latest-brown.svg)](https://docs.camunda.org/manual/latest/) [![License](https://img.shields.io/github/license/camunda/camunda-bpm-platform?color=blue&logo=apache)](https://github.com/camunda/camunda-bpm-platform/blob/master/LICENSE) [![Forum](https://img.shields.io/badge/forum-camunda-green)](https://forum.camunda.org/) -Camunda BPM platform is a flexible framework for workflow and process automation. It's core is a native BPMN 2.0 process engine that runs inside the Java Virtual Machine. It can be embedded inside any Java application and any Runtime Container. It integrates with Java EE 6 and is a perfect match for the Spring Framework. On top of the process engine, you can choose from a stack of tools for human workflow management, operations & monitoring. +Camunda Platform is a flexible framework for workflow and process automation. It's core is a native BPMN 2.0 process engine that runs inside the Java Virtual Machine. It can be embedded inside any Java application and any Runtime Container. It integrates with Java EE 6 and is a perfect match for the Spring Framework. On top of the process engine, you can choose from a stack of tools for human workflow management, operations & monitoring. - Web Site: https://www.camunda.org/ - Getting Started: https://docs.camunda.org/get-started/ @@ -12,7 +12,7 @@ Camunda BPM platform is a flexible framework for workflow and process automation ## Components -Camunda BPM platform provides a rich set of components centered around the BPM lifecycle. +Camunda Platform provides a rich set of components centered around the BPM lifecycle. #### Process Implementation and Execution @@ -37,15 +37,15 @@ Camunda BPM platform provides a rich set of components centered around the BPM l #### And there's more... - [bpmn.io](https://bpmn.io/) - Toolkits for BPMN, CMMN, and DMN in JavaScript (rendering, modeling) -- [Community Extensions](https://docs.camunda.org/manual/7.5/introduction/extensions/) - Extensions on top of Camunda BPM provided and maintained by our great open source community +- [Community Extensions](https://docs.camunda.org/manual/7.5/introduction/extensions/) - Extensions on top of Camunda Platform provided and maintained by our great open source community ## A Framework -In contrast to other vendor BPM platforms, Camunda BPM strives to be highly integrable and embeddable. We seek to deliver a great experience to developers that want to use BPM technology in their projects. +In contrast to other vendor BPM platforms, Camunda Platform strives to be highly integrable and embeddable. We seek to deliver a great experience to developers that want to use BPM technology in their projects. ### Highly Integrable -Out of the box, Camunda BPM provides infrastructure-level integration with Java EE Application Servers and Servlet Containers. +Out of the box, Camunda Platform provides infrastructure-level integration with Java EE Application Servers and Servlet Containers. ### Embeddable diff --git a/TESTING.md b/TESTING.md index 31b41ea1c8b..bbbd45ad7e4 100644 --- a/TESTING.md +++ b/TESTING.md @@ -41,7 +41,7 @@ each server runtime we support. These projects are responsible for taking a runt distribution (ie. Apache Tomcat, WildFly AS ...) and configuring it for integration testing. The actual integration tests are located in the `qa/integration-tests-engine` and `qa/integration-tests-webapps` modules. * *integration-tests-engine*: This module contains an extensive testsuite that test the integration of the process engine within a particular runtime container. For example, such tests will ensure that if you use the Job Executor Service inside a Java EE Container, you get a proper CDI request context spanning multiple EJB invocations or that EE resource injection works as expected. These integration tests are executed in-container, using [JBoss Arquillian](http://arquillian.org/). - * *integration-tests-webapps*: This module tests the camunda BPM webapplications inside the runtime containers. These integration tests run inside a client / server setting: the webapplication is deployed to the runtime container, the runtime container is started and the tests running inside a client VM perform requests against the deployed applications. + * *integration-tests-webapps*: This module tests the Camunda Platform webapplications inside the runtime containers. These integration tests run inside a client / server setting: the webapplication is deployed to the runtime container, the runtime container is started and the tests running inside a client VM perform requests against the deployed applications. In order to run the integration tests, first perform a full install build. Then navigate to the `qa` folder. diff --git a/bom/pom.xml b/bom/pom.xml index d87febe5d8e..fb44d90df0d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -11,10 +11,10 @@ camunda-bom pom - camunda BPM - Bom + Camunda Platform - Bom http://camunda.org - camunda BPM bill of material + Camunda Platform bill of material @@ -47,7 +47,7 @@ ${version.uuid-generator} - + org.camunda.bpm camunda-engine diff --git a/database/pom.xml b/database/pom.xml index e2cc276ec94..5333f8f6b10 100644 --- a/database/pom.xml +++ b/database/pom.xml @@ -11,7 +11,7 @@ camunda-database-settings pom - camunda BPM - database settings + Camunda Platform - database settings Provides general dependencies and profiles for database testing diff --git a/distro/camunda-welcome/index.html b/distro/camunda-welcome/index.html index 88e4ec03785..c8e7662bb94 100644 --- a/distro/camunda-welcome/index.html +++ b/distro/camunda-welcome/index.html @@ -6,7 +6,7 @@ - Welcome to the Camunda BPM Platform + Welcome to the Camunda Platform @@ -20,9 +20,9 @@
@@ -130,7 +130,7 @@

Invoice Example

- This example allows you to walk through the features of camundaBPM guided by a simple invoice process. + This example allows you to walk through the features of Camunda Platform guided by a simple invoice process.

diff --git a/distro/camunda-welcome/invoice.html b/distro/camunda-welcome/invoice.html index 2aa844b2e82..1c98f617660 100644 --- a/distro/camunda-welcome/invoice.html +++ b/distro/camunda-welcome/invoice.html @@ -6,7 +6,7 @@ - Welcome to the Camunda BPM Platform + Welcome to the Camunda Platform @@ -20,9 +20,9 @@

@@ -41,7 +41,7 @@

Overview

- This example allows you to walk through the features of camundaBPM guided by a simple invoice process. + This example allows you to walk through the features of Camunda Platform guided by a simple invoice process.

diff --git a/distro/h2-webapp/pom.xml b/distro/h2-webapp/pom.xml index d0f8ad8a664..1b68c6bae17 100644 --- a/distro/h2-webapp/pom.xml +++ b/distro/h2-webapp/pom.xml @@ -12,7 +12,7 @@ 7.15.0-SNAPSHOT - camunda BPM - H2 Webapp + Camunda Platform - H2 Webapp diff --git a/distro/jbossas7/modules/pom.xml b/distro/jbossas7/modules/pom.xml index df88e479d1b..e3350fe75a5 100644 --- a/distro/jbossas7/modules/pom.xml +++ b/distro/jbossas7/modules/pom.xml @@ -3,7 +3,7 @@ camunda-jboss-modules pom - camunda BPM - jBoss7 Modules + Camunda Platform - jBoss7 Modules org.camunda.bpm.jboss diff --git a/distro/jbossas7/pom.xml b/distro/jbossas7/pom.xml index 9b3f72720f6..c23603c3be8 100644 --- a/distro/jbossas7/pom.xml +++ b/distro/jbossas7/pom.xml @@ -12,7 +12,7 @@ camunda-jboss pom - camunda BPM - jBoss7 + Camunda Platform - jBoss7 diff --git a/distro/jbossas7/subsystem/pom.xml b/distro/jbossas7/subsystem/pom.xml index a9384de5376..b926b471157 100644 --- a/distro/jbossas7/subsystem/pom.xml +++ b/distro/jbossas7/subsystem/pom.xml @@ -4,7 +4,7 @@ camunda-jboss-subsystem jar - camunda BPM - jBoss7 Subsystem + Camunda Platform - jBoss7 Subsystem org.camunda.bpm.jboss diff --git a/distro/jbossas7/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java b/distro/jbossas7/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java index 3af7b382c52..981727fba9a 100644 --- a/distro/jbossas7/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java +++ b/distro/jbossas7/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java @@ -85,7 +85,7 @@ public void execute(DeploymentProcessorTarget processorTarget) { newControllers.add(controller); - // discover and register bpm platform plugins + // discover and register Camunda Platform plugins BpmPlatformPlugins plugins = BpmPlatformPlugins.load(getClass().getClassLoader()); MscBpmPlatformPlugins managedPlugins = new MscBpmPlatformPlugins(plugins); diff --git a/distro/jbossas7/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties b/distro/jbossas7/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties index 51e7c61911f..123037c66d6 100644 --- a/distro/jbossas7/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties +++ b/distro/jbossas7/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties @@ -1,7 +1,7 @@ -camunda-bpm-platform=camunda BPM platform subsystem. -camunda-bpm-platform.add=Operation adding the camunda BPM platform subsystem -camunda-bpm-platform.remove=Operation removing the camunda BPM platform subsystem -camunda-bpm-platform.process-engines=Process engines provided by the camunda BPM platform subsystem +camunda-bpm-platform=Camunda Platform subsystem. +camunda-bpm-platform.add=Operation adding the Camunda Platform subsystem +camunda-bpm-platform.remove=Operation removing the Camunda Platform subsystem +camunda-bpm-platform.process-engines=Process engines provided by the Camunda Platform subsystem process-engines=Collection of defined process engines. process-engines.add=Operation adding a process engine. diff --git a/distro/jbossas7/webapp-standalone/pom.xml b/distro/jbossas7/webapp-standalone/pom.xml index 88922f55f18..4606abadfa2 100644 --- a/distro/jbossas7/webapp-standalone/pom.xml +++ b/distro/jbossas7/webapp-standalone/pom.xml @@ -11,7 +11,7 @@ org.camunda.bpm.webapp camunda-webapp-jboss-standalone war - camunda BPM - webapp - JBoss Standalone + Camunda Platform - webapp - JBoss Standalone diff --git a/distro/license-book/pom.xml b/distro/license-book/pom.xml index 592a54a5dba..715feca5448 100644 --- a/distro/license-book/pom.xml +++ b/distro/license-book/pom.xml @@ -11,7 +11,7 @@ license-book pom - camunda BPM - License Book + Camunda Platform - License Book diff --git a/distro/run/assembly/pom.xml b/distro/run/assembly/pom.xml index 9b7240ce2ac..ace98965d9b 100644 --- a/distro/run/assembly/pom.xml +++ b/distro/run/assembly/pom.xml @@ -10,7 +10,7 @@ camunda-bpm-run-assembly - Camunda BPM - Run - Assembly + Camunda Platform - Run - Assembly pom diff --git a/distro/run/assembly/resources/README.txt b/distro/run/assembly/resources/README.txt index 20ce83e8511..3b17a68c584 100644 --- a/distro/run/assembly/resources/README.txt +++ b/distro/run/assembly/resources/README.txt @@ -1,18 +1,18 @@ This is a distribution of - Camunda BPM platform v${project.version} + Camunda Platform v${project.version} visit http://docs.camunda.org/ -The Camunda BPM platform is a dual-license Java-based framework. -This particular copy of the Camunda BPM Platform is released either +The Camunda Platform is a dual-license Java-based framework. +This particular copy of the Camunda Platform is released either under the Apache License 2.0 (Community Platform) OR a commercial license agreement (Enterprise Platform). License information can be found in the LICENSE file. -The Camunda BPM platform includes libraries developed by third +The Camunda Platform includes libraries developed by third parties. For license and attribution notices for these libraries, please refer to the documentation that accompanies this distribution (see the LICENSE_BOOK-${project.version} file). @@ -34,7 +34,7 @@ Contents: internal/ This directory contains the Java application and optional components - that Camunda BPM Run consists of. + that Camunda Platform Run consists of. configuration/ This directory contains all resources to configure the distro. @@ -45,6 +45,6 @@ Contents: ================== -Camunda BPM platform version: ${project.version} +Camunda Platform version: ${project.version} ================= diff --git a/distro/run/core/pom.xml b/distro/run/core/pom.xml index 5998ef25b3d..2347fdbc55d 100644 --- a/distro/run/core/pom.xml +++ b/distro/run/core/pom.xml @@ -10,7 +10,7 @@ camunda-bpm-run-core - Camunda BPM - Run - Core + Camunda Platform - Run - Core jar diff --git a/distro/run/core/src/main/resources/banner.txt b/distro/run/core/src/main/resources/banner.txt index a19213b5301..b0319197f57 100644 --- a/distro/run/core/src/main/resources/banner.txt +++ b/distro/run/core/src/main/resources/banner.txt @@ -1,8 +1,9 @@ - ____ _ ____ ____ __ __ ____ - / ___| __ _ _ __ ___ _ _ _ __ __| | __ _ | __ )| _ \| \/ | | _ \ _ _ _ __ -| | / _` | '_ ` _ \| | | | '_ \ / _` |/ _` | | _ \| |_) | |\/| | | |_) | | | | '_ \ -| |___| (_| | | | | | | |_| | | | | (_| | (_| | | |_) | __/| | | | | _ <| |_| | | | | - \____/\__,_|_| |_| |_ \__,_|_| |_ \__,_|\__,_| |____/|_| |_| |_| |_| \_\\__,_|_| |_| + + ____ _ ____ _ _ __ ____ +/ ___| __ _ _ __ ___ _ _ _ __ __| | __ _ | _ \| | __ _| |_ / _| ___ _ __ _ __ ___ | _ \ _ _ _ __ +| | / _` | '_ ` _ \| | | | '_ \ / _` |/ _` | | |_) | |/ _` | __| |_ / _ \| '__| '_ ` _ \ | |_) | | | | '_ \ +| |__| (_| | | | | | | |_| | | | | (_| | (_| | | __/| | (_| | |_| _| (_) | | | | | | | | | _ <| |_| | | | | +\____/\__,_|_| |_| |_|\__,_|_| |_|\__,_|\__,_| |_| |_|\__,_|\__|_| \___/|_| |_| |_| |_| |_| \_\\__,_|_| |_| Spring-Boot: ${spring-boot.formatted-version} - Camunda BPM: ${camunda.bpm.formatted-version} + Camunda Platform: ${camunda.bpm.formatted-version} diff --git a/distro/run/distro/pom.xml b/distro/run/distro/pom.xml index 34c6ec1556d..b0896d9649a 100644 --- a/distro/run/distro/pom.xml +++ b/distro/run/distro/pom.xml @@ -10,7 +10,7 @@ camunda-bpm-run - Camunda BPM - Run - Distribution + Camunda Platform - Run - Distribution pom diff --git a/distro/run/modules/pom.xml b/distro/run/modules/pom.xml index aa51a6aefe1..bc255d074f5 100644 --- a/distro/run/modules/pom.xml +++ b/distro/run/modules/pom.xml @@ -10,7 +10,7 @@ camunda-bpm-run-modules - Camunda BPM - Run - Modules + Camunda Platform - Run - Modules pom diff --git a/distro/webjar/pom.xml b/distro/webjar/pom.xml index f23e584dcf0..edd77187ee6 100644 --- a/distro/webjar/pom.xml +++ b/distro/webjar/pom.xml @@ -13,7 +13,7 @@ org.camunda.bpm.webapp camunda-webapp-webjar jar - camunda BPM - webapp - webjar + Camunda Platform - webapp - webjar true diff --git a/distro/wildfly/assembly/pom.xml b/distro/wildfly/assembly/pom.xml index b37fee8d9d4..9303d7f438e 100644 --- a/distro/wildfly/assembly/pom.xml +++ b/distro/wildfly/assembly/pom.xml @@ -10,10 +10,10 @@ camunda-wildfly-assembly pom - camunda BPM - Wildfly Assembly + Camunda Platform - Wildfly Assembly - Assembles the camunda BPM platform and makes it ready for qa. + Assembles the Camunda Platform and makes it ready for qa. The assembly is installed to maven later in the reactor, if the integration tests pass successfully diff --git a/distro/wildfly/assembly/src/README.txt b/distro/wildfly/assembly/src/README.txt index 246de519606..db401956e43 100644 --- a/distro/wildfly/assembly/src/README.txt +++ b/distro/wildfly/assembly/src/README.txt @@ -1,18 +1,18 @@ This is a distribution of - Camunda BPM platform v${project.version} + Camunda Platform v${project.version} visit http://docs.camunda.org/ -The Camunda BPM platform is a dual-license Java-based framework. -This particular copy of the Camunda BPM Platform is released either +The Camunda Platform is a dual-license Java-based framework. +This particular copy of the Camunda Platform is released either under the Apache License 2.0 (Community Platform) OR a commercial license agreement (Enterprise Platform). License information can be found in the LICENSE file. -The Camunda BPM platform includes libraries developed by third +The Camunda Platform includes libraries developed by third parties. For license and attribution notices for these libraries, please refer to the documentation that accompanies this distribution (see the LICENSE_BOOK-${project.version} file). @@ -35,7 +35,7 @@ Contents: server/ This directory contains a preconfigured distribution - of Wildfly Application Server with Camunda BPM platform readily + of Wildfly Application Server with Camunda Platform readily installed. run the @@ -54,11 +54,11 @@ Contents: The engine create script contain the engine and history tables. Execute the current upgrade script to make the database compatible - with the newest Camunda BPM platform release. + with the newest Camunda Platform release. ================== -Camunda BPM platform version: ${project.version} +Camunda Platform version: ${project.version} Wildfly Application Server version: ${version.wildfly} ================= diff --git a/distro/wildfly/assembly/src/start-camunda.bat b/distro/wildfly/assembly/src/start-camunda.bat index cdaeff6a603..b15c9061379 100644 --- a/distro/wildfly/assembly/src/start-camunda.bat +++ b/distro/wildfly/assembly/src/start-camunda.bat @@ -2,7 +2,7 @@ set "JBOSS_HOME=%CD%\server\wildfly-${version.wildfly}" -echo "starting camunda BPM platform ${project.version} on Wildfly Application Server ${version.wildfly}" +echo "starting Camunda Platform ${project.version} on Wildfly Application Server ${version.wildfly}" cd server\wildfly-${version.wildfly}\bin\ start standalone.bat diff --git a/distro/wildfly/assembly/src/start-camunda.sh b/distro/wildfly/assembly/src/start-camunda.sh index 850e8055918..f3479547c5d 100644 --- a/distro/wildfly/assembly/src/start-camunda.sh +++ b/distro/wildfly/assembly/src/start-camunda.sh @@ -10,7 +10,7 @@ else BROWSERS="xdg-open gnome-www-browser x-www-browser firefox chromium chromium-browser google-chrome" fi -echo "starting camunda BPM ${project.version} on Wildfly Application Server ${version.wildfly}"; +echo "starting Camunda Platform ${project.version} on Wildfly Application Server ${version.wildfly}"; if [ -z "$BROWSER" ]; then for executable in $BROWSERS; do diff --git a/distro/wildfly/distro/pom.xml b/distro/wildfly/distro/pom.xml index eac39617e13..e59797a67ed 100644 --- a/distro/wildfly/distro/pom.xml +++ b/distro/wildfly/distro/pom.xml @@ -10,7 +10,7 @@ camunda-bpm-wildfly pom - camunda BPM - Wildfly Distro + Camunda Platform - Wildfly Distro diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml index 722a288f297..f3ab7d6d5ab 100644 --- a/distro/wildfly/modules/pom.xml +++ b/distro/wildfly/modules/pom.xml @@ -9,7 +9,7 @@ camunda-wildfly-modules jar - camunda BPM - Wildfly Modules + Camunda Platform - Wildfly Modules 1.0.0-beta-5 diff --git a/distro/wildfly/pom.xml b/distro/wildfly/pom.xml index 213d17aa548..96285908f15 100644 --- a/distro/wildfly/pom.xml +++ b/distro/wildfly/pom.xml @@ -12,7 +12,7 @@ camunda-wildfly pom - camunda BPM - Wildfly + Camunda Platform - Wildfly @@ -45,7 +45,7 @@ ***************************************************************************************************** * * - * You must use at least JDK 1.8 to compile Camunda Bpm Wildfly!!! * + * You must use at least JDK 1.8 to compile Camunda Platform Wildfly!!! * * * ***************************************************************************************************** diff --git a/distro/wildfly/subsystem/pom.xml b/distro/wildfly/subsystem/pom.xml index 851b8b459ed..9e8f6877e13 100644 --- a/distro/wildfly/subsystem/pom.xml +++ b/distro/wildfly/subsystem/pom.xml @@ -10,7 +10,7 @@ camunda-wildfly-subsystem jar - camunda BPM - Wildfly Subsystem + Camunda Platform - Wildfly Subsystem diff --git a/distro/wildfly/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java b/distro/wildfly/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java index 1c9d1e6741a..c60b5520fe8 100644 --- a/distro/wildfly/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java +++ b/distro/wildfly/subsystem/src/main/java/org/camunda/bpm/container/impl/jboss/extension/handler/BpmPlatformSubsystemAdd.java @@ -71,7 +71,7 @@ public void execute(DeploymentProcessorTarget processorTarget) { .setInitialMode(Mode.ACTIVE) .install(); - // discover and register bpm platform plugins + // discover and register Camunda Platform plugins BpmPlatformPlugins plugins = BpmPlatformPlugins.load(getClass().getClassLoader()); MscBpmPlatformPlugins managedPlugins = new MscBpmPlatformPlugins(plugins); diff --git a/distro/wildfly/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties b/distro/wildfly/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties index 590315e1d72..7a4c11234d4 100644 --- a/distro/wildfly/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties +++ b/distro/wildfly/subsystem/src/main/resources/org/camunda/bpm/container/impl/jboss/extension/LocalDescriptions.properties @@ -1,8 +1,8 @@ -camunda-bpm-platform=Camunda BPM platform subsystem. -camunda-bpm-platform.add=Add the Camunda BPM platform subsystem. -camunda-bpm-platform.remove=Remove the Camunda BPM platform subsystem. +camunda-bpm-platform=Camunda Platform subsystem. +camunda-bpm-platform.add=Add the Camunda Platform subsystem. +camunda-bpm-platform.remove=Remove the Camunda Platform subsystem. -camunda-bpm-platform.process-engines=Process engines provided by the Camunda BPM platform subsystem. +camunda-bpm-platform.process-engines=Process engines provided by the Camunda Platform subsystem. camunda-bpm-platform.process-engine=A process engine. camunda-bpm-platform.process-engine.plugins.class=The entry class of a process engine plugin. diff --git a/engine-cdi/pom.xml b/engine-cdi/pom.xml index 6488e69f0fc..097fddf170b 100644 --- a/engine-cdi/pom.xml +++ b/engine-cdi/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - camunda BPM - engine - Cdi + Camunda Platform - engine - Cdi camunda-engine-cdi jar diff --git a/engine-plugins/connect-plugin/pom.xml b/engine-plugins/connect-plugin/pom.xml index a54a31d28ae..638acbd82d0 100644 --- a/engine-plugins/connect-plugin/pom.xml +++ b/engine-plugins/connect-plugin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 camunda-engine-plugin-connect - camunda BPM - engine plugins - connect + Camunda Platform - engine plugins - connect diff --git a/engine-plugins/identity-ldap/pom.xml b/engine-plugins/identity-ldap/pom.xml index 91b73439982..993a6b268e1 100644 --- a/engine-plugins/identity-ldap/pom.xml +++ b/engine-plugins/identity-ldap/pom.xml @@ -4,7 +4,7 @@ org.camunda.bpm.identity camunda-identity-ldap jar - camunda BPM - engine plugins - identity - ldap + Camunda Platform - engine plugins - identity - ldap org.camunda.bpm diff --git a/engine-plugins/pom.xml b/engine-plugins/pom.xml index d40c9868157..04ade239e31 100644 --- a/engine-plugins/pom.xml +++ b/engine-plugins/pom.xml @@ -11,7 +11,7 @@ camunda-engine-plugins pom - camunda BPM - engine plugins + Camunda Platform - engine plugins identity-ldap diff --git a/engine-plugins/spin-plugin/pom.xml b/engine-plugins/spin-plugin/pom.xml index 265abd4f1ed..9a78467ae9b 100644 --- a/engine-plugins/spin-plugin/pom.xml +++ b/engine-plugins/spin-plugin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 camunda-engine-plugin-spin - camunda BPM - engine plugins - spin + Camunda Platform - engine plugins - spin diff --git a/engine-rest/assembly/pom.xml b/engine-rest/assembly/pom.xml index f47681b5973..bddd17e11d8 100644 --- a/engine-rest/assembly/pom.xml +++ b/engine-rest/assembly/pom.xml @@ -1,7 +1,7 @@ 4.0.0 camunda-engine-rest - camunda BPM - engine - REST - Assembly + Camunda Platform - engine - REST - Assembly war diff --git a/engine-rest/assembly/src/main/runtime/was/webapp/WEB-INF/web.xml b/engine-rest/assembly/src/main/runtime/was/webapp/WEB-INF/web.xml index 7a230bee2d0..e577437689c 100644 --- a/engine-rest/assembly/src/main/runtime/was/webapp/WEB-INF/web.xml +++ b/engine-rest/assembly/src/main/runtime/was/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm rest api + Camunda Platform rest api diff --git a/engine-rest/assembly/src/main/runtime/was9/webapp/WEB-INF/web.xml b/engine-rest/assembly/src/main/runtime/was9/webapp/WEB-INF/web.xml index d10d9c38bed..cd48659692e 100644 --- a/engine-rest/assembly/src/main/runtime/was9/webapp/WEB-INF/web.xml +++ b/engine-rest/assembly/src/main/runtime/was9/webapp/WEB-INF/web.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - camunda bpm rest api + Camunda Platform rest api diff --git a/engine-rest/engine-rest-jaxrs2/pom.xml b/engine-rest/engine-rest-jaxrs2/pom.xml index 33bc5d8919f..55db78ab179 100644 --- a/engine-rest/engine-rest-jaxrs2/pom.xml +++ b/engine-rest/engine-rest-jaxrs2/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - camunda BPM - engine - REST JAX RS 2.0 + Camunda Platform - engine - REST JAX RS 2.0 camunda-engine-rest-jaxrs2 7.15.0-SNAPSHOT jar diff --git a/engine-rest/engine-rest-jaxrs2/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java b/engine-rest/engine-rest-jaxrs2/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java index c60afb14c3d..45bf736c7c8 100644 --- a/engine-rest/engine-rest-jaxrs2/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java +++ b/engine-rest/engine-rest-jaxrs2/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java @@ -55,7 +55,7 @@ public class CamundaRestResources { } /** - * Returns a set containing all resource classes provided by camunda BPM. + * Returns a set containing all resource classes provided by Camunda Platform. * @return a set of resource classes. */ public static Set> getResourceClasses() { diff --git a/engine-rest/engine-rest-openapi-generator/pom.xml b/engine-rest/engine-rest-openapi-generator/pom.xml index 7114f901c69..1c617438401 100644 --- a/engine-rest/engine-rest-openapi-generator/pom.xml +++ b/engine-rest/engine-rest-openapi-generator/pom.xml @@ -1,7 +1,7 @@ 4.0.0 camunda-engine-rest-openapi-generator - camunda BPM - engine - REST - OpenAPI (JSON Generator) + Camunda Platform - engine - REST - OpenAPI (JSON Generator) jar diff --git a/engine-rest/engine-rest-openapi-generator/src/main/java/org/camunda/bpm/engine/rest/openapi/generator/impl/TemplateParser.java b/engine-rest/engine-rest-openapi-generator/src/main/java/org/camunda/bpm/engine/rest/openapi/generator/impl/TemplateParser.java index c4f32246b70..c7bf56e9843 100644 --- a/engine-rest/engine-rest-openapi-generator/src/main/java/org/camunda/bpm/engine/rest/openapi/generator/impl/TemplateParser.java +++ b/engine-rest/engine-rest-openapi-generator/src/main/java/org/camunda/bpm/engine/rest/openapi/generator/impl/TemplateParser.java @@ -125,7 +125,7 @@ protected static String createOutputFile(String debugFile) throws IOException { } /** - * Resolve the Camunda BPM version and the respective documentation version used in the links. + * Resolve the Camunda Platform version and the respective documentation version used in the links. */ protected static void resolveVersions(Map templateData) { String version = TemplateParser.class.getPackage().getImplementationVersion(); diff --git a/engine-rest/engine-rest-openapi/pom.xml b/engine-rest/engine-rest-openapi/pom.xml index 35634ab071b..87edab1f394 100644 --- a/engine-rest/engine-rest-openapi/pom.xml +++ b/engine-rest/engine-rest-openapi/pom.xml @@ -1,7 +1,7 @@ 4.0.0 camunda-engine-rest-openapi - camunda BPM - engine - REST - OpenAPI + Camunda Platform - engine - REST - OpenAPI jar diff --git a/engine-rest/engine-rest-openapi/src/main/templates/main.ftl b/engine-rest/engine-rest-openapi/src/main/templates/main.ftl index c29a1bd9620..8eee42421b7 100644 --- a/engine-rest/engine-rest-openapi/src/main/templates/main.ftl +++ b/engine-rest/engine-rest-openapi/src/main/templates/main.ftl @@ -4,8 +4,8 @@ { "openapi": "3.0.2", "info": { - "title": "Camunda BPM REST API", - "description": "OpenApi Spec for Camunda BPM REST API.", + "title": "Camunda Platform REST API", + "description": "OpenApi Spec for Camunda Platform REST API.", "version": "${cambpmVersion}", "license": { "name": "Apache License 2.0", diff --git a/engine-rest/engine-rest/README.md b/engine-rest/engine-rest/README.md index b1d2fbe3458..cbf99077201 100644 --- a/engine-rest/engine-rest/README.md +++ b/engine-rest/engine-rest/README.md @@ -1,7 +1,7 @@ REST API ======== -A JAX-RS-based REST API for Camunda BPM. +A JAX-RS-based REST API for Camunda Platform. Running Tests ------------- diff --git a/engine-rest/engine-rest/pom.xml b/engine-rest/engine-rest/pom.xml index 498654183e0..867eb3983af 100644 --- a/engine-rest/engine-rest/pom.xml +++ b/engine-rest/engine-rest/pom.xml @@ -1,7 +1,7 @@ 4.0.0 camunda-engine-rest-core - camunda BPM - engine - REST + Camunda Platform - engine - REST jar diff --git a/engine-rest/engine-rest/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java b/engine-rest/engine-rest/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java index d7c491a691b..bc08b629225 100644 --- a/engine-rest/engine-rest/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java +++ b/engine-rest/engine-rest/src/main/java/org/camunda/bpm/engine/rest/impl/CamundaRestResources.java @@ -31,7 +31,7 @@ import java.util.Set; /** - *

Class providing static methods returning all the resource classes provided by camunda BPM.

+ *

Class providing static methods returning all the resource classes provided by Camunda Platform.

* * @author Daniel Meyer * @@ -58,7 +58,7 @@ public class CamundaRestResources { } /** - * Returns a set containing all resource classes provided by camunda BPM. + * Returns a set containing all resource classes provided by Camunda Platform. * @return a set of resource classes. */ public static Set> getResourceClasses() { diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 9f11c0da16d..4f63f981358 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -11,7 +11,7 @@ camunda-engine-rest-root pom - camunda BPM - engine - REST - Root + Camunda Platform - engine - REST - Root 2.12.1 diff --git a/engine-spring/compatibility-test-spring4/pom.xml b/engine-spring/compatibility-test-spring4/pom.xml index d4cc8ae9979..a2a994044ff 100644 --- a/engine-spring/compatibility-test-spring4/pom.xml +++ b/engine-spring/compatibility-test-spring4/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - camunda BPM - engine - Compatbility Test Spring 4 + Camunda Platform - engine - Compatbility Test Spring 4 camunda-engine-spring-compatibility-test-spring4 diff --git a/engine-spring/core/pom.xml b/engine-spring/core/pom.xml index c5be8fd60fc..48e27fc3465 100644 --- a/engine-spring/core/pom.xml +++ b/engine-spring/core/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - camunda BPM - engine - Spring + Camunda Platform - engine - Spring camunda-engine-spring diff --git a/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/annotations/ProcessEngineComponent.java b/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/annotations/ProcessEngineComponent.java index c28f6ad38b3..d6815bdb5d4 100644 --- a/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/annotations/ProcessEngineComponent.java +++ b/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/annotations/ProcessEngineComponent.java @@ -19,23 +19,23 @@ import java.lang.annotation.*; /** - * Indicates that the given bean is an Activiti handler. An activiti handler is a bean - * that is so annotated to respond to events ("states") in an Activiti BPM process. - * Generically, it is a class that has been adapted to be usable in an Activiti process + * Indicates that the given bean is an process engine handler. A process engine handler is a bean + * that is so annotated to respond to events ("states") in a Camunda Platform process. + * Generically, it is a class that has been adapted to be usable in a Camunda Platform process. * *

* For example, suppose we have registered a BPMN process that has * the following declaration: *

* - * <service-task activiti:expression = "myBean" id = "confirm-receipt" /> + * <service-task camunda:expression = "myBean" id = "confirm-receipt" /> * *

- * This is a state that will be entered from Activiti and execution will flow through to the bean + * This is a state that will be entered from Camunda Platform and execution will flow through to the bean * registered in the context as "myBean." To subscribe to that, a POJO need only implement * (optionally) {@link ProcessEngineComponent} and, on a method, add * {@link State} to indicate that the method in particular is - * tasked with responding to a state. If applied to a bean and there are no {@link org.camunda.bpm.engine.ProcessEngineComponent.ActivitiComponent} + * tasked with responding to a state. If applied to a bean and there are no {@link org.camunda.bpm.engine.annotations.ProcessEngineComponent} * annotations present, then one option might be to automatically enlist all public methods * as handlers for states whose IDs or names are inferred from the method name: *

diff --git a/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/application/SpringProcessApplication.java b/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/application/SpringProcessApplication.java index dfa26ee2936..764d688bfed 100644 --- a/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/application/SpringProcessApplication.java +++ b/engine-spring/core/src/main/java/org/camunda/bpm/engine/spring/application/SpringProcessApplication.java @@ -44,7 +44,7 @@ *

The SpringProcessApplication will use the Bean Name assigned to the bean in the spring * application context (see {@link BeanNameAware}). You should always assign a unique bean name * to a process application bean. That is, the bean name must be unique accross all applications - * deployed to the camunda BPM platform.

+ * deployed to the Camunda Platform.

* * @author Daniel Meyer * diff --git a/engine-spring/pom.xml b/engine-spring/pom.xml index 6a58f345013..9544a0091ec 100644 --- a/engine-spring/pom.xml +++ b/engine-spring/pom.xml @@ -11,7 +11,7 @@ camunda-spring-compatibility-root pom - camunda BPM - engine - Spring - Root + Camunda Platform - engine - Spring - Root
diff --git a/internal-dependencies/pom.xml b/internal-dependencies/pom.xml index 8b184d31cf1..04124492277 100644 --- a/internal-dependencies/pom.xml +++ b/internal-dependencies/pom.xml @@ -11,9 +11,9 @@ camunda-core-internal-dependencies pom - camunda BPM - Core - Internal Dependencies + Camunda Platform - Core - Internal Dependencies - camunda BPM core internal bill of material for dependencies + Camunda Platform core internal bill of material for dependencies diff --git a/javaee/ejb-client/pom.xml b/javaee/ejb-client/pom.xml index fe7e185ee11..eb6a510e69f 100644 --- a/javaee/ejb-client/pom.xml +++ b/javaee/ejb-client/pom.xml @@ -3,7 +3,7 @@ camunda-ejb-client org.camunda.bpm.javaee - camunda BPM - Client + Camunda Platform - Client jar diff --git a/javaee/ejb-service/pom.xml b/javaee/ejb-service/pom.xml index 7504393fb41..aaa345b77ff 100644 --- a/javaee/ejb-service/pom.xml +++ b/javaee/ejb-service/pom.xml @@ -5,7 +5,7 @@ camunda-ejb-service ejb - camunda BPM - EJB Service + Camunda Platform - EJB Service org.camunda.bpm diff --git a/javaee/ejb-service/src/main/java/org/camunda/bpm/container/impl/ejb/EjbBpmPlatformBootstrap.java b/javaee/ejb-service/src/main/java/org/camunda/bpm/container/impl/ejb/EjbBpmPlatformBootstrap.java index 76edea13ce9..afae2b010cf 100644 --- a/javaee/ejb-service/src/main/java/org/camunda/bpm/container/impl/ejb/EjbBpmPlatformBootstrap.java +++ b/javaee/ejb-service/src/main/java/org/camunda/bpm/container/impl/ejb/EjbBpmPlatformBootstrap.java @@ -44,7 +44,7 @@ /** - *

Bootstrap for the camunda BPM platform using a singleton EJB

+ *

Bootstrap for the Camunda Platform using a singleton EJB

* * @author Daniel Meyer */ @@ -66,7 +66,7 @@ protected void start() { final RuntimeContainerDelegateImpl containerDelegate = getContainerDelegate(); - containerDelegate.getServiceContainer().createDeploymentOperation("deploying camunda BPM platform") + containerDelegate.getServiceContainer().createDeploymentOperation("deploying Camunda Platform") .addStep(new EjbJarParsePlatformXmlStep()) .addStep(new DiscoverBpmPlatformPluginsStep()) .addStep(new StartJcaExecutorServiceStep(executorServiceBean)) @@ -77,7 +77,7 @@ protected void start() { processEngineService = containerDelegate.getProcessEngineService(); processApplicationService = containerDelegate.getProcessApplicationService(); - LOGGER.log(Level.INFO, "camunda BPM platform started successfully."); + LOGGER.log(Level.INFO, "Camunda Platform started successfully."); } @PreDestroy @@ -85,7 +85,7 @@ protected void stop() { final RuntimeContainerDelegateImpl containerDelegate = getContainerDelegate(); - containerDelegate.getServiceContainer().createUndeploymentOperation("undeploying camunda BPM platform") + containerDelegate.getServiceContainer().createUndeploymentOperation("undeploying Camunda Platform") .addStep(new StopProcessApplicationsStep()) .addStep(new StopProcessEnginesStep()) .addStep(new StopJobExecutorStep()) @@ -93,7 +93,7 @@ protected void stop() { .addStep(new UnregisterBpmPlatformPluginsStep()) .execute(); - LOGGER.log(Level.INFO, "camunda BPM platform stopped."); + LOGGER.log(Level.INFO, "Camunda Platform stopped."); } diff --git a/javaee/jobexecutor-ra/pom.xml b/javaee/jobexecutor-ra/pom.xml index 2648fbddb8b..d9ec2ded0ff 100755 --- a/javaee/jobexecutor-ra/pom.xml +++ b/javaee/jobexecutor-ra/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-jobexecutor-ra jar - camunda BPM - Job Executor RA + Camunda Platform - Job Executor RA org.camunda.bpm diff --git a/javaee/jobexecutor-ra/src/main/java/org/camunda/bpm/container/impl/threading/ra/JcaExecutorServiceConnector.java b/javaee/jobexecutor-ra/src/main/java/org/camunda/bpm/container/impl/threading/ra/JcaExecutorServiceConnector.java index f2e1f50d793..cb9c9aa65d5 100644 --- a/javaee/jobexecutor-ra/src/main/java/org/camunda/bpm/container/impl/threading/ra/JcaExecutorServiceConnector.java +++ b/javaee/jobexecutor-ra/src/main/java/org/camunda/bpm/container/impl/threading/ra/JcaExecutorServiceConnector.java @@ -128,7 +128,7 @@ public void start(BootstrapContext ctx) throws ResourceAdapterInternalException executorServiceWrapper.setExecutorService(new JcaWorkManagerExecutorService(this, ctx.getWorkManager())); } - log.log(Level.INFO, "camunda BPM executor service started."); + log.log(Level.INFO, "Camunda Platform executor service started."); } public void stop() { @@ -138,7 +138,7 @@ public void stop() { return; } - log.log(Level.INFO, "camunda BPM executor service stopped."); + log.log(Level.INFO, "Camunda Platform executor service stopped."); } @@ -146,7 +146,7 @@ public void stop() { public void endpointActivation(MessageEndpointFactory endpointFactory, ActivationSpec spec) throws ResourceException { if(jobHandlerActivation != null) { - throw new ResourceException("The camunda BPM job executor can only service a single MessageEndpoint for job execution. " + + throw new ResourceException("The Camunda Platform job executor can only service a single MessageEndpoint for job execution. " + "Make sure not to deploy more than one MDB implementing the '"+JobExecutionHandler.class.getName()+"' interface."); } JobExecutionHandlerActivation activation = new JobExecutionHandlerActivation(this, endpointFactory, (JobExecutionHandlerActivationSpec) spec); diff --git a/javaee/jobexecutor-rar/pom.xml b/javaee/jobexecutor-rar/pom.xml index df8bc622c9c..26d3698c015 100755 --- a/javaee/jobexecutor-rar/pom.xml +++ b/javaee/jobexecutor-rar/pom.xml @@ -3,7 +3,7 @@ org.camunda.bpm.javaee camunda-jobexecutor-rar rar - camunda BPM - Job Executor RAR + Camunda Platform - Job Executor RAR org.camunda.bpm diff --git a/javaee/jobexecutor-rar/src/main/rar/META-INF/ra.xml b/javaee/jobexecutor-rar/src/main/rar/META-INF/ra.xml index 141e7ee2373..893c776c0fa 100755 --- a/javaee/jobexecutor-rar/src/main/rar/META-INF/ra.xml +++ b/javaee/jobexecutor-rar/src/main/rar/META-INF/ra.xml @@ -7,7 +7,7 @@ version="1.6" metadata-complete="false"> camunda-jobexecutor-rar - camunda BPM platform jobexecutor resource adapter + Camunda Platform jobexecutor resource adapter camunda services GmbH diff --git a/model-api/bpmn-model/README.asciidoc b/model-api/bpmn-model/README.asciidoc index c22befb8616..38c96fe66ff 100644 --- a/model-api/bpmn-model/README.asciidoc +++ b/model-api/bpmn-model/README.asciidoc @@ -4,7 +4,7 @@ The camunda BPMN model API is a simple, lightweight Java library for parsing, cr [NOTE] ==== -camunda BPMN model can be used standalone, independenly of camunda BPM platform / process engine. +camunda BPMN model can be used standalone, independenly of Camunda Platform / process engine. ==== * Web Site: https://camunda.com/ @@ -19,7 +19,7 @@ camunda BPMN model can be used standalone, independenly of camunda BPM platform To easily create simple BPMN 2.0 processes we provide the fluent builder API. It supports most BPMN 2.0 elements and allows you to set attributes and add some child elements. The following process is deployable -and can be executed by the camunda BPM platform. +and can be executed by the Camunda Platform. [source,java] ---- diff --git a/model-api/bpmn-model/pom.xml b/model-api/bpmn-model/pom.xml index 4c072e9040e..1902ec10873 100644 --- a/model-api/bpmn-model/pom.xml +++ b/model-api/bpmn-model/pom.xml @@ -11,7 +11,7 @@ camunda-bpmn-model jar - camunda BPM - BPMN Model API + Camunda Platform - BPMN Model API 2014 org.camunda.bpm.model.bpmn diff --git a/model-api/cmmn-model/pom.xml b/model-api/cmmn-model/pom.xml index 13f6d1ed7d2..9b50b9a711e 100644 --- a/model-api/cmmn-model/pom.xml +++ b/model-api/cmmn-model/pom.xml @@ -11,7 +11,7 @@ camunda-cmmn-model jar - camunda BPM - CMMN Model API + Camunda Platform - CMMN Model API 2014 org.camunda.bpm.model.cmmn diff --git a/model-api/dmn-model/pom.xml b/model-api/dmn-model/pom.xml index f451cd5be35..af731e4faee 100644 --- a/model-api/dmn-model/pom.xml +++ b/model-api/dmn-model/pom.xml @@ -11,7 +11,7 @@ camunda-dmn-model jar - camunda BPM - DMN Model API + Camunda Platform - DMN Model API 2015 org.camunda.bpm.model.dmn diff --git a/model-api/xml-model/pom.xml b/model-api/xml-model/pom.xml index be976fd9e2a..55be23f143f 100644 --- a/model-api/xml-model/pom.xml +++ b/model-api/xml-model/pom.xml @@ -11,7 +11,7 @@ camunda-xml-model jar - camunda BPM - Xml Model API + Camunda Platform - Xml Model API 2014 org.camunda.bpm.model.xml diff --git a/parent/pom.xml b/parent/pom.xml index 4150ad76a60..b15e1389b51 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -9,12 +9,12 @@ camunda-parent - camunda BPM - Parent Pom + Camunda Platform - Parent Pom 2013 pom - This pom is the parent of all camunda BPM platform projects + This pom is the parent of all Camunda Platform projects diff --git a/pom.xml b/pom.xml index e83e76b46fd..00c0774755f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,12 +13,12 @@ camunda-root 7.15.0-SNAPSHOT pom - camunda BPM - Root Pom + Camunda Platform - Root Pom 2013 This pom defines the modules that make up the build. - The parent pom for all camunda BPM projects can be found in the parent directory relative to this file. + The parent pom for all Camunda Platform projects can be found in the parent directory relative to this file. @@ -296,7 +296,7 @@ camunda.org - camunda BPM Community + Camunda Platform Community camunda.org http://camunda.org diff --git a/qa/README.md b/qa/README.md index 1793d4c0c64..335048a8187 100644 --- a/qa/README.md +++ b/qa/README.md @@ -2,7 +2,7 @@ Running Integration Tests ---------- The integration testsuites are located under `qa/`. There you'll find a folder named XX-runtime for each server runtime we support. These projects are responsible for taking a runtime container distribution (ie. Apache Tomcat, Wildfly) and configuring it for integration testing. The actual integration tests are located in the `qa/integration-tests-engine` and `qa/integration-tests-webapps` modules. * *integration-tests-engine*: This module contains an extensive testsuite that test the integration of the process engine within a particular runtime container. For example, such tests will ensure that if you use the Job Executor Service inside a Java EE Container, you get a proper CDI request context spanning multiple EJB invocations or that EE resource injection works as expected. These integration tests are executed in-container, using [JBoss Arquillian](http://arquillian.org/). - * *integration-tests-webapps*: This module tests the camunda BPM webapplications inside the runtime containers. These integration tests run inside a client / server setting: the webapplication is deployed to the runtime container, the runtime container is started and the tests running inside a client VM perform requests against the deployed applications. + * *integration-tests-webapps*: This module tests the Camunda Platform webapplications inside the runtime containers. These integration tests run inside a client / server setting: the webapplication is deployed to the runtime container, the runtime container is started and the tests running inside a client VM perform requests against the deployed applications. In order to run the integration tests, first perform a full install build. Then navigate to the `qa` folder. diff --git a/qa/ensure-clean-db-plugin/pom.xml b/qa/ensure-clean-db-plugin/pom.xml index 1940ebe04cc..c41fcbfbfe5 100644 --- a/qa/ensure-clean-db-plugin/pom.xml +++ b/qa/ensure-clean-db-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-ensure-clean-db jar - camunda BPM - QA - ensure clean db plugin + Camunda Platform - QA - ensure clean db plugin camunda-qa diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml index 7eaf072e27f..aee996ea8f4 100644 --- a/qa/integration-tests-engine/pom.xml +++ b/qa/integration-tests-engine/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-integration-tests-engine - camunda BPM - QA Integration Tests - Engine + Camunda Platform - QA Integration Tests - Engine org.camunda.bpm.qa diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_onePaAsLib.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_onePaAsLib.java index fb2f9ba74df..529e79904da 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_onePaAsLib.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_onePaAsLib.java @@ -35,54 +35,54 @@ /** - * This test verifies that a process archive packaging the camunda BPM platform client + * This test verifies that a process archive packaging the Camunda Platform client * can be packaged inside an EAR application. - * + * * @author Daniel Meyer - * + * */ @RunWith(Arquillian.class) public class TestFoxPlatformClientAsEjbModule_onePaAsLib extends AbstractFoxPlatformIntegrationTest { /** * Deployment layout - * - * test-application.ear + * + * test-application.ear * |-- lib / * |-- processes.jar * |-- META-INF/processes.xml * |-- org/camunda/bpm/integrationtest/testDeployProcessArchive.bpmn20.xml - * - * |-- fox-platform-client.jar <<===============================|| + * + * |-- fox-platform-client.jar <<===============================|| * || Class-Path reference * |-- test.war (contains the test-class but also processes) || * |-- META-INF/MANIFEST.MF =================================|| * |-- WEB-INF/beans.xml * |-- + test classes - * - */ + * + */ @Deployment - public static EnterpriseArchive onePaAsLib() { - + public static EnterpriseArchive onePaAsLib() { + JavaArchive processArchiveJar = ShrinkWrap.create(JavaArchive.class, "processes.jar") .addAsResource("org/camunda/bpm/integrationtest/testDeployProcessArchive.bpmn20.xml") .addAsResource("META-INF/processes.xml", "META-INF/processes.xml"); - + JavaArchive foxPlatformClientJar = DeploymentHelper.getEjbClient(); - + WebArchive testJar = ShrinkWrap.create(WebArchive.class, "test.war") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .setManifest(new ByteArrayAsset(("Class-Path: " + foxPlatformClientJar.getName()+"\n").getBytes())) .addClass(AbstractFoxPlatformIntegrationTest.class) .addClass(TestFoxPlatformClientAsEjbModule_onePaAsLib.class); - return ShrinkWrap.create(EnterpriseArchive.class, "onePaAsLib.ear") + return ShrinkWrap.create(EnterpriseArchive.class, "onePaAsLib.ear") .addAsLibrary(processArchiveJar) .addAsModule(foxPlatformClientJar) .addAsModule(testJar) .addAsLibrary(DeploymentHelper.getEngineCdi()); } - + @Test public void testOnePaAsLib() { ProcessEngine processEngine = ProgrammaticBeanLookup.lookup(ProcessEngine.class); @@ -91,8 +91,8 @@ public void testOnePaAsLib() { long count = repositoryService.createProcessDefinitionQuery() .processDefinitionKey("testDeployProcessArchive") .count(); - + Assert.assertEquals(1, count); } - + } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_pasAsEjbModule.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_pasAsEjbModule.java index f2902265db8..3aa3ee8e203 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_pasAsEjbModule.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_pasAsEjbModule.java @@ -35,55 +35,55 @@ /** - * This test verifies that a process archive packaging the camunda BPM platform client + * This test verifies that a process archive packaging the Camunda Platform client * can be packaged inside an EAR application. - * + * * @author Daniel Meyer - * + * */ @RunWith(Arquillian.class) public class TestFoxPlatformClientAsEjbModule_pasAsEjbModule extends AbstractFoxPlatformIntegrationTest { - + /** * This only works if EAR classloader isolation is turned OFF (which is the default in AS7) - * - * test-application.ear - * |-- pa.jar - * |-- META-INF/processes.xml + * + * test-application.ear + * |-- pa.jar + * |-- META-INF/processes.xml * |-- org/camunda/bpm/integrationtest/deployment/ear/paAsEjbModule-process.bpmn20.xml - * - * |-- fox-platform-client.jar - * |-- META-INF/MANIFEST.MF - * - * |-- test.war - * |-- META-INF/MANIFEST.MF + * + * |-- fox-platform-client.jar + * |-- META-INF/MANIFEST.MF + * + * |-- test.war + * |-- META-INF/MANIFEST.MF * |-- WEB-INF/beans.xml * |-- + test classes - * - */ + * + */ @Deployment - public static EnterpriseArchive paAsEjbModule() throws Exception { - + public static EnterpriseArchive paAsEjbModule() throws Exception { + JavaArchive processArchive1Jar = ShrinkWrap.create(JavaArchive.class, "pa.jar") .addClass(EeComponent.class) // need to add at least one EE component, otherwise the jar is not detected as an EJB module by Jboss AS .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/paAsEjbModule-process.bpmn20.xml") .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/paAsEjbModule-pa.xml", "META-INF/processes.xml"); - - JavaArchive foxPlatformClientJar = DeploymentHelper.getEjbClient(); - + + JavaArchive foxPlatformClientJar = DeploymentHelper.getEjbClient(); + WebArchive testJar = ShrinkWrap.create(WebArchive.class, "paAsEjbModule-test.war") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addClass(AbstractFoxPlatformIntegrationTest.class) .addClass(TestFoxPlatformClientAsEjbModule_pasAsEjbModule.class); - return ShrinkWrap.create(EnterpriseArchive.class, "paAsEjbModule.ear") + return ShrinkWrap.create(EnterpriseArchive.class, "paAsEjbModule.ear") .addAsModule(processArchive1Jar) .addAsModule(foxPlatformClientJar) .addAsModule(testJar) .addAsLibrary(DeploymentHelper.getEngineCdi()); } - + @Test public void testPaAsEjbModule() { ProcessEngine processEngine = ProgrammaticBeanLookup.lookup(ProcessEngine.class); @@ -91,8 +91,8 @@ public void testPaAsEjbModule() { RepositoryService repositoryService = processEngine.getRepositoryService(); long count = repositoryService.createProcessDefinitionQuery() .processDefinitionKey("paAsEjbModule-process") - .count(); - Assert.assertEquals(1, count); + .count(); + Assert.assertEquals(1, count); } } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_twoPasAsLib.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_twoPasAsLib.java index 6ea9bae0e31..7a989a13c37 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_twoPasAsLib.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsEjbModule_twoPasAsLib.java @@ -35,20 +35,20 @@ /** - * This test verifies that a process archive packaging the camunda BPM platform client + * This test verifies that a process archive packaging the Camunda Platform client * can be packaged inside an EAR application. - * + * * @author Daniel Meyer - * + * */ @RunWith(Arquillian.class) public class TestFoxPlatformClientAsEjbModule_twoPasAsLib extends AbstractFoxPlatformIntegrationTest { - + /** * Deployment layout - * - * test-application.ear + * + * test-application.ear * |-- lib / * |-- processes1.jar * |-- META-INF/processes.xml @@ -56,42 +56,42 @@ public class TestFoxPlatformClientAsEjbModule_twoPasAsLib extends AbstractFoxPla * |-- processes2.jar * |-- META-INF/processes.xml * |-- org/camunda/bpm/integrationtest/deployment/ear/process2.bpmn20.xml - * - * |-- fox-platform-client.jar <<===============================|| + * + * |-- fox-platform-client.jar <<===============================|| * || Class-Path reference * |-- test.war (contains the test-class but also processes) || * |-- META-INF/MANIFEST.MF =================================|| * |-- WEB-INF/beans.xml * |-- + test classes - * - */ + * + */ @Deployment - public static EnterpriseArchive twoPasAsLib() { - + public static EnterpriseArchive twoPasAsLib() { + JavaArchive processArchive1Jar = ShrinkWrap.create(JavaArchive.class, "processes1.jar") .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/process1.bpmn20.xml") .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/pa1.xml", "META-INF/processes.xml"); - + JavaArchive processArchive2Jar = ShrinkWrap.create(JavaArchive.class, "processes.jar") .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/process2.bpmn20.xml") .addAsResource("org/camunda/bpm/integrationtest/deployment/ear/pa2.xml", "META-INF/processes.xml"); - + JavaArchive foxPlatformClientJar = DeploymentHelper.getEjbClient(); - + WebArchive testJar = ShrinkWrap.create(WebArchive.class, "client-test.war") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .setManifest(new ByteArrayAsset(("Class-Path: " + foxPlatformClientJar.getName()+"\n").getBytes())) .addClass(AbstractFoxPlatformIntegrationTest.class) .addClass(TestFoxPlatformClientAsEjbModule_twoPasAsLib.class); - return ShrinkWrap.create(EnterpriseArchive.class, "twoPasAsLib.ear") + return ShrinkWrap.create(EnterpriseArchive.class, "twoPasAsLib.ear") .addAsLibrary(processArchive1Jar) .addAsLibrary(processArchive2Jar) .addAsModule(foxPlatformClientJar) .addAsModule(testJar) .addAsLibrary(DeploymentHelper.getEngineCdi()); } - + @Test public void testTwoPasAsLib() { ProcessEngine processEngine = ProgrammaticBeanLookup.lookup(ProcessEngine.class); @@ -99,13 +99,13 @@ public void testTwoPasAsLib() { RepositoryService repositoryService = processEngine.getRepositoryService(); long count = repositoryService.createProcessDefinitionQuery() .processDefinitionKey("process1") - .count(); + .count(); Assert.assertEquals(1, count); - + count = repositoryService.createProcessDefinitionQuery() .processDefinitionKey("process2") - .count(); + .count(); Assert.assertEquals(1, count); } - + } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsLibInWebModule.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsLibInWebModule.java index 96c2681b340..7902832551b 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsLibInWebModule.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/ear/TestFoxPlatformClientAsLibInWebModule.java @@ -31,19 +31,19 @@ /** - * This test verifies that a process archive packaging the camunda BPM platform client + * This test verifies that a process archive packaging the Camunda Platform client * can be packaged inside an EAR application. - * - * + * + * * @author Daniel Meyer - * + * */ @RunWith(Arquillian.class) public class TestFoxPlatformClientAsLibInWebModule extends AbstractFoxPlatformIntegrationTest { - + /** * Deployment layout - * + * * test-application.ear * |-- test.war * |-- lib / @@ -51,11 +51,11 @@ public class TestFoxPlatformClientAsLibInWebModule extends AbstractFoxPlatformIn * |-- WEB-INF/classes * |-- META-INF/processes.xml * |-- org/camunda/bpm/integrationtest/testDeployProcessArchive.bpmn20.xml - * - */ + * + */ @Deployment - public static EnterpriseArchive deployment() { - + public static EnterpriseArchive deployment() { + // this creates the process archive as a WAR file WebArchive processArchive = initWebArchiveDeployment() .addAsResource("org/camunda/bpm/integrationtest/testDeployProcessArchive.bpmn20.xml") @@ -64,9 +64,9 @@ public static EnterpriseArchive deployment() { // this packages the WAR file inside an EAR file return ShrinkWrap.create(EnterpriseArchive.class, "test-application.ear") .addAsModule(processArchive); - + } - + @Test public void testDeployProcessArchive() { ProcessEngine processEngine = ProgrammaticBeanLookup.lookup(ProcessEngine.class); @@ -75,7 +75,7 @@ public void testDeployProcessArchive() { long count = repositoryService.createProcessDefinitionQuery() .processDefinitionKey("testDeployProcessArchive") .count(); - + Assert.assertEquals(1, count); } diff --git a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java index 01d60048d33..645b8269668 100644 --- a/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java +++ b/qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/jobexecutor/FailingJobBoundaryTimerWithDelegateVariablesTest.java @@ -37,7 +37,7 @@ /** - * Test camunda BPM platform container job exectuor. + * Test Camunda Platform container job exectuor. * FAILING ATM! * Expected a job with an exception but it isn't left in db with 0 retries, instead it is completely removed from the job table! * diff --git a/qa/integration-tests-webapps/integration-tests/pom.xml b/qa/integration-tests-webapps/integration-tests/pom.xml index 49b44f273bb..7db612806d8 100644 --- a/qa/integration-tests-webapps/integration-tests/pom.xml +++ b/qa/integration-tests-webapps/integration-tests/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-integration-tests-webapps - camunda BPM - QA Integration Tests - Webapps ITs + Camunda Platform - QA Integration Tests - Webapps ITs org.camunda.bpm.qa diff --git a/qa/integration-tests-webapps/pom.xml b/qa/integration-tests-webapps/pom.xml index 0a1aabca182..72dd3accd62 100644 --- a/qa/integration-tests-webapps/pom.xml +++ b/qa/integration-tests-webapps/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-integration-tests-webapps-root - camunda BPM - QA Integration Tests - Webapps Root + Camunda Platform - QA Integration Tests - Webapps Root pom diff --git a/qa/integration-tests-webapps/shared-engine/pom.xml b/qa/integration-tests-webapps/shared-engine/pom.xml index 04f5d8259dc..588f3f4caae 100644 --- a/qa/integration-tests-webapps/shared-engine/pom.xml +++ b/qa/integration-tests-webapps/shared-engine/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-integration-tests-webapps-shared-engine - camunda BPM - QA Integration Tests - Webapps Shared Engine + Camunda Platform - QA Integration Tests - Webapps Shared Engine org.camunda.bpm.qa diff --git a/qa/integration-tests-webapps/standalone-engine/pom.xml b/qa/integration-tests-webapps/standalone-engine/pom.xml index 9c12a1a29bb..34c034601d1 100644 --- a/qa/integration-tests-webapps/standalone-engine/pom.xml +++ b/qa/integration-tests-webapps/standalone-engine/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-integration-tests-webapps-standalone-engine - camunda BPM - QA Integration Tests - Webapps Standalone Engine + Camunda Platform - QA Integration Tests - Webapps Standalone Engine org.camunda.bpm.qa diff --git a/qa/performance-tests-engine/pom.xml b/qa/performance-tests-engine/pom.xml index 8adbad938e9..b8f2e160cf6 100644 --- a/qa/performance-tests-engine/pom.xml +++ b/qa/performance-tests-engine/pom.xml @@ -2,7 +2,7 @@ 4.0.0 camunda-qa-performance-tests-engine jar - camunda BPM - QA Performance Tests Engine + Camunda Platform - QA Performance Tests Engine org.camunda.bpm.qa diff --git a/qa/pom.xml b/qa/pom.xml index 177d35eb6ad..b8afaa5b3b8 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -5,7 +5,7 @@ org.camunda.bpm.qa pom - camunda BPM - QA + Camunda Platform - QA org.camunda.bpm diff --git a/qa/test-db-instance-migration/pom.xml b/qa/test-db-instance-migration/pom.xml index ab36f4180a4..5792091e00a 100644 --- a/qa/test-db-instance-migration/pom.xml +++ b/qa/test-db-instance-migration/pom.xml @@ -5,7 +5,7 @@ camunda-qa-db-instance-migration pom - camunda BPM - QA - upgrade - instance migration + Camunda Platform - QA - upgrade - instance migration org.camunda.bpm.qa diff --git a/qa/test-db-instance-migration/test-fixture-710/pom.xml b/qa/test-db-instance-migration/test-fixture-710/pom.xml index e2bba28a33f..112ea86c55c 100644 --- a/qa/test-db-instance-migration/test-fixture-710/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-710/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-710 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.10.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.10.0 7.9.0 diff --git a/qa/test-db-instance-migration/test-fixture-711/pom.xml b/qa/test-db-instance-migration/test-fixture-711/pom.xml index 47dd31cbbc7..c283f034624 100644 --- a/qa/test-db-instance-migration/test-fixture-711/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-711/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-711 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.11.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.11.0 7.10.0 diff --git a/qa/test-db-instance-migration/test-fixture-712/pom.xml b/qa/test-db-instance-migration/test-fixture-712/pom.xml index cb3123f45f6..bad1449f398 100644 --- a/qa/test-db-instance-migration/test-fixture-712/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-712/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-712 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.12.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.12.0 7.11.0 diff --git a/qa/test-db-instance-migration/test-fixture-713/pom.xml b/qa/test-db-instance-migration/test-fixture-713/pom.xml index aba331672db..9449a6ee32f 100644 --- a/qa/test-db-instance-migration/test-fixture-713/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-713/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-713 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.13.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.13.0 7.12.0 diff --git a/qa/test-db-instance-migration/test-fixture-714/pom.xml b/qa/test-db-instance-migration/test-fixture-714/pom.xml index dbd26e72255..14ad54a8506 100644 --- a/qa/test-db-instance-migration/test-fixture-714/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-714/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-714 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.14.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.14.0 7.13.0 diff --git a/qa/test-db-instance-migration/test-fixture-715/pom.xml b/qa/test-db-instance-migration/test-fixture-715/pom.xml index 29cf2009b48..9d8b560a458 100644 --- a/qa/test-db-instance-migration/test-fixture-715/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-715/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-715 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.15.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.15.0 diff --git a/qa/test-db-instance-migration/test-fixture-72/pom.xml b/qa/test-db-instance-migration/test-fixture-72/pom.xml index 42ca1e2e31f..e4f01ca97e3 100644 --- a/qa/test-db-instance-migration/test-fixture-72/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-72/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-72 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.2.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.2.0 diff --git a/qa/test-db-instance-migration/test-fixture-73/pom.xml b/qa/test-db-instance-migration/test-fixture-73/pom.xml index 86ed8a597d3..3b873b1cc64 100644 --- a/qa/test-db-instance-migration/test-fixture-73/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-73/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-73 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.3.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.3.0 diff --git a/qa/test-db-instance-migration/test-fixture-74/pom.xml b/qa/test-db-instance-migration/test-fixture-74/pom.xml index c9839c0dd85..bed34006e66 100644 --- a/qa/test-db-instance-migration/test-fixture-74/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-74/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-74 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.4.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.4.0 diff --git a/qa/test-db-instance-migration/test-fixture-75/pom.xml b/qa/test-db-instance-migration/test-fixture-75/pom.xml index dc85ad8e493..7f24b417b04 100644 --- a/qa/test-db-instance-migration/test-fixture-75/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-75/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-75 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.5.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.5.0 7.4.0 diff --git a/qa/test-db-instance-migration/test-fixture-76/pom.xml b/qa/test-db-instance-migration/test-fixture-76/pom.xml index 8f0bd3e23c7..79273e83fa8 100644 --- a/qa/test-db-instance-migration/test-fixture-76/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-76/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-76 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.6.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.6.0 7.5.0 diff --git a/qa/test-db-instance-migration/test-fixture-77/pom.xml b/qa/test-db-instance-migration/test-fixture-77/pom.xml index e6f424530fd..96c05ebac6a 100644 --- a/qa/test-db-instance-migration/test-fixture-77/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-77/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-77 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.7.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.7.0 7.6.0 diff --git a/qa/test-db-instance-migration/test-fixture-78/pom.xml b/qa/test-db-instance-migration/test-fixture-78/pom.xml index 33444efb5cb..a336b1e4251 100644 --- a/qa/test-db-instance-migration/test-fixture-78/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-78/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-78 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.8.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.8.0 7.7.0 diff --git a/qa/test-db-instance-migration/test-fixture-79/pom.xml b/qa/test-db-instance-migration/test-fixture-79/pom.xml index 4b5fd7fdea9..0f97d519921 100644 --- a/qa/test-db-instance-migration/test-fixture-79/pom.xml +++ b/qa/test-db-instance-migration/test-fixture-79/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-fixture-79 jar - camunda BPM - QA - upgrade - instance migration - test fixture - 7.9.0 + Camunda Platform - QA - upgrade - instance migration - test fixture - 7.9.0 7.8.0 diff --git a/qa/test-db-instance-migration/test-migration/pom.xml b/qa/test-db-instance-migration/test-migration/pom.xml index f4772045098..4a43160e0cc 100644 --- a/qa/test-db-instance-migration/test-migration/pom.xml +++ b/qa/test-db-instance-migration/test-migration/pom.xml @@ -9,7 +9,7 @@ camunda-qa-upgrade-test-migration jar - camunda BPM - QA - upgrade - instance migration - test + Camunda Platform - QA - upgrade - instance migration - test diff --git a/qa/test-db-rolling-update/create-new-engine/pom.xml b/qa/test-db-rolling-update/create-new-engine/pom.xml index e47b71439d0..40b21e378f0 100644 --- a/qa/test-db-rolling-update/create-new-engine/pom.xml +++ b/qa/test-db-rolling-update/create-new-engine/pom.xml @@ -9,7 +9,7 @@ camunda-qa-db-create-new-engine jar - camunda BPM - QA - upgrade - rolling update - create new engine + Camunda Platform - QA - upgrade - rolling update - create new engine ${project.version} diff --git a/qa/test-db-rolling-update/create-old-engine/pom.xml b/qa/test-db-rolling-update/create-old-engine/pom.xml index e637157792e..eef54ed9c96 100644 --- a/qa/test-db-rolling-update/create-old-engine/pom.xml +++ b/qa/test-db-rolling-update/create-old-engine/pom.xml @@ -9,7 +9,7 @@ camunda-qa-db-create-old-engine jar - camunda BPM - QA - upgrade - rolling update - create old engine + Camunda Platform - QA - upgrade - rolling update - create old engine diff --git a/qa/test-db-rolling-update/pom.xml b/qa/test-db-rolling-update/pom.xml index 9703fa2e6e5..67cabc63228 100644 --- a/qa/test-db-rolling-update/pom.xml +++ b/qa/test-db-rolling-update/pom.xml @@ -5,7 +5,7 @@ camunda-qa-db-rolling-update pom - camunda BPM - QA - upgrade - rolling update + Camunda Platform - QA - upgrade - rolling update org.camunda.bpm.qa diff --git a/qa/test-db-rolling-update/rolling-update-util/pom.xml b/qa/test-db-rolling-update/rolling-update-util/pom.xml index 22a7a32d4b4..871601fcfec 100644 --- a/qa/test-db-rolling-update/rolling-update-util/pom.xml +++ b/qa/test-db-rolling-update/rolling-update-util/pom.xml @@ -9,7 +9,7 @@ camunda-qa-db-rolling-update-util jar - camunda BPM - QA - upgrade - rolling update util + Camunda Platform - QA - upgrade - rolling update util diff --git a/qa/test-db-rolling-update/test-old-engine/pom.xml b/qa/test-db-rolling-update/test-old-engine/pom.xml index b512e7a762b..df105918678 100644 --- a/qa/test-db-rolling-update/test-old-engine/pom.xml +++ b/qa/test-db-rolling-update/test-old-engine/pom.xml @@ -10,7 +10,7 @@ camunda-qa-db-test-old-engine jar - camunda BPM - QA - upgrade - rolling update - test old engine + Camunda Platform - QA - upgrade - rolling update - test old engine diff --git a/qa/test-db-upgrade/pom.xml b/qa/test-db-upgrade/pom.xml index cae358e8e8b..b5157bbea6e 100755 --- a/qa/test-db-upgrade/pom.xml +++ b/qa/test-db-upgrade/pom.xml @@ -22,7 +22,7 @@ camunda-qa-db-upgrade jar - camunda BPM - QA - upgrade - database + Camunda Platform - QA - upgrade - database ${project.build.directory}/engine-test-sources diff --git a/qa/test-db-util/pom.xml b/qa/test-db-util/pom.xml index 72280cbd80e..07e042650cc 100644 --- a/qa/test-db-util/pom.xml +++ b/qa/test-db-util/pom.xml @@ -10,7 +10,7 @@ org.camunda.bpm.qa.upgrade camunda-qa-upgrade-scenario-util jar - camunda BPM - QA - upgrade - scenario util + Camunda Platform - QA - upgrade - scenario util diff --git a/qa/test-old-engine/pom.xml b/qa/test-old-engine/pom.xml index 498c77cfc2e..99b550fe5d3 100755 --- a/qa/test-old-engine/pom.xml +++ b/qa/test-old-engine/pom.xml @@ -9,7 +9,7 @@ camunda-qa-old-engine jar - camunda BPM - QA - test new schema with old engine + Camunda Platform - QA - test new schema with old engine 7.14.0 diff --git a/qa/tomcat-runtime/pom.xml b/qa/tomcat-runtime/pom.xml index e17905acc63..190384511c0 100644 --- a/qa/tomcat-runtime/pom.xml +++ b/qa/tomcat-runtime/pom.xml @@ -4,7 +4,7 @@ camunda-qa-tomcat-runtime pom - camunda BPM - QA Tomcat Test Runtime + Camunda Platform - QA Tomcat Test Runtime org.camunda.bpm.qa diff --git a/qa/tomcat-runtime/src/main/conf/server.xml b/qa/tomcat-runtime/src/main/conf/server.xml index 94d8732b19c..f1293c92b31 100644 --- a/qa/tomcat-runtime/src/main/conf/server.xml +++ b/qa/tomcat-runtime/src/main/conf/server.xml @@ -70,12 +70,12 @@ diff --git a/qa/vanilla-runtimes/tomcat/pom.xml b/qa/vanilla-runtimes/tomcat/pom.xml index 6ab2e6e06ff..62e3f54225e 100644 --- a/qa/vanilla-runtimes/tomcat/pom.xml +++ b/qa/vanilla-runtimes/tomcat/pom.xml @@ -4,7 +4,7 @@ camunda-qa-tomcat-vanilla-runtime pom - camunda BPM - QA Tomcat Vanilla Test Runtime + Camunda Platform - QA Tomcat Vanilla Test Runtime org.camunda.bpm.qa diff --git a/qa/vanilla-runtimes/wildfly/pom.xml b/qa/vanilla-runtimes/wildfly/pom.xml index 57d5963eed3..b691670cddd 100644 --- a/qa/vanilla-runtimes/wildfly/pom.xml +++ b/qa/vanilla-runtimes/wildfly/pom.xml @@ -4,7 +4,7 @@ camunda-qa-wildfly-vanilla-runtime pom - camunda BPM - QA Wildfly Vanilla Test Runtime + Camunda Platform - QA Wildfly Vanilla Test Runtime org.camunda.bpm.qa diff --git a/qa/wildfly-runtime/pom.xml b/qa/wildfly-runtime/pom.xml index 5742f8d82f7..c6cec63e97c 100644 --- a/qa/wildfly-runtime/pom.xml +++ b/qa/wildfly-runtime/pom.xml @@ -4,7 +4,7 @@ camunda-qa-wildfly-runtime jar - camunda BPM - QA Wildfly Test Runtime + Camunda Platform - QA Wildfly Test Runtime org.camunda.bpm.qa @@ -160,7 +160,7 @@ ***************************************************************************************************** * * - * You must use at least JDK 1.8 to start Camunda Bpm Wildfly!!! * + * You must use at least JDK 1.8 to start Camunda Platform Wildfly!!! * * * ***************************************************************************************************** diff --git a/spring-boot-starter/README.adoc b/spring-boot-starter/README.adoc index 235b64ca475..ffb8f37bdeb 100644 --- a/spring-boot-starter/README.adoc +++ b/spring-boot-starter/README.adoc @@ -12,7 +12,7 @@ image::https://maven-badges.herokuapp.com/maven-central/org.camunda.bpm.springbo image::https://www.openhub.net/p/camunda-bpm-spring-boot-starter/widgets/project_thin_badge.gif[link="https://www.openhub.net/p/camunda-bpm-spring-boot-starter"] ,==== -This project provides Spring Boot starters that allow you to integrate the Camunda BPM Platform into your Spring Boot applications. +This project provides Spring Boot starters that allow you to integrate the Camunda Platform into your Spring Boot applications. Please check out the https://docs.camunda.org/manual/develop/user-guide/spring-boot-integration/[Documentation], the https://docs.camunda.org/get-started/spring-boot/[Getting Started Guide] and @@ -77,7 +77,7 @@ The Camunda Spring Boot Starter project used to be the community extension, crea * _https://github.com/jangalinski[Jan Galinski]_ * _https://github.com/hawky-4s-[Christian Lipphardt]_ -Starting from version 2.3.0 it was adopted as part of the Camunda BPM Platform. +Starting from version 2.3.0 it was adopted as part of the Camunda Platform. ## License diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml index b0b53f00a91..7a7226e5188 100644 --- a/spring-boot-starter/pom.xml +++ b/spring-boot-starter/pom.xml @@ -10,7 +10,7 @@ org.camunda.bpm.springboot.project camunda-bpm-spring-boot-starter-root - camunda BPM - Spring Boot Starter - Root Pom + Camunda Platform - Spring Boot Starter - Root Pom 2015 pom diff --git a/spring-boot-starter/starter-qa/integration-test-plugins/pom.xml b/spring-boot-starter/starter-qa/integration-test-plugins/pom.xml index af8e9e5357b..99436e706dd 100644 --- a/spring-boot-starter/starter-qa/integration-test-plugins/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-plugins/pom.xml @@ -12,7 +12,7 @@ pom qa-plugins - camunda BPM - Spring Boot Starter - QA - Plugins + Camunda Platform - Spring Boot Starter - QA - Plugins diff --git a/spring-boot-starter/starter-qa/integration-test-plugins/spin/pom.xml b/spring-boot-starter/starter-qa/integration-test-plugins/spin/pom.xml index ad0beb37b9a..901d267e52c 100644 --- a/spring-boot-starter/starter-qa/integration-test-plugins/spin/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-plugins/spin/pom.xml @@ -12,7 +12,7 @@ pom qa-plugins-spin - camunda BPM - Spring Boot Starter - QA - Plugins - Spin + Camunda Platform - Spring Boot Starter - QA - Plugins - Spin spin-dataformat-json-jackson diff --git a/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml b/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml index 828b27a4544..e8b76f66b00 100644 --- a/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all/pom.xml @@ -10,7 +10,7 @@ qa-plugins-spin-dataformat-all - camunda BPM - Spring Boot Starter - QA - Plugins - Spin All + Camunda Platform - Spring Boot Starter - QA - Plugins - Spin All diff --git a/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml b/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml index a92a3813912..2c23f328464 100644 --- a/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson/pom.xml @@ -10,7 +10,7 @@ qa-plugins-spin-dataformat-json-jackson - camunda BPM - Spring Boot Starter - QA - Plugins - Spin Json Jackson + Camunda Platform - Spring Boot Starter - QA - Plugins - Spin Json Jackson diff --git a/spring-boot-starter/starter-qa/integration-test-simple/pom.xml b/spring-boot-starter/starter-qa/integration-test-simple/pom.xml index 392691a7186..e81f991abbd 100644 --- a/spring-boot-starter/starter-qa/integration-test-simple/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-simple/pom.xml @@ -10,7 +10,7 @@ qa-simple - camunda BPM - Spring Boot Starter - QA - Simple + Camunda Platform - Spring Boot Starter - QA - Simple diff --git a/spring-boot-starter/starter-qa/integration-test-webapp/invoice-example/pom.xml b/spring-boot-starter/starter-qa/integration-test-webapp/invoice-example/pom.xml index be8796a415d..b20e5758abe 100644 --- a/spring-boot-starter/starter-qa/integration-test-webapp/invoice-example/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-webapp/invoice-example/pom.xml @@ -10,7 +10,7 @@ qa-webapp-invoice-example - camunda BPM - Spring Boot Starter - QA - Webapps Invoice Example + Camunda Platform - Spring Boot Starter - QA - Webapps Invoice Example diff --git a/spring-boot-starter/starter-qa/integration-test-webapp/pom.xml b/spring-boot-starter/starter-qa/integration-test-webapp/pom.xml index 5989b639db7..6d34a296416 100644 --- a/spring-boot-starter/starter-qa/integration-test-webapp/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-webapp/pom.xml @@ -12,7 +12,7 @@ pom qa-webapp - camunda BPM - Spring Boot Starter - QA - Webapps + Camunda Platform - Spring Boot Starter - QA - Webapps invoice-example diff --git a/spring-boot-starter/starter-qa/integration-test-webapp/runtime/pom.xml b/spring-boot-starter/starter-qa/integration-test-webapp/runtime/pom.xml index b2e53da30ff..035e4cdbdc7 100644 --- a/spring-boot-starter/starter-qa/integration-test-webapp/runtime/pom.xml +++ b/spring-boot-starter/starter-qa/integration-test-webapp/runtime/pom.xml @@ -10,7 +10,7 @@ qa-webapp-ce-runtime - camunda BPM - Spring Boot Starter - QA - Webapps Runtime + Camunda Platform - Spring Boot Starter - QA - Webapps Runtime 2.45.0 diff --git a/spring-boot-starter/starter-qa/pom.xml b/spring-boot-starter/starter-qa/pom.xml index 1fd4132934e..71056b15d3f 100644 --- a/spring-boot-starter/starter-qa/pom.xml +++ b/spring-boot-starter/starter-qa/pom.xml @@ -12,7 +12,7 @@ pom camunda-bpm-spring-boot-starter-qa - camunda BPM - Spring Boot Starter - QA - Root Pom + Camunda Platform - Spring Boot Starter - QA - Root Pom diff --git a/spring-boot-starter/starter-rest/pom.xml b/spring-boot-starter/starter-rest/pom.xml index 795415faef7..7e82273b6ca 100644 --- a/spring-boot-starter/starter-rest/pom.xml +++ b/spring-boot-starter/starter-rest/pom.xml @@ -10,7 +10,7 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-rest - camunda BPM - Spring Boot Starter - Rest + Camunda Platform - Spring Boot Starter - Rest diff --git a/spring-boot-starter/starter-test/pom.xml b/spring-boot-starter/starter-test/pom.xml index 9959f35fddf..24e6012a323 100644 --- a/spring-boot-starter/starter-test/pom.xml +++ b/spring-boot-starter/starter-test/pom.xml @@ -10,7 +10,7 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-test - camunda BPM - Spring Boot Starter - Test + Camunda Platform - Spring Boot Starter - Test camunda-bpm-assert-assertj3-11-1 diff --git a/spring-boot-starter/starter-webapp-core/pom.xml b/spring-boot-starter/starter-webapp-core/pom.xml index 73f18796aa1..985a84097f7 100644 --- a/spring-boot-starter/starter-webapp-core/pom.xml +++ b/spring-boot-starter/starter-webapp-core/pom.xml @@ -9,7 +9,7 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-webapp-core - camunda BPM - Spring Boot Starter - Webapps Core + Camunda Platform - Spring Boot Starter - Webapps Core 2.0.2 diff --git a/spring-boot-starter/starter-webapp/pom.xml b/spring-boot-starter/starter-webapp/pom.xml index 33c686d5169..716b6d645e7 100644 --- a/spring-boot-starter/starter-webapp/pom.xml +++ b/spring-boot-starter/starter-webapp/pom.xml @@ -9,7 +9,7 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-webapp - camunda BPM - Spring Boot Starter - Webapps + Camunda Platform - Spring Boot Starter - Webapps diff --git a/spring-boot-starter/starter/pom.xml b/spring-boot-starter/starter/pom.xml index 62e6e572279..897d31abd2b 100644 --- a/spring-boot-starter/starter/pom.xml +++ b/spring-boot-starter/starter/pom.xml @@ -8,7 +8,7 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter - camunda BPM - Spring Boot Starter + Camunda Platform - Spring Boot Starter diff --git a/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/jdbc/HistoryLevelDeterminatorJdbcTemplateImpl.java b/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/jdbc/HistoryLevelDeterminatorJdbcTemplateImpl.java index 470db59afbf..4be15d362bb 100644 --- a/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/jdbc/HistoryLevelDeterminatorJdbcTemplateImpl.java +++ b/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/jdbc/HistoryLevelDeterminatorJdbcTemplateImpl.java @@ -92,7 +92,7 @@ public void setCamundaBpmProperties(CamundaBpmProperties camundaBpmProperties) { @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jdbcTemplate, "a jdbc template must be set"); - Assert.notNull(camundaBpmProperties, "camunda bpm properties must be set"); + Assert.notNull(camundaBpmProperties, "Camunda Platform properties must be set"); String historyLevelDefault = camundaBpmProperties.getHistoryLevelDefault(); if (StringUtils.hasText(historyLevelDefault)) { defaultHistoryLevel = historyLevelDefault; diff --git a/spring-boot-starter/starter/src/main/resources/banner.txt b/spring-boot-starter/starter/src/main/resources/banner.txt index 47e7af7774e..1193733adc2 100644 --- a/spring-boot-starter/starter/src/main/resources/banner.txt +++ b/spring-boot-starter/starter/src/main/resources/banner.txt @@ -1,10 +1,10 @@ - ____ _ ____ ____ __ __ -/ ___| __ _ _ __ ___ _ _ _ __ __| | __ _ | __ )| _ \| \/ | -| | / _` | '_ ` _ \| | | | '_ \ / _` |/ _` | | _ \| |_) | |\/| | -| |__| (_| | | | | | | |_| | | | | (_| | (_| | | |_) | __/| | | | -\____/\__,_|_| |_| |_|\__,_|_| |_|\__,_|\__,_| |____/|_| |_| |_| + ____ _ ____ _ _ __ +/ ___| __ _ _ __ ___ _ _ _ __ __| | __ _ | _ \| | __ _| |_ / _| ___ _ __ _ __ ___ +| | / _` | '_ ` _ \| | | | '_ \ / _` |/ _` | | |_) | |/ _` | __| |_ / _ \| '__| '_ ` _ \ +| |__| (_| | | | | | | |_| | | | | (_| | (_| | | __/| | (_| | |_| _| (_) | | | | | | | | +\____/\__,_|_| |_| |_|\__,_|_| |_|\__,_|\__,_| |_| |_|\__,_|\__|_| \___/|_| |_| |_| |_| Spring-Boot: ${spring-boot.formatted-version} Camunda BPM: ${camunda.bpm.formatted-version} - Camunda BPM Spring Boot Starter: (v@project.version@) + Camunda Platform Spring Boot Starter: (v@project.version@) diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest1.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest1.java index 2c80cda77cb..d640c40eec8 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest1.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest1.java @@ -54,7 +54,7 @@ public void setUp() { AbstractContextCacheTest.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest2.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest2.java index f6df1253ee8..fbcaef008a7 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest2.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest2.java @@ -55,7 +55,7 @@ public void setUp() { this.testName = "nonPaTest2"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest3.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest3.java index b5cc3d9525a..fcf2011d03e 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest3.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest3.java @@ -57,7 +57,7 @@ public void setUp() { this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest4.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest4.java index 56d78c03068..37b96c45d75 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest4.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest4.java @@ -56,7 +56,7 @@ public void setUp() { this.testName = "nonPaTest4"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest5.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest5.java index b92da75a043..839b54bb593 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest5.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/nonpa/NonPaContextCacheTest5.java @@ -55,7 +55,7 @@ public void setUp() { this.testName = "nonPaTest5"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest1.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest1.java index 2a075594fb0..cf11b3cdc01 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest1.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest1.java @@ -54,7 +54,7 @@ public void setUp() { AbstractContextCacheTest.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest2.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest2.java index 3ce25d3c351..41f3e36fe49 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest2.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest2.java @@ -56,7 +56,7 @@ public void setUp() { this.testName = "paTest2"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest3.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest3.java index 39e8dcdc87c..e82de084bf7 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest3.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest3.java @@ -57,7 +57,7 @@ public void setUp() { this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest4.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest4.java index 199c03f3bda..1880629d75a 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest4.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest4.java @@ -57,7 +57,7 @@ public void setUp() { this.testName = "paTest4"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest5.java b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest5.java index 65dd2036454..5a929b5b67a 100644 --- a/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest5.java +++ b/spring-boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/contextcache/pa/PaContextCacheTest5.java @@ -56,7 +56,7 @@ public void setUp() { this.testName = "paTest5"; this.contextMap.put(this.testName, applicationContext.hashCode()); - // ensure that Camunda BPM Assert is using the non-default engine + // ensure that Camunda Platform Assert is using the non-default engine init(processEngine); } diff --git a/webapps/README.md b/webapps/README.md index 13905404d99..12f546a470a 100644 --- a/webapps/README.md +++ b/webapps/README.md @@ -1,6 +1,6 @@ # Camunda Webapp -This is the Camunda BPM web application source. +This is the Camunda Platform web application source. Clean, package and install it via [Maven](https://maven.apache.org/). ## Structure of this project @@ -13,7 +13,7 @@ The structure is as follows: ## UI -There are 3 web applications available for the Camunda BPM platform: +There are 3 web applications available for the Camunda Platform : * __cockpit__: an administration interface for processes and decisions * __tasklist__: provides an interface to process user tasks diff --git a/webapps/camunda-bpm-sdk-js/README.md b/webapps/camunda-bpm-sdk-js/README.md index 1635efb47da..f42df9dd38a 100644 --- a/webapps/camunda-bpm-sdk-js/README.md +++ b/webapps/camunda-bpm-sdk-js/README.md @@ -1,6 +1,6 @@ # camunda-bpm-sdk-js -Javascript client library for [camunda BPM](https://github.com/camunda/camunda-bpm-platform) +Javascript client library for [Camunda Platform](https://github.com/camunda/camunda-bpm-platform) ## Install using bower diff --git a/webapps/camunda-commons-ui/Gruntfile.js b/webapps/camunda-commons-ui/Gruntfile.js index 5a79fee7c0a..9cba6eabf07 100644 --- a/webapps/camunda-commons-ui/Gruntfile.js +++ b/webapps/camunda-commons-ui/Gruntfile.js @@ -24,7 +24,7 @@ var fs = require('fs'); /** This file is used to configure the [grunt](http://gruntjs.com/) tasks - aimed to generate the web frontend of the camunda BPM platform. + aimed to generate the web frontend of the Camunda Platform. @author Valentin Vago @author Sebastian Stamm */ diff --git a/webapps/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.html b/webapps/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.html index e85d01e0091..438a00b7cda 100644 --- a/webapps/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.html +++ b/webapps/camunda-commons-ui/lib/widgets/footer/cam-widget-footer.html @@ -4,7 +4,7 @@ {{ 'CAM_WIDGET_FOOTER_TIMEZONE' | translate }} {{timezoneName}}
- {{ 'CAM_WIDGET_FOOTER_POWERED_BY' | translate }} camunda BPM / + {{ 'CAM_WIDGET_FOOTER_POWERED_BY' | translate }} Camunda Platform / {{version}}
diff --git a/webapps/camunda-commons-ui/lib/widgets/variable/test/cam-widget-variable.spec.html b/webapps/camunda-commons-ui/lib/widgets/variable/test/cam-widget-variable.spec.html index 3b4590d510d..18b2b9d2768 100644 --- a/webapps/camunda-commons-ui/lib/widgets/variable/test/cam-widget-variable.spec.html +++ b/webapps/camunda-commons-ui/lib/widgets/variable/test/cam-widget-variable.spec.html @@ -27,7 +27,7 @@

Variable

Description

-

A widget to display and manipulate variables used by the Camunda BPM suite.

+

A widget to display and manipulate variables used by the Camunda Platform suite.

diff --git a/webapps/camunda-commons-ui/lib/widgets/variables-table/test/cam-widget-variables-table.spec.html b/webapps/camunda-commons-ui/lib/widgets/variables-table/test/cam-widget-variables-table.spec.html index 6ffd1f77f4a..ad2399eba22 100644 --- a/webapps/camunda-commons-ui/lib/widgets/variables-table/test/cam-widget-variables-table.spec.html +++ b/webapps/camunda-commons-ui/lib/widgets/variables-table/test/cam-widget-variables-table.spec.html @@ -27,7 +27,7 @@

Variables Table

Description

-

A widget to display and manipulate variables used by the Camunda BPM suite.

+

A widget to display and manipulate variables used by the Camunda Platform suite.

diff --git a/webapps/pom.xml b/webapps/pom.xml index dc36e563ee2..69112299eaf 100644 --- a/webapps/pom.xml +++ b/webapps/pom.xml @@ -13,7 +13,7 @@ camunda-webapp org.camunda.bpm.webapp war - camunda BPM - webapp - app + Camunda Platform - webapp - app 2014 @@ -83,7 +83,7 @@ camunda-nexus - camunda BPM Maven Repository + Camunda Platform Maven Repository https://app.camunda.com/nexus/content/groups/public true diff --git a/webapps/src/main/java/org/camunda/bpm/cockpit/impl/web/bootstrap/CockpitContainerBootstrap.java b/webapps/src/main/java/org/camunda/bpm/cockpit/impl/web/bootstrap/CockpitContainerBootstrap.java index 5f39ccafbfb..f7d505172d9 100644 --- a/webapps/src/main/java/org/camunda/bpm/cockpit/impl/web/bootstrap/CockpitContainerBootstrap.java +++ b/webapps/src/main/java/org/camunda/bpm/cockpit/impl/web/bootstrap/CockpitContainerBootstrap.java @@ -26,7 +26,7 @@ /** * A servlet context listener that bootstraps cockpit on a - * running camunda bpm platform. + * running Camunda Platform. * * @author nico.rehwaldt */ diff --git a/webapps/src/main/java/org/camunda/bpm/webapp/impl/security/auth/Authentications.java b/webapps/src/main/java/org/camunda/bpm/webapp/impl/security/auth/Authentications.java index d7c0fd5897d..b3a68bda63e 100644 --- a/webapps/src/main/java/org/camunda/bpm/webapp/impl/security/auth/Authentications.java +++ b/webapps/src/main/java/org/camunda/bpm/webapp/impl/security/auth/Authentications.java @@ -28,7 +28,7 @@ /** *

Wrapper around current authentications.

* - *

In camunda BPM rest and web applications, authentications are managed per + *

In Camunda Platform rest and web applications, authentications are managed per * process engine: at a given point in time, there might be multiple authentications * active for different users and process engines in a single session. The situation * is that a "physical" user may possess credentials for different process engines, diff --git a/webapps/src/main/java/org/camunda/bpm/webapp/impl/util/ServletContextUtil.java b/webapps/src/main/java/org/camunda/bpm/webapp/impl/util/ServletContextUtil.java index b8cc398740f..7c624b47590 100644 --- a/webapps/src/main/java/org/camunda/bpm/webapp/impl/util/ServletContextUtil.java +++ b/webapps/src/main/java/org/camunda/bpm/webapp/impl/util/ServletContextUtil.java @@ -19,9 +19,9 @@ import javax.servlet.ServletContext; /** - * With Camunda BPM 7.13 we introduced the application path prefix /camunda to Spring Boot. + * With Camunda Platform 7.13 we introduced the application path prefix /camunda to Spring Boot. * The application path is set in Spring Boot's servlet context and is consumed by filters and - * servlets of the Camunda BPM Webapp. This util class holds the methods to get and set the + * servlets of the Camunda Platform Webapp. This util class holds the methods to get and set the * application path. */ public class ServletContextUtil { @@ -33,7 +33,7 @@ public class ServletContextUtil { "org.camunda.bpm.webapp.telemetry.data.stored"; /** - * Consumed by Camunda BPM CE & EE Webapp: + * Consumed by Camunda Platform CE & EE Webapp: * Retrieves the application path from Spring Boot's servlet context. * * @param servletContext that holds the application path diff --git a/webapps/src/main/webapp/WEB-INF/web.xml b/webapps/src/main/webapp/WEB-INF/web.xml index 2d29858e3e2..0d11880ea4c 100644 --- a/webapps/src/main/webapp/WEB-INF/web.xml +++ b/webapps/src/main/webapp/WEB-INF/web.xml @@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - camunda bpm webapp + Camunda Platform webapp diff --git a/webapps/src/main/webapp/error-404-page.html b/webapps/src/main/webapp/error-404-page.html index a65ce4428c3..041baad061c 100644 --- a/webapps/src/main/webapp/error-404-page.html +++ b/webapps/src/main/webapp/error-404-page.html @@ -125,7 +125,7 @@

The Page you are requesting was not found on this server.

diff --git a/webapps/src/main/webapp/error-500-page.html b/webapps/src/main/webapp/error-500-page.html index 41e425ed0e5..2a5d1049be2 100644 --- a/webapps/src/main/webapp/error-500-page.html +++ b/webapps/src/main/webapp/error-500-page.html @@ -126,7 +126,7 @@

An error occurred while processing your request.

diff --git a/webapps/src/test/resources/WEB-INF/csrf/changed_cookie_name_web.xml b/webapps/src/test/resources/WEB-INF/csrf/changed_cookie_name_web.xml index eb322646937..cca3687f4e5 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/changed_cookie_name_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/changed_cookie_name_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/csrf/ignore_case_web.xml index 79ac616d5d7..02f7f664a3a 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_custom_value_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_custom_value_web.xml index 19f4d0e0b09..c324f0daefa 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_custom_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_custom_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_disabled_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_disabled_web.xml index 9870a3e373d..fcdb7f9c40f 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_disabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_disabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_lax_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_lax_web.xml index 2a2c753a7ca..48fea40dfcb 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_lax_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_lax_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_strict_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_strict_web.xml index 19182c14055..2cb74037bec 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_strict_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_strict_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_unknown_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_unknown_web.xml index 56dfe0a1a3d..b127ed9cf05 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_unknown_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_unknown_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_value_web.xml b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_value_web.xml index de95a3d5ce0..842ab4c350d 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/same_site_option_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/same_site_option_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/secure_enabled_web.xml b/webapps/src/test/resources/WEB-INF/csrf/secure_enabled_web.xml index 1814be77d08..c47fab45e3c 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/secure_enabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/secure_enabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/csrf/web.xml b/webapps/src/test/resources/WEB-INF/csrf/web.xml index 1b40c64eabb..e22eb937c12 100644 --- a/webapps/src/test/resources/WEB-INF/csrf/web.xml +++ b/webapps/src/test/resources/WEB-INF/csrf/web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp CsrfPreventionFilter diff --git a/webapps/src/test/resources/WEB-INF/headersec/csp/custom_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/csp/custom_value_web.xml index 9fe1e857ec6..1f8afbcc584 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/csp/custom_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/csp/custom_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_ignore_case_web.xml index 1766c5dc4e0..2774c5d6a4a 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_web.xml b/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_web.xml index 8defd955c5b..4a15c0aa84b 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/csp/disabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/cto/custom_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/cto/custom_value_web.xml index b908c2d182f..5f304f6c3da 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/cto/custom_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/cto/custom_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_ignore_case_web.xml index bebf1897e3b..49185ee135a 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_web.xml b/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_web.xml index f3d0dece0d3..112fc355323 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/cto/disabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/custom_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/custom_value_web.xml index a7f6e0f2ac0..5fdb85391c6 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/custom_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/custom_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_ignore_case_web.xml index f7cc4bd14c2..f92a773cced 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_web.xml index d5fc7f57972..39f1da187fc 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/enabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_max_age_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_max_age_web.xml index d63ff9534ac..acb53b26d67 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_max_age_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_max_age_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_web.xml index 122fee65f5c..8f9c145ccde 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/include_subdomains_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_and_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_and_value_web.xml index a9067fef329..3e8b643aacb 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_and_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_and_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_web.xml b/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_web.xml index 27647dbe4e2..a9cca043d50 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/hsts/max_age_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/web.xml b/webapps/src/test/resources/WEB-INF/headersec/web.xml index b66fc08d7df..4dfa3f55500 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/custom_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/custom_value_web.xml index 8e01df44731..8b9af645165 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/custom_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/custom_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_ignore_case_web.xml index 32939498197..3d2007fd7fe 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_web.xml index b7de7bc7736..2f323d0cc43 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/disabled_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/option_and_value_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/option_and_value_web.xml index 62487c64a76..7731a4c8fef 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/option_and_value_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/option_and_value_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/option_block_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/option_block_web.xml index 0fb7ce0f7be..856b337a08d 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/option_block_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/option_block_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/option_non_existing_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/option_non_existing_web.xml index 346130de350..f035cec1970 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/option_non_existing_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/option_non_existing_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_ignore_case_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_ignore_case_web.xml index 1230d3433a7..f9f98d7f9b8 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_ignore_case_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_ignore_case_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity diff --git a/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_web.xml b/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_web.xml index e650dd9608a..16528acfeb2 100644 --- a/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_web.xml +++ b/webapps/src/test/resources/WEB-INF/headersec/xss/option_sanitize_web.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - camunda bpm webapp + Camunda Platform webapp HttpHeaderSecurity