From 51f257b6f0bde3fffa5dae59d62ed80295a4d1b4 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Sun, 5 May 2019 20:16:52 +0200 Subject: [PATCH] TSK-850: reconfigured taskana-cdi --- lib/taskana-cdi/pom.xml | 170 ++---------------- .../java/pro/taskana/TaskanaProducers.java | 9 +- .../java/pro/taskana/RestApplication.java | 3 + .../src/test/java/pro/taskana/TaskanaEjb.java | 3 + .../pro/taskana/TaskanaProducersTest.java | 3 + .../java/pro/taskana/TaskanaRestTest.java | 9 +- pom.xml | 2 + 7 files changed, 36 insertions(+), 163 deletions(-) diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index eec14f5f8..f9a8614b8 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -1,140 +1,19 @@ - + 4.0.0 - pro.taskana taskana-cdi - 1.1.3-SNAPSHOT ${project.groupId}:${project.artifactId} http://taskana.pro + The helper module to integrate taskana into CDI projects. - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + taskana-lib-parent + pro.taskana + 1.1.2-SNAPSHOT + .. + - - - Holger Hagen - holger.hagen@novatec-gmbh.de - NovaTec Consulting GmbH - https://www.novatec-gmbh.de - - - - - scm:git:git://github.com/taskana/taskana.git - scm:git:ssh://github.com:taskana/taskana.git - http://github.com/taskana/taskana/tree/master - - - - 1.8 - 1.8 - UTF-8 - 2017.4.0 - 3.1.2.Final - - - - - snapshot - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - false - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - false - - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - - - org.wildfly.swarm - bom - ${version.wildfly.swarm} - import - pom - - - org.jboss.arquillian - arquillian-bom - 1.1.10.Final - pom - import - - - jboss @@ -162,11 +41,13 @@ org.wildfly.swarm + ${version.wildfly.swarm} jaxrs test org.wildfly.swarm + ${version.wildfly.swarm} cdi test @@ -186,12 +67,14 @@ org.wildfly.swarm arquillian + ${version.wildfly.swarm} test org.jboss.arquillian.junit arquillian-junit-container + 1.1.10.Final test @@ -209,33 +92,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - The helper module to integrate taskana into CDI projects. \ No newline at end of file diff --git a/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java b/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java index 1c88fc3e8..c2fc28130 100644 --- a/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java +++ b/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java @@ -19,10 +19,13 @@ import org.slf4j.LoggerFactory; import pro.taskana.configuration.TaskanaEngineConfiguration; +/** + * TODO. + */ @ApplicationScoped public class TaskanaProducers { - private static final Logger logger = LoggerFactory.getLogger(TaskanaProducers.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaProducers.class); private static final String TASKANA_PROPERTIES = "taskana.properties"; @@ -43,10 +46,10 @@ public class TaskanaProducers { ctx = new InitialContext(); properties.load(propertyStream); dataSource = (DataSource) ctx.lookup(properties.getProperty("datasource.jndi")); - logger.debug("---------------> " + dataSource.getConnection().getMetaData()); + LOGGER.debug("---------------> " + dataSource.getConnection().getMetaData()); this.taskanaEngineConfiguration = new TaskanaEngineConfiguration(dataSource, true, false, "TASKANA"); } catch (NamingException | SQLException | IOException e) { - logger.error("Could not start Taskana: ", e); + LOGGER.error("Could not start Taskana: ", e); } } diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java b/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java index 3a1e6d4dc..e9db78234 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java @@ -3,6 +3,9 @@ package pro.taskana; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; +/** + * TODO Why does this test exist? + */ @ApplicationPath("/rest") public class RestApplication extends Application { } diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java index 5afb3e1fe..f90180d05 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java @@ -9,6 +9,9 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; +/** + * TODO. + */ @Stateless public class TaskanaEjb { diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java index 4ee03a735..09b546acc 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java @@ -19,6 +19,9 @@ import org.wildfly.swarm.Swarm; import org.wildfly.swarm.arquillian.CreateSwarm; import org.wildfly.swarm.undertow.WARArchive; +/** + * TODO. + */ @RunWith(Arquillian.class) public class TaskanaProducersTest { diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java index fe5cd5232..8f35df6ba 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java @@ -25,10 +25,13 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; +/** + * TODO. + */ @Path("/test") public class TaskanaRestTest { - private static final Logger logger = LoggerFactory.getLogger(TaskanaRestTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaRestTest.class); @EJB private TaskanaEjb taskanaEjb; @@ -59,7 +62,7 @@ public class TaskanaRestTest { Task result = taskanaEjb.getTaskService().createTask(task); - logger.info(result.getId() + ":" + result.getOwner()); + LOGGER.info(result.getId() + ":" + result.getOwner()); return Response.status(200).entity(result.getId()).build(); } @@ -75,7 +78,7 @@ public class TaskanaRestTest { @Path("{id}") public void completeTask(@PathParam("id") String id) throws TaskNotFoundException, InvalidOwnerException, InvalidStateException, NotAuthorizedException { - logger.info(id); + LOGGER.info(id); taskanaEjb.getTaskService().forceCompleteTask(id); } diff --git a/pom.xml b/pom.xml index b57c94036..9671fdc95 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,8 @@ 1.8 UTF-8 1.7.1 + 2017.4.0 + 3.1.2.Final