diff --git a/.travis.yml b/.travis.yml index 554555ba7..842caf34b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,14 +100,13 @@ jobs: && ( cd web && npm run build:prod-silent ) && mvn -q install -T 4C -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot,:taskana-cdi && mvn -q prepare-package -pl :taskana-rest-spring - && mvn -q install -f history -T 4C -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-simplehistory-rest-spring-example + && mvn -q install -f history -T 4C -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-simplehistory-rest-spring && mvn -q install -P history.plugin -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot before_script: ci/verify_docs_jar.sh 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-boot,!:taskana-rest-spring-example-wildfly,\ - !:taskana-simplehistory-rest-spring-example + !:taskana-rest-spring-example-boot,!:taskana-rest-spring-example-wildfly before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" # travis_terminate is necessary since after_success is a job phase which can change the build result. # it is not documented, so this is a little hack. see: https://docs.travis-ci.com/user/job-lifecycle/#breaking-the-build diff --git a/history/pom.xml b/history/pom.xml index 30847eac8..e6ba5ea1b 100644 --- a/history/pom.xml +++ b/history/pom.xml @@ -18,7 +18,6 @@ taskana-simplehistory-provider taskana-simplehistory-rest-spring - taskana-simplehistory-rest-spring-example taskana-loghistory-provider diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml deleted file mode 100644 index c9631b22e..000000000 --- a/history/taskana-simplehistory-rest-spring-example/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 4.0.0 - taskana-simplehistory-rest-spring-example - - ${project.groupId}:${project.artifactId} - Demo project for taskana-simplehistory-rest-spring - - - pro.taskana.history - taskana-history-parent - 4.1.1-SNAPSHOT - ../pom.xml - - - - - pro.taskana.history - taskana-simplehistory-rest-spring - ${project.version} - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.plugin - spring-plugin-core - ${version.spring.core} - - - com.h2database - h2 - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-test - test - - - org.springframework - spring-test - test - - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.maven.resources} - - - copy-documentation-to-static-folder - prepare-package - - copy-resources - - - - ${project.build.outputDirectory}/static/docs/rest - - - - - ../taskana-simplehistory-rest-spring/target/generated-docs - - - - - - - - - - diff --git a/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/ExampleRestApplication.java b/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/ExampleRestApplication.java deleted file mode 100644 index aac662680..000000000 --- a/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/ExampleRestApplication.java +++ /dev/null @@ -1,59 +0,0 @@ -package pro.taskana.simplehistory.rest; - -import java.sql.SQLException; -import javax.sql.DataSource; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.DependsOn; -import org.springframework.context.annotation.Primary; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; - -import pro.taskana.simplehistory.rest.sampledata.SampleDataGenerator; - -/** Example Application showing the implementation of taskana-rest-spring. */ -@SpringBootApplication -public class ExampleRestApplication { - - @Value("${taskana.schemaName:TASKANA}") - public String schemaName; - - private SampleDataGenerator sampleDataGenerator; - - public static void main(String[] args) { - SpringApplication.run(ExampleRestApplication.class, args); - } - - @Bean - @Primary - @ConfigurationProperties(prefix = "datasource") - public DataSourceProperties dataSourceProperties() { - DataSourceProperties props = new DataSourceProperties(); - props.setUrl( - "jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE SCHEMA IF NOT EXISTS " - + schemaName); - return props; - } - - @Bean - public DataSource dataSource(DataSourceProperties properties) { - return properties.initializeDataSourceBuilder().build(); - } - - @Bean - public PlatformTransactionManager txManager(DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - @Bean - @DependsOn("getTaskanaEngine") // generate sample data after schema was inserted - public SampleDataGenerator generateSampleData(DataSource dataSource) throws SQLException { - sampleDataGenerator = new SampleDataGenerator(dataSource); - sampleDataGenerator.generateSampleData(schemaName); - return sampleDataGenerator; - } -} diff --git a/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/WebMvcConfig.java b/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/WebMvcConfig.java deleted file mode 100644 index de6c6913c..000000000 --- a/history/taskana-simplehistory-rest-spring-example/src/main/java/pro/taskana/simplehistory/rest/WebMvcConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package pro.taskana.simplehistory.rest; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** The Web MVC Configuration. */ -@Configuration -@EnableWebMvc -public class WebMvcConfig implements WebMvcConfigurer { - - private static final String[] CLASSPATH_RESOURCE_LOCATIONS = { - "classpath:/META-INF/resources/", "classpath:/resources/", - "classpath:/static/", "classpath:/public/" - }; - - private ObjectMapper objectMapper; - - WebMvcConfig(ObjectMapper objectMapper) { - this.objectMapper = objectMapper; - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - if (!registry.hasMappingForPattern("/webjars/**")) { - registry - .addResourceHandler("/webjars/**") - .addResourceLocations("classpath:/META-INF/resources/webjars/"); - } - if (!registry.hasMappingForPattern("/**")) { - registry.addResourceHandler("/**").addResourceLocations(CLASSPATH_RESOURCE_LOCATIONS); - } - } - - @Override - public void extendMessageConverters(List> converters) { - for (HttpMessageConverter converter : converters) { - if (converter instanceof MappingJackson2HttpMessageConverter) { - MappingJackson2HttpMessageConverter jacksonConverter = - (MappingJackson2HttpMessageConverter) converter; - jacksonConverter.setPrettyPrint(true); - } - } - } - - @PostConstruct - public void enableObjectIndent() { - objectMapper.enable(SerializationFeature.INDENT_OUTPUT); - } -} diff --git a/history/taskana-simplehistory-rest-spring-example/src/main/resources/application.properties b/history/taskana-simplehistory-rest-spring-example/src/main/resources/application.properties deleted file mode 100644 index b570b787e..000000000 --- a/history/taskana-simplehistory-rest-spring-example/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -logging.level.pro.taskana=DEBUG -taskana.schemaName=TASKANA - -spring.main.allow-bean-definition-overriding=true -