diff --git a/.travis.yml b/.travis.yml index dfed60de4..705334a87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,11 +93,11 @@ matrix: && mvn -q install -T 4C -am -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-test && mvn -q prepare-package -pl :taskana-rest-spring-test && mvn -q install -f history -T 4C -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-simplehistory-rest-spring-example - && mvn -q install -P history.plugin -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example + && mvn -q install -P history.plugin -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot script: | mvn deploy -T 4C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \ --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip -pl !:taskana-spring-example,!:taskana-cdi-example,\ - !:taskana-rest-spring-example,!:taskana-rest-spring-test,!:taskana-rest-spring-wildfly-example,\ + !:taskana-rest-spring-example-boot,!:taskana-rest-spring-test,!:taskana-rest-spring-example-wildfly,\ !:taskana-simplehistory-spring-test,!:taskana-simplehistory-rest-spring-example before_cache: rm -rf $HOME/.m2/repository/pro/taskana after_success: ci/change_version.sh -i -m . && ci/commitPoms.sh diff --git a/ci/test.sh b/ci/test.sh index 8f09ec2a4..b2c19e494 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -43,12 +43,12 @@ function main() { set -x eval "$REL/prepare_db.sh '$1'" ### INSTALL ### - mvn -q install -B -f $REL/.. -P postgres -am -T 4C -pl :taskana-rest-spring-wildfly-example -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip + mvn -q install -B -f $REL/.. -P postgres -am -T 4C -pl :taskana-rest-spring-example-wildfly -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip ### TEST ### mvn -q verify -B -f $REL/.. -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-core # Same as above (H2) we can not use the fancy '-f' maven option - (cd $REL/.. && mvn -q verify -B -pl :taskana-rest-spring-wildfly-example -P postgres -Dmaven.javadoc.skip -Dcheckstyle.skip) + (cd $REL/.. && mvn -q verify -B -pl :taskana-rest-spring-example-wildfly -P postgres -Dmaven.javadoc.skip -Dcheckstyle.skip) ;; HISTORY) set -x diff --git a/manifest.yml b/manifest.yml index 13c585f3f..c3201d916 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,7 +1,7 @@ # Configuration file for Cloud Foundry, see https://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html applications: - name: taskana-rest - path: rest/taskana-rest-spring-example/target/taskana-rest-spring-example.jar + path: rest/taskana-rest-spring-example-boot/target/taskana-rest-spring-example-boot.jar buildpacks: - https://github.com/cloudfoundry/java-buildpack.git memory: 640M diff --git a/rest/pom.xml b/rest/pom.xml index 12c44f7d8..5a9eeeb12 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -17,9 +17,9 @@ taskana-rest-spring ../web - taskana-rest-spring-base + taskana-rest-spring-example-common taskana-rest-spring-test - taskana-rest-spring-example - taskana-rest-spring-wildfly-example + taskana-rest-spring-example-boot + taskana-rest-spring-example-wildfly diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example-boot/pom.xml similarity index 98% rename from rest/taskana-rest-spring-example/pom.xml rename to rest/taskana-rest-spring-example-boot/pom.xml index 75c05a8ad..bb594a830 100644 --- a/rest/taskana-rest-spring-example/pom.xml +++ b/rest/taskana-rest-spring-example-boot/pom.xml @@ -3,7 +3,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - taskana-rest-spring-example + taskana-rest-spring-example-boot ${project.groupId}:${project.artifactId} Demo project for taskana-rest-spring @@ -69,7 +69,7 @@ pro.taskana - taskana-rest-spring-base + taskana-rest-spring-example-common ${project.version} diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/ExampleRestApplication.java b/rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java similarity index 100% rename from rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/ExampleRestApplication.java rename to rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java diff --git a/rest/taskana-rest-spring-example/src/main/resources/TaskanaTest.ldif b/rest/taskana-rest-spring-example-boot/src/main/resources/TaskanaTest.ldif similarity index 100% rename from rest/taskana-rest-spring-example/src/main/resources/TaskanaTest.ldif rename to rest/taskana-rest-spring-example-boot/src/main/resources/TaskanaTest.ldif diff --git a/rest/taskana-rest-spring-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/application.properties similarity index 100% rename from rest/taskana-rest-spring-example/src/main/resources/application.properties rename to rest/taskana-rest-spring-example-boot/src/main/resources/application.properties diff --git a/rest/taskana-rest-spring-example/src/main/resources/taskana.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties similarity index 100% rename from rest/taskana-rest-spring-example/src/main/resources/taskana.properties rename to rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties diff --git a/rest/taskana-rest-spring-base/pom.xml b/rest/taskana-rest-spring-example-common/pom.xml similarity index 97% rename from rest/taskana-rest-spring-base/pom.xml rename to rest/taskana-rest-spring-example-common/pom.xml index f0778c28c..1d133e0c8 100644 --- a/rest/taskana-rest-spring-base/pom.xml +++ b/rest/taskana-rest-spring-example-common/pom.xml @@ -3,7 +3,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - taskana-rest-spring-base + taskana-rest-spring-example-common ${project.groupId}:${project.artifactId} groups the minimum required configuration for a taskana REST APP diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/jobs/JobScheduler.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/jobs/JobScheduler.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/jobs/TransactionalJobsConfiguration.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/TransactionalJobsConfiguration.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/jobs/TransactionalJobsConfiguration.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/TransactionalJobsConfiguration.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/ldap/LdapCacheTestImpl.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/WebMvcConfig.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/WebMvcConfig.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/WebMvcConfig.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/controllers/LoginController.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/LoginController.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/controllers/LoginController.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/LoginController.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/controllers/ViewController.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/controllers/ViewController.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/models/User.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/models/User.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/models/User.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/SampleLoginModule.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/SampleLoginModule.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/SampleRoleGranter.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleRoleGranter.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/SampleRoleGranter.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleRoleGranter.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java diff --git a/rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java similarity index 100% rename from rest/taskana-rest-spring-base/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java rename to rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java diff --git a/rest/taskana-rest-spring-base/src/main/resources/pss_jaas.config b/rest/taskana-rest-spring-example-common/src/main/resources/pss_jaas.config similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/pss_jaas.config rename to rest/taskana-rest-spring-example-common/src/main/resources/pss_jaas.config diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/attachment.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/attachment.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/attachment.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/attachment.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/check-history-event-exist.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/check-history-event-exist.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/check-history-event-exist.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/check-history-event-exist.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/classification.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/classification.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/classification.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/classification.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/clear-db.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/clear-db.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/clear-db.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/clear-db.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/clear-history-events.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/clear-history-events.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/clear-history-events.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/clear-history-events.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/distribution-targets.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/distribution-targets.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/distribution-targets.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/distribution-targets.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/drop-tables.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/drop-tables.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/drop-tables.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/drop-tables.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/history-event.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/history-event.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/history-event.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/history-event.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/object-reference.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/object-reference.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/object-reference.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/object-reference.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/task.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/task.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/task.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/task.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/workbasket-access-list.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/workbasket-access-list.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/workbasket-access-list.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/workbasket-access-list.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/workbasket.sql b/rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/workbasket.sql similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/sql/sample-data/workbasket.sql rename to rest/taskana-rest-spring-example-common/src/main/resources/sql/sample-data/workbasket.sql diff --git a/rest/taskana-rest-spring-base/src/main/resources/static/css/bootstrap/4.1.3/bootstrap.min.css b/rest/taskana-rest-spring-example-common/src/main/resources/static/css/bootstrap/4.1.3/bootstrap.min.css similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/static/css/bootstrap/4.1.3/bootstrap.min.css rename to rest/taskana-rest-spring-example-common/src/main/resources/static/css/bootstrap/4.1.3/bootstrap.min.css diff --git a/rest/taskana-rest-spring-base/src/main/resources/static/css/main.css b/rest/taskana-rest-spring-example-common/src/main/resources/static/css/main.css similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/static/css/main.css rename to rest/taskana-rest-spring-example-common/src/main/resources/static/css/main.css diff --git a/rest/taskana-rest-spring-base/src/main/resources/static/environments/data-sources/environment-information.json b/rest/taskana-rest-spring-example-common/src/main/resources/static/environments/data-sources/environment-information.json similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/static/environments/data-sources/environment-information.json rename to rest/taskana-rest-spring-example-common/src/main/resources/static/environments/data-sources/environment-information.json diff --git a/rest/taskana-rest-spring-base/src/main/resources/static/environments/data-sources/taskana-customization.json b/rest/taskana-rest-spring-example-common/src/main/resources/static/environments/data-sources/taskana-customization.json similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/static/environments/data-sources/taskana-customization.json rename to rest/taskana-rest-spring-example-common/src/main/resources/static/environments/data-sources/taskana-customization.json diff --git a/rest/taskana-rest-spring-base/src/main/resources/static/img/logo.png b/rest/taskana-rest-spring-example-common/src/main/resources/static/img/logo.png similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/static/img/logo.png rename to rest/taskana-rest-spring-example-common/src/main/resources/static/img/logo.png diff --git a/rest/taskana-rest-spring-base/src/main/resources/templates/login.html b/rest/taskana-rest-spring-example-common/src/main/resources/templates/login.html similarity index 100% rename from rest/taskana-rest-spring-base/src/main/resources/templates/login.html rename to rest/taskana-rest-spring-example-common/src/main/resources/templates/login.html diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml similarity index 98% rename from rest/taskana-rest-spring-wildfly-example/pom.xml rename to rest/taskana-rest-spring-example-wildfly/pom.xml index 4e34876f2..666ac8015 100644 --- a/rest/taskana-rest-spring-wildfly-example/pom.xml +++ b/rest/taskana-rest-spring-example-wildfly/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - taskana-rest-spring-wildfly-example + taskana-rest-spring-example-wildfly war ${project.groupId}:${project.artifactId} @@ -62,7 +62,7 @@ pro.taskana - taskana-rest-spring-base + taskana-rest-spring-example-common ${project.version} diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/TaskanaWildFlyApplication.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/TaskanaWildFlyApplication.java rename to rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/TaskanaWildFlyApplication.java diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/ElytronToJaasFilter.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/ElytronToJaasFilter.java similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/ElytronToJaasFilter.java rename to rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/ElytronToJaasFilter.java diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java rename to rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/WildflyWebSecurityConfig.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/WildflyWebSecurityConfig.java similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/java/pro/taskana/wildfly/security/WildflyWebSecurityConfig.java rename to rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/WildflyWebSecurityConfig.java diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/TaskanaTest.ldif b/rest/taskana-rest-spring-example-wildfly/src/main/resources/TaskanaTest.ldif similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/TaskanaTest.ldif rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/TaskanaTest.ldif diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/application-postgres.properties b/rest/taskana-rest-spring-example-wildfly/src/main/resources/application-postgres.properties similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/application-postgres.properties rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/application-postgres.properties diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example-wildfly/src/main/resources/application.properties similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/application.properties rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/application.properties diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/static/environments/data-sources/environment-information.json b/rest/taskana-rest-spring-example-wildfly/src/main/resources/static/environments/data-sources/environment-information.json similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/static/environments/data-sources/environment-information.json rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/static/environments/data-sources/environment-information.json diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/taskana.properties b/rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/taskana.properties rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/resources/templates/login.html b/rest/taskana-rest-spring-example-wildfly/src/main/resources/templates/login.html similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/resources/templates/login.html rename to rest/taskana-rest-spring-example-wildfly/src/main/resources/templates/login.html diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/webapp/WEB-INF/jboss-web.xml b/rest/taskana-rest-spring-example-wildfly/src/main/webapp/WEB-INF/jboss-web.xml similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/webapp/WEB-INF/jboss-web.xml rename to rest/taskana-rest-spring-example-wildfly/src/main/webapp/WEB-INF/jboss-web.xml diff --git a/rest/taskana-rest-spring-wildfly-example/src/main/webapp/WEB-INF/web.xml b/rest/taskana-rest-spring-example-wildfly/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/main/webapp/WEB-INF/web.xml rename to rest/taskana-rest-spring-example-wildfly/src/main/webapp/WEB-INF/web.xml diff --git a/rest/taskana-rest-spring-wildfly-example/src/test/java/pro/taskana/TaskanaWildflyTest.java b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/TaskanaWildflyTest.java similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/test/java/pro/taskana/TaskanaWildflyTest.java rename to rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/TaskanaWildflyTest.java diff --git a/rest/taskana-rest-spring-wildfly-example/src/test/resources/application.properties b/rest/taskana-rest-spring-example-wildfly/src/test/resources/application.properties similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/test/resources/application.properties rename to rest/taskana-rest-spring-example-wildfly/src/test/resources/application.properties diff --git a/rest/taskana-rest-spring-wildfly-example/src/test/resources/project-defaults.yml b/rest/taskana-rest-spring-example-wildfly/src/test/resources/project-defaults.yml similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/test/resources/project-defaults.yml rename to rest/taskana-rest-spring-example-wildfly/src/test/resources/project-defaults.yml diff --git a/rest/taskana-rest-spring-wildfly-example/src/test/resources/taskana.properties b/rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties similarity index 100% rename from rest/taskana-rest-spring-wildfly-example/src/test/resources/taskana.properties rename to rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties diff --git a/rest/taskana-rest-spring-test/pom.xml b/rest/taskana-rest-spring-test/pom.xml index 622de8f68..ad18be822 100644 --- a/rest/taskana-rest-spring-test/pom.xml +++ b/rest/taskana-rest-spring-test/pom.xml @@ -50,7 +50,7 @@ pro.taskana - taskana-rest-spring-base + taskana-rest-spring-example-common ${project.version}