diff --git a/distro/run/README.md b/distro/run/README.md index 200b174c23d..15defef261a 100644 --- a/distro/run/README.md +++ b/distro/run/README.md @@ -1,71 +1,57 @@ -# Camunda REST Distribution +# Camunda BPM Run -## Requirements +This is a pre-configured Camunda Spring Boot distribution that allows users to simply download and RUN Camunda BPM. -1. User profile: - * Non-Java developer - * Able to install the required JDK - * Familiar with the command line and Rest APIs -2. No Application Server configuration, i.e., straightforward configuration -3. Pre-set security configuration - -## Design Decisions - -We decided to use the Camunda Spring Boot Starter. Reasons: -1. It produces an uberjar with all the dependencies provided. -2. It's straightforward to configure (`application.yml`) and to start. -3. Camunda already supports the technology, and it's easily extendable. - -## How to run the Camunda Rest distro +## How to run it 1. Build the project with either the `ce` or `ee` profile -2. In `distro/target`, a `camunda-rest-distro-distro-{project.version}-[ce|ee].zip` will be available. +2. In `distro/target`, a `camunda-bpm-run-distro-{project.version}-[ce|ee].zip` will be available. 3. Extract the archive -4. Go to the `config` folder and add configuration to the application yml +4. Go to the `config` folder and add configuration to the `application.yml` 5. Go to the `bin` folder and run `start.sh` (or `start.bat` if you're using Windows). - * add the `--webapps` flag if you want to run the Camunda Webapps - * add the `--rest` flag if you want to run the Camunda REST API + * add the `--webapps` flag if you want to run the Camunda Webapps only + * add the `--rest` flag if you want to run the Camunda REST API only + * add the `--webapps` and the `--rest` flags if you want to run both (default) ## Configuration -The distro can be configured through the `application.yml` file found in the `config/` directory - of the distro archive. You can use the general camunda spring boot starter configuration properties available [here](https://docs.camunda.org/manual/latest/user-guide/spring-boot-integration/configuration/#camunda-engine-properties) as well as the following properties: +Camunda BPM Run can be configured through the `application.yml` file found in the `config/` directory. +You can use the general Camunda Spring Boot Starter configuration properties available [here](https://docs.camunda.org/manual/latest/user-guide/spring-boot-integration/configuration/#camunda-engine-properties) as well as the following additional properties: ### Authentication -| Prefix | Property Name | Description | Defaul Value | -|------------------|-----------------|------------------------------------------------------------|--------------| -| rest-distro.auth | .enabled | Switch on/off authentication | true | -| | .authentication | Authentication method. Currently only basic is supported | basic | -| | | | | +| Prefix | Property Name | Description | Default Value | +|----------------------|-----------------|------------------------------------------------------------|---------------| +| camunda.bpm.run.auth | .enabled | Switch on/off authentication | true | +| | .authentication | Authentication method. Currently only basic is supported | basic | +| | | | | ### HTTPS/SSL The following properties are provided by Spring Boot (see [Common Application Properties](https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-application-properties.html#server-properties)). However, the properties listed below are necessary for Camunda BPM to run with HTTPS. -| Prefix | Property Name | Description | Defaul Value | -|------------|---------------------|---------------------------------------------------------------------------|--------------| -| server.ssl | .key-store | Path to the key store that holds the SSL certificate (.jks or .p12 file). | | -| | .key-store-password | Password used to access the key store. | | -| | .key-store-type | Type of the key store (pkcs12 or jks). | | -| | .key-alias | Alias that identifies the key in the key store. | | -| | .key-password | Password used to access the key in the key store. | | -| server | .port | Server HTTPS port (e.g. 8443). | | +| Prefix | Property Name | Description | Default Value | +|------------|---------------------|---------------------------------------------------------------------------|---------------| +| server.ssl | .key-store | Path to the key store that holds the SSL certificate (.jks or .p12 file). | | +| | .key-store-password | Password used to access the key store. | | +| | .key-store-type | Type of the key store (pkcs12 or jks). | | +| | .key-alias | Alias that identifies the key in the key store. | | +| | .key-password | Password used to access the key in the key store. | | +| server | .port | Server HTTPS port (e.g. 8443). | | ### CORS (Cross-Origin Resource Sharing) -| Prefix | Property Name | Description | Defaul Value | -|------------------|-----------------|------------------------------------------------------------------------|--------------| -| rest-distro.cors | .enabled | Switch on/off CORS. | false | -| | .allowedOrigins | Comma separated string with origins allowed origins or wildcard ("*"). | "*" | +| Prefix | Property Name | Description | Default Value | +|----------------------|-----------------|------------------------------------------------------------------------|---------------| +| camunda.bpm.run.cors | .enabled | Switch on/off CORS. | false | +| | .allowedOrigins | Comma separated string with origins allowed origins or wildcard ("*"). | "*" | ## Default values -By default, the admin credentials are set to `demo:demo`. This can be changed in the `config -/application.yml` configuration file. +By default, the admin credentials are set to `demo:demo`. This can be changed in the `config/application.yml` configuration file. ### Database -The distro will use the H2 database by default. You will be able to find the database file in the +Camunda BPM Run will use the H2 database by default. You will be able to find the database file in the `bin/camunda-h2-dbs` directory after the initial run. To connect to a different database (out of the ones [supported by Camunda](https://docs.camunda.org/manual/latest/introduction/supported-environments/#databases)) , you will need to perform the following steps: @@ -76,27 +62,11 @@ The distro will use the H2 database by default. You will be able to find the dat ```yaml spring.datasource: # the DB url and DB Schema name (common template: jdbc:{db-type}://{ip-address}:{port}/{db-schema-name} - url: jdbc:h2:./camunda-h2-dbs/process-engine;MVCC=TRUE;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE + url: jdbc:h2:./camunda-h2-dbs/process-engine;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE # the JDBC driver class driver-class-name: org.h2.Driver # the DB user username: sa # the DB password password: sa -``` - -## Learnings - -* New authentication methods have to be implemented in the Engine Rest project through `Filters -`. Implementing custom authentication methods using `Spring Security` that make use of the - Engines's authentication layer is not straightforward (however, this means that any new - authentication methods are available anywhere the Engine Rest API is integrated). -* Spring (Boot) uses a custom `maven` property for adding external libraries to the classpath - (`loader.path`). Using the default `java -cp` or `java -classpath` doesn't work. -* The `--spring.config.location` argument that passes the location of an external `application.yml -` configuration file should be passed after the `-jar` argument. -* The `spring-boot-maven-plugin` provides a `fatjar`. It also packages dependencies with a - `provided` scope. We needed to explicitly exclude all of the `webapps` dependencies since we - optionally include them if the user wants the Camunda Webapps loaded. -* Enabling CORS is not straight-forward. The officially documented techniques to enable CORS as well as a filter-based -approach failed to attach the necessary response headers \ No newline at end of file +``` \ No newline at end of file diff --git a/distro/run/distro/assembly/base-component.xml b/distro/run/distro/assembly/base-component.xml index 1235c165ecc..d0a3f34b8ba 100644 --- a/distro/run/distro/assembly/base-component.xml +++ b/distro/run/distro/assembly/base-component.xml @@ -32,10 +32,10 @@ 0755 - target/camunda-rest-distro-distro-${project.version}.jar + target/camunda-bpm-run-distro-${project.version}.jar lib/ - camunda-rest-distro.jar + camunda-bpm-run.jar diff --git a/distro/run/distro/assembly/resources/application.yml b/distro/run/distro/assembly/resources/application.yml index 09f01f88e24..60d59bd9453 100644 --- a/distro/run/distro/assembly/resources/application.yml +++ b/distro/run/distro/assembly/resources/application.yml @@ -7,7 +7,7 @@ camunda.bpm: spring.datasource: - url: jdbc:h2:./camunda-h2-dbs/process-engine;MVCC=TRUE;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE + url: jdbc:h2:./camunda-h2-dbs/process-engine;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE driver-class-name: org.h2.Driver username: sa password: sa diff --git a/distro/run/distro/assembly/resources/start.bat b/distro/run/distro/assembly/resources/start.bat index 953b18b26fb..834508fb5b9 100644 --- a/distro/run/distro/assembly/resources/start.bat +++ b/distro/run/distro/assembly/resources/start.bat @@ -60,4 +60,4 @@ ECHO classpath: %classPath% REM start the application -call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%/../lib/camunda-rest-distro.jar" --spring.config.location=file:"%BASEDIR%"/../config/application.yml +call %JAVA% -Dloader.path="%classPath%" -jar "%BASEDIR%/../lib/camunda-bpm-run.jar" --spring.config.location=file:"%BASEDIR%"/../config/application.yml diff --git a/distro/run/distro/assembly/resources/start.sh b/distro/run/distro/assembly/resources/start.sh index ee28284fe48..e3b18f6721a 100644 --- a/distro/run/distro/assembly/resources/start.sh +++ b/distro/run/distro/assembly/resources/start.sh @@ -48,4 +48,4 @@ fi echo classpath: $classPath # start the application -"$JAVA" -Dloader.path="$classPath" -jar "$BASEDIR/../lib/camunda-rest-distro.jar" --spring.config.location=file:"$BASEDIR"/../config/application.yml \ No newline at end of file +"$JAVA" -Dloader.path="$classPath" -jar "$BASEDIR/../lib/camunda-bpm-run.jar" --spring.config.location=file:"$BASEDIR"/../config/application.yml \ No newline at end of file diff --git a/distro/run/distro/pom.xml b/distro/run/distro/pom.xml index 3b1339ed40a..0d5517c6c12 100644 --- a/distro/run/distro/pom.xml +++ b/distro/run/distro/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - org.camunda.bpm - camunda-rest-distro-bom - 1.0-SNAPSHOT - ../bom + org.camunda.bpm.run + camunda-bpm-run-root + 7.13.0-SNAPSHOT + .. - camunda-rest-distro-distro - camunda BPM Rest Distro + camunda-bpm-run-distro + Camunda BPM Run - Distribution jar diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaRestDistro.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java similarity index 60% rename from distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaRestDistro.java rename to distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java index c0fe8aa2085..784e1a99e7e 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaRestDistro.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRun.java @@ -1,11 +1,11 @@ -package org.camunda.bpm.rest.distro; +package org.camunda.bpm.run; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class CamundaRestDistro { +public class CamundaBpmRun { public static void main(String... args) { - SpringApplication.run(CamundaRestDistro.class, args); + SpringApplication.run(CamundaBpmRun.class, args); } } diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaSecurityConfiguration.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java similarity index 73% rename from distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaSecurityConfiguration.java rename to distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java index cae4d89d7b1..9854b400520 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/CamundaSecurityConfiguration.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/CamundaBpmRunSecurityConfiguration.java @@ -1,13 +1,13 @@ -package org.camunda.bpm.rest.distro; +package org.camunda.bpm.run; import javax.servlet.Filter; import javax.servlet.ServletException; import org.apache.catalina.filters.CorsFilter; import org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter; -import org.camunda.bpm.rest.distro.property.CamundaAuthenticationProperty; -import org.camunda.bpm.rest.distro.property.CamundaCorsProperty; -import org.camunda.bpm.rest.distro.property.CamundaRestDistroProperties; +import org.camunda.bpm.run.property.CamundaBpmRunAuthenticationProperties; +import org.camunda.bpm.run.property.CamundaBpmRunCorsProperty; +import org.camunda.bpm.run.property.CamundaBpmRunProperties; import org.camunda.bpm.spring.boot.starter.CamundaBpmAutoConfiguration; import org.camunda.bpm.spring.boot.starter.rest.CamundaBpmRestInitializer; import org.springframework.beans.factory.annotation.Autowired; @@ -19,17 +19,17 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@EnableConfigurationProperties(CamundaRestDistroProperties.class) +@EnableConfigurationProperties(CamundaBpmRunProperties.class) @Configuration @AutoConfigureAfter({ CamundaBpmAutoConfiguration.class }) -public class CamundaSecurityConfiguration { +public class CamundaBpmRunSecurityConfiguration { @Autowired - CamundaRestDistroProperties camundaRestDistroProperties; + CamundaBpmRunProperties camundaBpmRunProperties; @Bean @ConditionalOnClass(CamundaBpmRestInitializer.class) - @ConditionalOnProperty(name = "enabled", havingValue = "true", prefix = CamundaAuthenticationProperty.PREFIX) + @ConditionalOnProperty(name = "enabled", havingValue = "true", prefix = CamundaBpmRunAuthenticationProperties.PREFIX) public FilterRegistrationBean processEngineAuthenticationFilter() { FilterRegistrationBean registration = new FilterRegistrationBean<>(); registration.setName("camunda-auth"); @@ -37,8 +37,8 @@ public FilterRegistrationBean processEngineAuthenticationFilter() { registration.addUrlPatterns("/rest/*"); // if nothing is set, use Http Basic authentication - CamundaAuthenticationProperty properties = camundaRestDistroProperties.getAuth(); - if (properties.getAuthentication() == null || CamundaAuthenticationProperty.DEFAULT_AUTH.equals(properties.getAuthentication())) { + CamundaBpmRunAuthenticationProperties properties = camundaBpmRunProperties.getAuth(); + if (properties.getAuthentication() == null || CamundaBpmRunAuthenticationProperties.DEFAULT_AUTH.equals(properties.getAuthentication())) { registration.addInitParameter("authentication-provider", "org.camunda.bpm.engine.rest.security.auth.impl.HttpBasicAuthenticationProvider"); } @@ -46,14 +46,14 @@ public FilterRegistrationBean processEngineAuthenticationFilter() { } @Bean - @ConditionalOnProperty(name = "enabled", havingValue = "true", prefix = CamundaCorsProperty.PREFIX) + @ConditionalOnProperty(name = "enabled", havingValue = "true", prefix = CamundaBpmRunCorsProperty.PREFIX) public FilterRegistrationBean corsFilter() throws ServletException { FilterRegistrationBean registration = new FilterRegistrationBean<>(); registration.setName("camunda-cors"); CorsFilter corsFilter = new CorsFilter(); registration.setFilter(corsFilter); registration.addUrlPatterns("/rest/*"); - registration.addInitParameter(CorsFilter.PARAM_CORS_ALLOWED_ORIGINS, camundaRestDistroProperties.getCors().getAllowedOrigins()); + registration.addInitParameter(CorsFilter.PARAM_CORS_ALLOWED_ORIGINS, camundaBpmRunProperties.getCors().getAllowedOrigins()); return registration; } } diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaAuthenticationProperty.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java similarity index 74% rename from distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaAuthenticationProperty.java rename to distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java index 7675f364c4c..11990a70f4a 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaAuthenticationProperty.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunAuthenticationProperties.java @@ -1,11 +1,11 @@ -package org.camunda.bpm.rest.distro.property; +package org.camunda.bpm.run.property; import java.util.Arrays; import java.util.List; -public class CamundaAuthenticationProperty { +public class CamundaBpmRunAuthenticationProperties { - public static final String PREFIX = CamundaRestDistroProperties.PREFIX + ".auth"; + public static final String PREFIX = CamundaBpmRunProperties.PREFIX + ".auth"; public static final String DEFAULT_AUTH = "basic"; public static final List AUTH_METHODS = Arrays.asList(DEFAULT_AUTH); @@ -33,6 +33,6 @@ public void setAuthentication(String authentication) { @Override public String toString() { - return "CamundaAuthenticationProperty [enabled=" + enabled + ", authentication=" + authentication + "]"; + return "CamundaBpmRunAuthenticationProperties [enabled=" + enabled + ", authentication=" + authentication + "]"; } } diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaCorsProperty.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java similarity index 67% rename from distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaCorsProperty.java rename to distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java index 129216a8611..1841397f4b7 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaCorsProperty.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunCorsProperty.java @@ -1,8 +1,8 @@ -package org.camunda.bpm.rest.distro.property; +package org.camunda.bpm.run.property; -public class CamundaCorsProperty { +public class CamundaBpmRunCorsProperty { - public static final String PREFIX = CamundaRestDistroProperties.PREFIX + ".cors"; + public static final String PREFIX = CamundaBpmRunProperties.PREFIX + ".cors"; public static final String DEFAULT_ORIGINS = "*"; boolean enabled; @@ -29,6 +29,6 @@ public void setAllowedOrigins(String allowedOrigins) { @Override public String toString() { - return "CamundaCorsProperty [enabled=" + enabled + ", allowedOrigins=" + allowedOrigins + "]"; + return "CamundaBpmRunCorsProperty [enabled=" + enabled + ", allowedOrigins=" + allowedOrigins + "]"; } } \ No newline at end of file diff --git a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaRestDistroProperties.java b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java similarity index 51% rename from distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaRestDistroProperties.java rename to distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java index 4e772070c45..0a3f6e19a53 100644 --- a/distro/run/distro/src/main/java/org/camunda/bpm/rest/distro/property/CamundaRestDistroProperties.java +++ b/distro/run/distro/src/main/java/org/camunda/bpm/run/property/CamundaBpmRunProperties.java @@ -1,33 +1,33 @@ -package org.camunda.bpm.rest.distro.property; +package org.camunda.bpm.run.property; import org.camunda.bpm.spring.boot.starter.property.CamundaBpmProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -@ConfigurationProperties(CamundaRestDistroProperties.PREFIX) -public class CamundaRestDistroProperties { +@ConfigurationProperties(CamundaBpmRunProperties.PREFIX) +public class CamundaBpmRunProperties { + + public static final String PREFIX = CamundaBpmProperties.PREFIX + ".run"; - public static final String PREFIX = CamundaBpmProperties.PREFIX + ".rest-distro"; - @NestedConfigurationProperty - private CamundaAuthenticationProperty auth = new CamundaAuthenticationProperty(); + private CamundaBpmRunAuthenticationProperties auth = new CamundaBpmRunAuthenticationProperties(); @NestedConfigurationProperty - private CamundaCorsProperty cors = new CamundaCorsProperty(); + private CamundaBpmRunCorsProperty cors = new CamundaBpmRunCorsProperty(); - public CamundaAuthenticationProperty getAuth() { + public CamundaBpmRunAuthenticationProperties getAuth() { return auth; } - public void setAuth(CamundaAuthenticationProperty auth) { + public void setAuth(CamundaBpmRunAuthenticationProperties auth) { this.auth = auth; } - public CamundaCorsProperty getCors() { + public CamundaBpmRunCorsProperty getCors() { return cors; } - public void setCors(CamundaCorsProperty cors) { + public void setCors(CamundaBpmRunCorsProperty cors) { this.cors = cors; } diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/AbstractRestTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java similarity index 86% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/AbstractRestTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java index bdc59a80b7d..ec80a04a703 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/AbstractRestTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/AbstractRestTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.rest.distro.test; +package org.camunda.bpm.run.test; import java.util.Collections; -import org.camunda.bpm.rest.distro.CamundaRestDistro; -import org.camunda.bpm.rest.distro.test.util.LoggingInterceptor; +import org.camunda.bpm.run.CamundaBpmRun; +import org.camunda.bpm.run.test.util.LoggingInterceptor; import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { CamundaRestDistro.class }, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = { CamundaBpmRun.class }, webEnvironment = WebEnvironment.RANDOM_PORT) @ActiveProfiles(profiles = { "test-auth-disabled" }) public abstract class AbstractRestTest { diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/AbstractCorsConfigurationTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/AbstractCorsConfigurationTest.java similarity index 91% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/AbstractCorsConfigurationTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/AbstractCorsConfigurationTest.java index 4572f77d161..ba8fa5e7fab 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/AbstractCorsConfigurationTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/AbstractCorsConfigurationTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.rest.distro.test.config.cors; +package org.camunda.bpm.run.test.config.cors; -import org.camunda.bpm.rest.distro.test.AbstractRestTest; +import org.camunda.bpm.run.test.AbstractRestTest; import org.junit.Before; import org.springframework.test.context.ActiveProfiles; diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationDisabledTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java similarity index 89% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationDisabledTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java index 813ca75a0d0..a835172dc4a 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationDisabledTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationDisabledTest.java @@ -1,10 +1,10 @@ -package org.camunda.bpm.rest.distro.test.config.cors; +package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.camunda.bpm.rest.distro.property.CamundaCorsProperty; +import org.camunda.bpm.run.property.CamundaBpmRunCorsProperty; import org.junit.Ignore; import org.junit.Test; import org.springframework.http.HttpEntity; @@ -14,7 +14,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = { CamundaCorsProperty.PREFIX + ".enabled=false" }) +@TestPropertySource(properties = { CamundaBpmRunCorsProperty.PREFIX + ".enabled=false" }) public class CorsConfigurationDisabledTest extends AbstractCorsConfigurationTest { @Test diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java similarity index 90% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java index 08fbf7a2147..66565d3438b 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledAllowedOriginConfiguredTest.java @@ -1,10 +1,10 @@ -package org.camunda.bpm.rest.distro.test.config.cors; +package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.camunda.bpm.rest.distro.property.CamundaCorsProperty; +import org.camunda.bpm.run.property.CamundaBpmRunCorsProperty; import org.junit.Test; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -13,7 +13,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {CamundaCorsProperty.PREFIX + ".allowed-origins=http://other.origin:8081"}) +@TestPropertySource(properties = {CamundaBpmRunCorsProperty.PREFIX + ".allowed-origins=http://other.origin:8081"}) public class CorsConfigurationEnabledAllowedOriginConfiguredTest extends AbstractCorsConfigurationTest { @Test diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledWildcardTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java similarity index 96% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledWildcardTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java index f0dd0704637..ae48c454835 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/cors/CorsConfigurationEnabledWildcardTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/cors/CorsConfigurationEnabledWildcardTest.java @@ -1,4 +1,4 @@ -package org.camunda.bpm.rest.distro.test.config.cors; +package org.camunda.bpm.run.test.config.cors; import static org.assertj.core.api.Assertions.assertThat; diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/https/HttpsConfigurationEnabledTest.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java similarity index 88% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/https/HttpsConfigurationEnabledTest.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java index fc452bc1024..ccdb2ad5cce 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/config/https/HttpsConfigurationEnabledTest.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.rest.distro.test.config.https; +package org.camunda.bpm.run.test.config.https; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.camunda.bpm.rest.distro.CamundaRestDistro; -import org.camunda.bpm.rest.distro.test.AbstractRestTest; -import org.camunda.bpm.rest.distro.test.util.TestUtils; +import org.camunda.bpm.run.CamundaBpmRun; +import org.camunda.bpm.run.test.AbstractRestTest; +import org.camunda.bpm.run.test.util.TestUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -36,7 +36,7 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.web.client.ResourceAccessException; -@SpringBootTest(classes = { CamundaRestDistro.class }, webEnvironment = WebEnvironment.DEFINED_PORT) +@SpringBootTest(classes = { CamundaBpmRun.class }, webEnvironment = WebEnvironment.DEFINED_PORT) @ActiveProfiles(profiles = { "test-https-enabled" }, inheritProfiles = true) public class HttpsConfigurationEnabledTest extends AbstractRestTest { diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/LoggingInterceptor.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java similarity index 97% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/LoggingInterceptor.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java index 3d36419e71a..8209bef930c 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/LoggingInterceptor.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/LoggingInterceptor.java @@ -1,4 +1,4 @@ -package org.camunda.bpm.rest.distro.test.util; +package org.camunda.bpm.run.test.util; import java.io.IOException; diff --git a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/TestUtils.java b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java similarity index 97% rename from distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/TestUtils.java rename to distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java index cf3f3dc5810..034a1205d46 100644 --- a/distro/run/distro/src/test/java/org/camunda/bpm/rest/distro/test/util/TestUtils.java +++ b/distro/run/distro/src/test/java/org/camunda/bpm/run/test/util/TestUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.bpm.rest.distro.test.util; +package org.camunda.bpm.run.test.util; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; diff --git a/distro/run/distro/src/test/resources/application-test-auth-disabled.yml b/distro/run/distro/src/test/resources/application-test-auth-disabled.yml index 03314cdb4f3..68edef75043 100644 --- a/distro/run/distro/src/test/resources/application-test-auth-disabled.yml +++ b/distro/run/distro/src/test/resources/application-test-auth-disabled.yml @@ -1,3 +1 @@ -camunda.bpm: - rest-distro: - auth.enabled: false \ No newline at end of file +camunda.bpm.run.auth.enabled: false \ No newline at end of file diff --git a/distro/run/distro/src/test/resources/application-test-cors-enabled.yml b/distro/run/distro/src/test/resources/application-test-cors-enabled.yml index 7d3fd16f69b..70af4c8d59a 100644 --- a/distro/run/distro/src/test/resources/application-test-cors-enabled.yml +++ b/distro/run/distro/src/test/resources/application-test-cors-enabled.yml @@ -1,3 +1 @@ -camunda.bpm: - rest-distro: - cors.enabled: true \ No newline at end of file +camunda.bpm.run.cors.enabled: true \ No newline at end of file diff --git a/distro/run/modules/pom.xml b/distro/run/modules/pom.xml index 0b9c9e8fe9a..464bcf6d2b7 100644 --- a/distro/run/modules/pom.xml +++ b/distro/run/modules/pom.xml @@ -5,20 +5,24 @@ 4.0.0 - org.camunda.bpm - camunda-rest-distro-bom - 1.0-SNAPSHOT - ../bom + org.camunda.bpm.run + camunda-bpm-run-root + 7.13.0-SNAPSHOT + .. - camunda-rest-distro-modules - camunda BPM Rest Distro - Modules + camunda-bpm-run-modules + Camunda BPM Run - Modules pom rest + diff --git a/distro/run/modules/rest/pom.xml b/distro/run/modules/rest/pom.xml index d63db8cf77b..111f51c121f 100644 --- a/distro/run/modules/rest/pom.xml +++ b/distro/run/modules/rest/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - org.camunda.bpm - camunda-rest-distro-modules - 1.0-SNAPSHOT + org.camunda.bpm.run + camunda-bpm-run-modules + 7.13.0-SNAPSHOT .. - camunda-rest-distro-rest - camunda BPM Rest Distro - Module REST + camunda-bpm-run-modules-rest + Camunda BPM Run - Module REST pom diff --git a/distro/run/modules/webapps/community/pom.xml b/distro/run/modules/webapps/community/pom.xml index 3087701819f..5a4475ecfe3 100644 --- a/distro/run/modules/webapps/community/pom.xml +++ b/distro/run/modules/webapps/community/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - org.camunda.bpm - camunda-rest-distro-modules - 1.0-SNAPSHOT + org.camunda.bpm.run + camunda-bpm-run-modules + 7.13.0-SNAPSHOT ../.. - camunda-rest-distro-webapps - camunda BPM Rest Distro - Module Webapps + camunda-bpm-run-modules-webapps + camunda BPM Run - Module Webapps pom diff --git a/distro/run/modules/webapps/enterprise/pom.xml b/distro/run/modules/webapps/enterprise/pom.xml index 94781c8876d..1020522f38a 100644 --- a/distro/run/modules/webapps/enterprise/pom.xml +++ b/distro/run/modules/webapps/enterprise/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - org.camunda.bpm - camunda-rest-distro-modules - 1.0-SNAPSHOT + org.camunda.bpm.run + camunda-bpm-run-modules + 7.13.0-SNAPSHOT ../.. - camunda-rest-distro-webapps-ee - camunda BPM Rest Distro - Module Webapps Enterprise + camunda-bpm-run-modules-webapps-ee + Camunda BPM Run - Module Webapps Enterprise pom diff --git a/distro/run/modules/webapps/pom.xml b/distro/run/modules/webapps/pom.xml deleted file mode 100644 index 8b0d97d2bb4..00000000000 --- a/distro/run/modules/webapps/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - - org.camunda.bpm - camunda-rest-distro-modules - 1.0-SNAPSHOT - .. - - - camunda-rest-distro-webapps - camunda BPM Rest Distro - Webapps Module - pom - - - - ce - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - ce - package - - copy-dependencies - - - ${project.build.directory}/dependency-ce - - - - - - - - - ee - - - - org.apache.maven.plugins - maven-dependency-plugin - - - ee - package - - copy-dependencies - - - - - org.camunda.bpm.springboot - camunda-bpm-spring-boot-starter-webapp-ee - - - - ${project.build.directory}/dependency-ee - - - - - - - - - - \ No newline at end of file diff --git a/distro/run/pom.xml b/distro/run/pom.xml index 9d1ddf4a011..057d9cc063a 100644 --- a/distro/run/pom.xml +++ b/distro/run/pom.xml @@ -12,18 +12,89 @@ - org.camunda.bpm - camunda-rest-distro-root - camunda BPM Rest Distro - Root - This is the root project of the Camunda BPM REST Distro - 1.0-SNAPSHOT + org.camunda.bpm.run + camunda-bpm-run-root + Camunda BPM Run - Root + This is the root of Camunda BPM Run + 7.13.0-SNAPSHOT pom - bom modules distro + + + 2.2.1.RELEASE + + 3.5.0-SNAPSHOT + + + + + + + org.springframework.boot + spring-boot-dependencies + ${version.spring.boot} + import + pom + + + + + org.camunda.bpm + camunda-bom + ${project.version} + import + pom + + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter + ${version.starter} + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-rest + ${version.starter} + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp + ${version.starter} + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-webapp-ee + ${version.starter} + + + + org.camunda.bpm.springboot + camunda-bpm-spring-boot-starter-test + ${version.starter} + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${version.spring.boot} + + + +