diff --git a/rest/pom.xml b/rest/pom.xml index 72468792f..e79ab2dc1 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -16,8 +16,8 @@ taskana-rest-spring ../web taskana-rest-spring-base + taskana-rest-spring-test taskana-rest-spring-example taskana-rest-spring-wildfly-example - taskana-rest-spring-test diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml index 2789f8e2c..7b5401e28 100644 --- a/rest/taskana-rest-spring-example/pom.xml +++ b/rest/taskana-rest-spring-example/pom.xml @@ -137,6 +137,35 @@ + + + + maven-resources-plugin + + + copy-documentation-to-static-folder + prepare-package + + copy-resources + + + + ${project.build.outputDirectory}/static/docs/rest + + + + + ../taskana-rest-spring-test/target/generated-docs + + + + + + + + + + diff --git a/rest/taskana-rest-spring-example/src/test/java/.gitkeep b/rest/taskana-rest-spring-example/src/test/java/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/rest/taskana-rest-spring-example/src/test/resources/.gitkeep b/rest/taskana-rest-spring-example/src/test/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/rest/taskana-rest-spring-example/src/test/resources/application.properties b/rest/taskana-rest-spring-example/src/test/resources/application.properties deleted file mode 100644 index 7d96c3b42..000000000 --- a/rest/taskana-rest-spring-example/src/test/resources/application.properties +++ /dev/null @@ -1,32 +0,0 @@ -logging.level.pro.taskana=INFO -### logging.level.org.springframework=DEBUG -######## Taskana DB ####### -datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0 -datasource.driverClassName=org.h2.Driver -datasource.username=sa -datasource.password=sa -taskana.schemaName=TASKANA - -####### control LDAP usage -taskana.ldap.useLdap=false -####### properties to connect to LDAP -taskana.ldap.serverUrl=ldap://localhost:10389 -taskana.ldap.bindDn=uid=admin,ou=system -taskana.ldap.bindPassword=secret -taskana.ldap.baseDn=o=TaskanaTest -####### properties that control search for users and groups -taskana.ldap.userSearchBase=ou=people -taskana.ldap.userSearchFilterName=objectclass -taskana.ldap.userSearchFilterValue=person -taskana.ldap.userFirstnameAttribute=givenName -taskana.ldap.userLastnameAttribute=sn -taskana.ldap.userIdAttribute=uid -taskana.ldap.groupSearchBase=ou=groups -taskana.ldap.groupSearchFilterName=objectclass -taskana.ldap.groupSearchFilterValue=groupOfUniqueNames -taskana.ldap.groupNameAttribute=cn -taskana.ldap.minSearchForLength=3 -taskana.ldap.maxNumberOfReturnedAccessIds=50 - -####### JobScheduler cron expression that specifies when the JobSchedler runs -taskana.jobscheduler.async.cron=0/5 * * * * * diff --git a/rest/taskana-rest-spring-test/pom.xml b/rest/taskana-rest-spring-test/pom.xml index ec3caa1d8..da28457e7 100644 --- a/rest/taskana-rest-spring-test/pom.xml +++ b/rest/taskana-rest-spring-test/pom.xml @@ -13,7 +13,7 @@ 4.0.0 jar taskana-rest-spring-test - 1.0.8-SNAPSHOT + 1.1.1-SNAPSHOT UTF-8 @@ -57,7 +57,7 @@ pro.taskana.simplehistory taskana-simplehistory-provider - 0.0.6 + 0.0.9 @@ -134,14 +134,9 @@ - ${project.build.outputDirectory}/static/docs/rest + ${project.build.directory}/generated-docs - - - ${project.build.directory}/generated-docs - - ${project.basedir}/src/js diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/HistoryPluginLoaderTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/HistoryPluginLoaderTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/HistoryPluginLoaderTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/HistoryPluginLoaderTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/ldap/LdapTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/ldap/LdapTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java similarity index 98% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java index a7a2a9a3d..33b43c58b 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java +++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java @@ -36,12 +36,11 @@ import pro.taskana.rest.resource.AccessIdResource; /** * Test AccessIdValidation. - * */ @RunWith(SpringRunner.class) @SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "devMode=true"}) -public class AccessIdValidationControllerTest { +public class AccessIdValidationControllerIntTest { @LocalServerPort int port; diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java similarity index 100% rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml index 752ca0b72..83ecaaf72 100644 --- a/rest/taskana-rest-spring-wildfly-example/pom.xml +++ b/rest/taskana-rest-spring-wildfly-example/pom.xml @@ -273,6 +273,30 @@ + + maven-resources-plugin + + + copy-documentation-to-static-folder + prepare-package + + copy-resources + + + + ${project.build.outputDirectory}/static/docs/rest + + + + + ../taskana-rest-spring-test/target/generated-docs + + + + + + + \ No newline at end of file