nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33 from BerndBreier/refactor_to_taskana_pro 

TSK-42 Refactor taskana.org to taskana.pro
This commit is contained in:
Holger Hagen 2017-11-17 16:29:25 +01:00 committed by GitHub
parent 6f8965749d 2a2b8e8e37
commit bcf8c94fcd
93 changed files with 354 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

6
lib/taskana-cdi-example/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-cdi-example</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
@ -21,13 +21,13 @@
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-cdi</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

8
lib/taskana-cdi-example/src/main/java/org/taskana/ExampleBootstrap.java → lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import javax.annotation.PostConstruct;
import javax.ejb.EJB;
@ -6,9 +6,9 @@ import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Initialized;
import javax.enterprise.event.Observes;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.model.Task;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.model.Task;
@ApplicationScoped
public class ExampleBootstrap {

2
lib/taskana-cdi-example/src/main/java/org/taskana/TaskanaEjb.java → lib/taskana-cdi-example/src/main/java/pro/taskana/TaskanaEjb.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import javax.ejb.Stateless;
import javax.inject.Inject;

4
lib/taskana-cdi/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-cdi</artifactId>
<version>0.0.1-SNAPSHOT</version>
@ -46,7 +46,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>provided</scope>

4
lib/taskana-cdi/src/main/java/org/taskana/TaskanaProducers.java → lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import java.io.IOException;
import java.io.InputStream;
@ -16,7 +16,7 @@ import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.configuration.TaskanaEngineConfiguration;
@ApplicationScoped
public class TaskanaProducers {

2
lib/taskana-cdi/src/test/java/org/taskana/RestApplication.java → lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

6
lib/taskana-cdi/src/test/java/org/taskana/TaskanaEjb.java → lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
View File

@ -1,10 +1,10 @@
package org.taskana;
package pro.taskana;
import javax.ejb.Stateless;
import javax.inject.Inject;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Task;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Task;
@Stateless
public class TaskanaEjb {

6
lib/taskana-cdi/src/test/java/org/taskana/TaskanaProducersTest.java → lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import java.sql.Connection;
import java.sql.DriverManager;
@ -27,12 +27,12 @@ public class TaskanaProducersTest {
@Deployment(testable = false)
public static Archive<?> createDeployment() throws Exception {
WARArchive deployment = ShrinkWrap.create(WARArchive.class);
deployment.addPackage("org.taskana");
deployment.addPackage("pro.taskana");
deployment.addClass(TaskanaProducers.class);
deployment.addAllDependencies();
deployment.addDependency("org.mybatis:mybatis:3.4.2");
deployment.addDependency("org.mybatis:mybatis-cdi:1.0.0");
deployment.addDependency("org.taskana:taskana-core:0.0.1-SNAPSHOT");
deployment.addDependency("pro.taskana:taskana-core:0.0.1-SNAPSHOT");
deployment.addAsResource("META-INF/beans.xml");
deployment.addAsResource("taskana.properties");
deployment.addAsResource("project-defaults.yml");

8
lib/taskana-cdi/src/test/java/org/taskana/TaskanaRestTest.java → lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import javax.ejb.EJB;
import javax.ws.rs.DELETE;
@ -10,9 +10,9 @@ import javax.ws.rs.core.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.model.Task;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.model.Task;
@Path("/test")
public class TaskanaRestTest {

2
lib/taskana-core/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>

8
lib/taskana-core/src/main/java/org/taskana/ClassificationService.java → lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
View File

@ -1,8 +1,8 @@
package org.taskana;
package pro.taskana;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Classification;
import org.taskana.persistence.ClassificationQuery;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Classification;
import pro.taskana.persistence.ClassificationQuery;
import java.util.List;

18
lib/taskana-core/src/main/java/org/taskana/TaskService.java → lib/taskana-core/src/main/java/pro/taskana/TaskService.java
View File

@ -1,15 +1,15 @@
package org.taskana;
package pro.taskana;
import java.util.List;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.DueWorkbasketCounter;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.model.TaskStateCounter;
import org.taskana.persistence.TaskQuery;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.DueWorkbasketCounter;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.model.TaskStateCounter;
import pro.taskana.persistence.TaskQuery;
/**
* The Task Service manages all operations on tasks.

4
lib/taskana-core/src/main/java/org/taskana/TaskanaEngine.java → lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
View File

@ -1,6 +1,6 @@
package org.taskana;
package pro.taskana;
import org.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.configuration.TaskanaEngineConfiguration;
/**
* The TaskanaEngine represents an overall set of all needed services.

12
lib/taskana-core/src/main/java/org/taskana/WorkbasketService.java → lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java
View File

@ -1,12 +1,12 @@
package org.taskana;
package pro.taskana;
import java.util.List;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAccessItem;
import org.taskana.model.WorkbasketAuthorization;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAccessItem;
import pro.taskana.model.WorkbasketAuthorization;
/**
* This service manages the Workbaskets.

2
lib/taskana-core/src/main/java/org/taskana/configuration/DbScriptRunner.java → lib/taskana-core/src/main/java/pro/taskana/configuration/DbScriptRunner.java
View File

@ -1,4 +1,4 @@
package org.taskana.configuration;
package pro.taskana.configuration;
import java.io.InputStreamReader;
import java.io.PrintWriter;

6
lib/taskana-core/src/main/java/org/taskana/configuration/TaskanaEngineConfiguration.java → lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
View File

@ -1,4 +1,4 @@
package org.taskana.configuration;
package pro.taskana.configuration;
import java.sql.SQLException;
@ -7,8 +7,8 @@ import javax.sql.DataSource;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.TaskanaEngine;
import org.taskana.impl.TaskanaEngineImpl;
import pro.taskana.TaskanaEngine;
import pro.taskana.impl.TaskanaEngineImpl;
/**
* This central class creates the TaskanaEngine and needs all the information

2
lib/taskana-core/src/main/java/org/taskana/exceptions/NotAuthorizedException.java → lib/taskana-core/src/main/java/pro/taskana/exceptions/NotAuthorizedException.java
View File

@ -1,4 +1,4 @@
package org.taskana.exceptions;
package pro.taskana.exceptions;
/**
* This exception is used to communicate a not authorized user.

2
lib/taskana-core/src/main/java/org/taskana/exceptions/NotFoundException.java → lib/taskana-core/src/main/java/pro/taskana/exceptions/NotFoundException.java
View File

@ -1,4 +1,4 @@
package org.taskana.exceptions;
package pro.taskana.exceptions;
/**
* This exception will be thrown if a specific object is not in the database.

2
lib/taskana-core/src/main/java/org/taskana/exceptions/TaskNotFoundException.java → lib/taskana-core/src/main/java/pro/taskana/exceptions/TaskNotFoundException.java
View File

@ -1,4 +1,4 @@
package org.taskana.exceptions;
package pro.taskana.exceptions;
/**
* This exception will be thrown if a specific task is not in the database.

2
lib/taskana-core/src/main/java/org/taskana/exceptions/WorkbasketNotFoundException.java → lib/taskana-core/src/main/java/pro/taskana/exceptions/WorkbasketNotFoundException.java
View File

@ -1,4 +1,4 @@
package org.taskana.exceptions;
package pro.taskana.exceptions;
/**
* This exception will be thrown if a specific workbasket is not in the database.

18
lib/taskana-core/src/main/java/org/taskana/impl/ClassificationServiceImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
View File

@ -1,13 +1,13 @@
package org.taskana.impl;
package pro.taskana.impl;
import org.taskana.ClassificationService;
import org.taskana.TaskanaEngine;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.persistence.ClassificationQueryImpl;
import org.taskana.impl.util.IdGenerator;
import org.taskana.model.Classification;
import org.taskana.model.mappings.ClassificationMapper;
import org.taskana.persistence.ClassificationQuery;
import pro.taskana.ClassificationService;
import pro.taskana.TaskanaEngine;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.persistence.ClassificationQueryImpl;
import pro.taskana.impl.util.IdGenerator;
import pro.taskana.model.Classification;
import pro.taskana.model.mappings.ClassificationMapper;
import pro.taskana.persistence.ClassificationQuery;
import java.sql.Date;
import java.time.Duration;

34
lib/taskana-core/src/main/java/org/taskana/impl/TaskServiceImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl;
package pro.taskana.impl;
import java.sql.Date;
import java.sql.Timestamp;
@ -8,22 +8,22 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.TaskService;
import org.taskana.TaskanaEngine;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.impl.persistence.TaskQueryImpl;
import org.taskana.impl.util.IdGenerator;
import org.taskana.model.DueWorkbasketCounter;
import org.taskana.model.ObjectReference;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.model.TaskStateCounter;
import org.taskana.model.WorkbasketAuthorization;
import org.taskana.model.mappings.ObjectReferenceMapper;
import org.taskana.model.mappings.TaskMapper;
import org.taskana.persistence.TaskQuery;
import pro.taskana.TaskService;
import pro.taskana.TaskanaEngine;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.impl.persistence.TaskQueryImpl;
import pro.taskana.impl.util.IdGenerator;
import pro.taskana.model.DueWorkbasketCounter;
import pro.taskana.model.ObjectReference;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.model.TaskStateCounter;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.TaskMapper;
import pro.taskana.persistence.TaskQuery;
/**
* This is the implementation of TaskService.

32
lib/taskana-core/src/main/java/org/taskana/impl/TaskanaEngineImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl;
package pro.taskana.impl;
import org.apache.ibatis.mapping.Environment;
import org.apache.ibatis.session.Configuration;
@ -8,19 +8,19 @@ import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
import org.taskana.ClassificationService;
import org.taskana.TaskService;
import org.taskana.TaskanaEngine;
import org.taskana.WorkbasketService;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.impl.persistence.MapTypeHandler;
import org.taskana.model.mappings.ClassificationMapper;
import org.taskana.model.mappings.DistributionTargetMapper;
import org.taskana.model.mappings.ObjectReferenceMapper;
import org.taskana.model.mappings.QueryMapper;
import org.taskana.model.mappings.TaskMapper;
import org.taskana.model.mappings.WorkbasketAccessMapper;
import org.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.ClassificationService;
import pro.taskana.TaskService;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketService;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.impl.persistence.MapTypeHandler;
import pro.taskana.model.mappings.ClassificationMapper;
import pro.taskana.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.QueryMapper;
import pro.taskana.model.mappings.TaskMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
/**
* This is the implementation of TaskanaEngine.
@ -32,6 +32,7 @@ public class TaskanaEngineImpl implements TaskanaEngine {
protected TaskanaEngineConfiguration taskanaEngineConfiguration;
protected SqlSession session;
protected TransactionFactory transactionFactory;
protected SqlSessionFactory sessionFactory;
private TaskMapper taskMapper;
private WorkbasketMapper workbasketMapper;
@ -107,7 +108,8 @@ public class TaskanaEngineImpl implements TaskanaEngine {
configuration.addMapper(ObjectReferenceMapper.class);
configuration.addMapper(QueryMapper.class);
configuration.getTypeHandlerRegistry().register(MapTypeHandler.class);
return new SqlSessionFactoryBuilder().build(configuration);
sessionFactory = new SqlSessionFactoryBuilder().build(configuration);
return sessionFactory;
}
private void createTransactionFactory(boolean useContainerManagedTransactions) {

26
lib/taskana-core/src/main/java/org/taskana/impl/WorkbasketServiceImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
View File

@ -1,22 +1,22 @@
package org.taskana.impl;
package pro.taskana.impl;
import java.sql.Timestamp;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.TaskanaEngine;
import org.taskana.WorkbasketService;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.impl.util.IdGenerator;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAccessItem;
import org.taskana.model.WorkbasketAuthorization;
import org.taskana.model.mappings.DistributionTargetMapper;
import org.taskana.model.mappings.WorkbasketAccessMapper;
import org.taskana.model.mappings.WorkbasketMapper;
import org.taskana.security.CurrentUserContext;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketService;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.impl.util.IdGenerator;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAccessItem;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.security.CurrentUserContext;
/**
* This is the implementation of WorkbasketService.
*/

12
lib/taskana-core/src/main/java/org/taskana/impl/persistence/ClassificationQueryImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ClassificationQueryImpl.java
View File

@ -1,10 +1,10 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import org.apache.ibatis.session.RowBounds;
import org.taskana.TaskanaEngine;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.Classification;
import org.taskana.persistence.ClassificationQuery;
import pro.taskana.TaskanaEngine;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.Classification;
import pro.taskana.persistence.ClassificationQuery;
import java.util.Date;
import java.util.List;
@ -15,7 +15,7 @@ import java.util.List;
*/
public class ClassificationQueryImpl implements ClassificationQuery {
private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryClassification";
private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification";
private TaskanaEngineImpl taskanaEngine;
private String[] parentClassificationId;
private String[] category;

2
lib/taskana-core/src/main/java/org/taskana/impl/persistence/MapTypeHandler.java → lib/taskana-core/src/main/java/pro/taskana/impl/persistence/MapTypeHandler.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

12
lib/taskana-core/src/main/java/org/taskana/impl/persistence/ObjectReferenceQueryImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java
View File

@ -1,12 +1,12 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import java.util.List;
import org.apache.ibatis.session.RowBounds;
import org.taskana.TaskanaEngine;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.ObjectReference;
import org.taskana.persistence.ObjectReferenceQuery;
import pro.taskana.TaskanaEngine;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.ObjectReference;
import pro.taskana.persistence.ObjectReferenceQuery;
/**
* Implementation of ObjectReferenceQuery interface.
@ -14,7 +14,7 @@ import org.taskana.persistence.ObjectReferenceQuery;
*/
public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryObjectReference";
private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryObjectReference";
private TaskanaEngineImpl taskanaEngine;
private String tenantId;

22
lib/taskana-core/src/main/java/org/taskana/impl/persistence/TaskQueryImpl.java → lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java
View File

@ -1,24 +1,24 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import java.util.List;
import org.apache.ibatis.session.RowBounds;
import org.taskana.TaskanaEngine;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.model.WorkbasketAuthorization;
import org.taskana.persistence.ClassificationQuery;
import org.taskana.persistence.ObjectReferenceQuery;
import org.taskana.persistence.TaskQuery;
import pro.taskana.TaskanaEngine;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.persistence.ClassificationQuery;
import pro.taskana.persistence.ObjectReferenceQuery;
import pro.taskana.persistence.TaskQuery;
/**
* TaskQuery for generating dynamic sql.
*/
public class TaskQueryImpl implements TaskQuery {
private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryTasks";
private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryTasks";
private TaskanaEngineImpl taskanaEngine;

2
lib/taskana-core/src/main/java/org/taskana/impl/util/IdGenerator.java → lib/taskana-core/src/main/java/pro/taskana/impl/util/IdGenerator.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.util;
package pro.taskana.impl.util;
import java.util.UUID;

2
lib/taskana-core/src/main/java/org/taskana/model/Classification.java → lib/taskana-core/src/main/java/pro/taskana/model/Classification.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
import java.sql.Date;

2
lib/taskana-core/src/main/java/org/taskana/model/DueWorkbasketCounter.java → lib/taskana-core/src/main/java/pro/taskana/model/DueWorkbasketCounter.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
import java.sql.Date;

2
lib/taskana-core/src/main/java/org/taskana/model/ObjectReference.java → lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
/**
* ObjectReference entity.

2
lib/taskana-core/src/main/java/org/taskana/model/Task.java → lib/taskana-core/src/main/java/pro/taskana/model/Task.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
import java.sql.Timestamp;
import java.util.Collections;

2
lib/taskana-core/src/main/java/org/taskana/model/TaskState.java → lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
/**
* This enum contains all status of the tasks.

2
lib/taskana-core/src/main/java/org/taskana/model/TaskStateCounter.java → lib/taskana-core/src/main/java/pro/taskana/model/TaskStateCounter.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
/**
* TaskStateCounter entity.

2
lib/taskana-core/src/main/java/org/taskana/model/Workbasket.java → lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
import java.sql.Timestamp;
import java.util.ArrayList;

2
lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAccessItem.java → lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
/**
* WorkbasketAccessItem entity.

2
lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAuthorization.java → lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java
View File

@ -1,4 +1,4 @@
package org.taskana.model;
package pro.taskana.model;
/**
* This enum contains all permission values for the workbaskets.

4
lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java
View File

@ -1,7 +1,7 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import org.apache.ibatis.annotations.*;
import org.taskana.model.Classification;
import pro.taskana.model.Classification;
import java.sql.Date;
import java.util.List;

2
lib/taskana-core/src/main/java/org/taskana/model/mappings/DistributionTargetMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java
View File

@ -1,4 +1,4 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import java.util.List;

4
lib/taskana-core/src/main/java/org/taskana/model/mappings/ObjectReferenceMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java
View File

@ -1,4 +1,4 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import java.util.List;
@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.taskana.model.ObjectReference;
import pro.taskana.model.ObjectReference;
/**
* This class is the mybatis mapping of ObjectReference.
*/

18
lib/taskana-core/src/main/java/org/taskana/model/mappings/QueryMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
View File

@ -1,15 +1,15 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import org.apache.ibatis.annotations.One;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.taskana.impl.persistence.ClassificationQueryImpl;
import org.taskana.impl.persistence.ObjectReferenceQueryImpl;
import org.taskana.impl.persistence.TaskQueryImpl;
import org.taskana.model.Classification;
import org.taskana.model.ObjectReference;
import org.taskana.model.Task;
import pro.taskana.impl.persistence.ClassificationQueryImpl;
import pro.taskana.impl.persistence.ObjectReferenceQueryImpl;
import pro.taskana.impl.persistence.TaskQueryImpl;
import pro.taskana.model.Classification;
import pro.taskana.model.ObjectReference;
import pro.taskana.model.Task;
import java.util.List;
@ -18,8 +18,8 @@ import java.util.List;
*/
public interface QueryMapper {
String OBJECTREFERENCEMAPPER_FINDBYID = "org.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYID = "org.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
@Select("<script>SELECT t.ID, t.TENANT_ID, t.CREATED, t.CLAIMED, t.COMPLETED, t.MODIFIED, t.PLANNED, t.DUE, t.NAME, t.DESCRIPTION, t.PRIORITY, t.STATE, t.CLASSIFICATION_ID, t.WORKBASKETID, t.OWNER, t.PRIMARY_OBJ_REF_ID, t.IS_READ, t.IS_TRANSFERRED, t.CUSTOM_1, t.CUSTOM_2, t.CUSTOM_3, t.CUSTOM_4, t.CUSTOM_5, t.CUSTOM_6, t.CUSTOM_7, t.CUSTOM_8, t.CUSTOM_9, t.CUSTOM_10 "
+ "FROM TASK t "

14
lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java
View File

@ -1,9 +1,9 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.type.JdbcType;
import org.taskana.impl.persistence.MapTypeHandler;
import org.taskana.model.*;
import pro.taskana.impl.persistence.MapTypeHandler;
import pro.taskana.model.*;
import java.sql.Date;
import java.util.List;
@ -14,8 +14,8 @@ import java.util.Map;
*/
public interface TaskMapper {
String OBJECTREFERENCEMAPPER_FINDBYID = "org.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYID = "org.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
@Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
+ "FROM TASK "
@ -84,11 +84,11 @@ public interface TaskMapper {
List<DueWorkbasketCounter> getTaskCountByWorkbasketIdAndDaysInPastAndState(@Param("fromDate") Date fromDate, @Param("status") List<TaskState> states);
@Insert("INSERT INTO TASK(ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) "
+ "VALUES(#{id}, #{tenantId}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=org.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
+ "VALUES(#{id}, #{tenantId}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
@Options(keyProperty = "id", keyColumn = "ID")
void insert(Task task);
@Update("UPDATE TASK SET TENANT_ID = #{tenantId}, CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=org.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
@Update("UPDATE TASK SET TENANT_ID = #{tenantId}, CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
+ "WHERE ID = #{id}")
void update(Task task);

4
lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketAccessMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketAccessMapper.java
View File

@ -1,4 +1,4 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import java.util.List;
@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.taskana.model.WorkbasketAccessItem;
import pro.taskana.model.WorkbasketAccessItem;
/**
* This class is the mybatis mapping of workbasket access items.
*/

6
lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketMapper.java → lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java
View File

@ -1,4 +1,4 @@
package org.taskana.model.mappings;
package pro.taskana.model.mappings;
import java.util.List;
@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.mapping.FetchType;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAuthorization;
/**
* This class is the mybatis mapping of workbaskets.
*/

4
lib/taskana-core/src/main/java/org/taskana/persistence/BaseQuery.java → lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
View File

@ -1,8 +1,8 @@
package org.taskana.persistence;
package pro.taskana.persistence;
import java.util.List;
import org.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.NotAuthorizedException;
/**
* Main query interface.

4
lib/taskana-core/src/main/java/org/taskana/persistence/ClassificationQuery.java → lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
View File

@ -1,6 +1,6 @@
package org.taskana.persistence;
package pro.taskana.persistence;
import org.taskana.model.Classification;
import pro.taskana.model.Classification;
import java.util.Date;

4
lib/taskana-core/src/main/java/org/taskana/persistence/ObjectReferenceQuery.java → lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
View File

@ -1,6 +1,6 @@
package org.taskana.persistence;
package pro.taskana.persistence;
import org.taskana.model.ObjectReference;
import pro.taskana.model.ObjectReference;
/**
* ObjectReferenceQuery for generating dynamic sql.

8
lib/taskana-core/src/main/java/org/taskana/persistence/TaskQuery.java → lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
View File

@ -1,8 +1,8 @@
package org.taskana.persistence;
package pro.taskana.persistence;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
/**
* TaskQuery for generating dynamic sql.

2
lib/taskana-core/src/main/java/org/taskana/security/CurrentUserContext.java → lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java
View File

@ -1,4 +1,4 @@
package org.taskana.security;
package pro.taskana.security;
import java.lang.reflect.Method;
import java.security.AccessController;

10
lib/taskana-core/src/test/java/org/taskana/impl/ClassificationServiceImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl;
package pro.taskana.impl;
import org.junit.Assert;
import org.junit.Test;
@ -7,10 +7,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.persistence.TestClassificationQuery;
import org.taskana.model.Classification;
import org.taskana.model.mappings.ClassificationMapper;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.persistence.TestClassificationQuery;
import pro.taskana.model.Classification;
import pro.taskana.model.mappings.ClassificationMapper;
import java.sql.Date;
import java.time.LocalDate;

24
lib/taskana-core/src/test/java/org/taskana/impl/TaskServiceImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl;
package pro.taskana.impl;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@ -12,17 +12,17 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.TaskanaEngine;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.ObjectReference;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.model.Workbasket;
import org.taskana.model.mappings.ObjectReferenceMapper;
import org.taskana.model.mappings.TaskMapper;
import pro.taskana.TaskanaEngine;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.ObjectReference;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.model.Workbasket;
import pro.taskana.model.mappings.ObjectReferenceMapper;
import pro.taskana.model.mappings.TaskMapper;
/**
* Unit Test for TaskServiceImpl.

22
lib/taskana-core/src/test/java/org/taskana/impl/WorkbasketServiceImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl;
package pro.taskana.impl;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
@ -15,16 +15,16 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.TaskanaEngine;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAccessItem;
import org.taskana.model.WorkbasketAuthorization;
import org.taskana.model.mappings.DistributionTargetMapper;
import org.taskana.model.mappings.WorkbasketAccessMapper;
import org.taskana.model.mappings.WorkbasketMapper;
import pro.taskana.TaskanaEngine;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAccessItem;
import pro.taskana.model.WorkbasketAuthorization;
import pro.taskana.model.mappings.DistributionTargetMapper;
import pro.taskana.model.mappings.WorkbasketAccessMapper;
import pro.taskana.model.mappings.WorkbasketMapper;
/**
* Unit Test for workbasketServiceImpl.

4
lib/taskana-core/src/test/java/org/taskana/impl/configuration/DBCleaner.java → lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.configuration;
package pro.taskana.impl.configuration;
import java.io.InputStreamReader;
import java.io.PrintWriter;
@ -10,7 +10,7 @@ import javax.sql.DataSource;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.configuration.DbScriptRunner;
import pro.taskana.configuration.DbScriptRunner;
/**
* This class cleans the complete database. Only to be used in Unittest

6
lib/taskana-core/src/test/java/org/taskana/impl/configuration/TaskanaEngineConfigurationTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.configuration;
package pro.taskana.impl.configuration;
import java.io.File;
import java.io.FileInputStream;
@ -17,8 +17,8 @@ import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.TaskanaEngine;
import org.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.TaskanaEngine;
import pro.taskana.configuration.TaskanaEngineConfiguration;
/**
* Integration Test for TaskanaEngineConfiguration.
* @author EH

18
lib/taskana-core/src/test/java/org/taskana/impl/integration/ClassificationServiceImplIntTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.integration;
package pro.taskana.impl.integration;
import java.io.FileNotFoundException;
import java.sql.Date;
@ -15,14 +15,14 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.taskana.ClassificationService;
import org.taskana.TaskanaEngine;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.impl.configuration.DBCleaner;
import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import org.taskana.model.Classification;
import pro.taskana.ClassificationService;
import pro.taskana.TaskanaEngine;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.impl.configuration.DBCleaner;
import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import pro.taskana.model.Classification;
/**
* Integration Test for ClassificationServiceImpl.

32
lib/taskana-core/src/test/java/org/taskana/impl/integration/TaskServiceImplTransactionTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java
View File

@ -1,22 +1,22 @@
package org.taskana.impl.integration;
package pro.taskana.impl.integration;
import org.h2.store.fs.FileUtils;
import org.junit.*;
import org.taskana.TaskanaEngine;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.impl.TaskServiceImpl;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.impl.configuration.DBCleaner;
import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import org.taskana.impl.persistence.ClassificationQueryImpl;
import org.taskana.impl.persistence.ObjectReferenceQueryImpl;
import org.taskana.impl.util.IdGenerator;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.persistence.ClassificationQuery;
import org.taskana.persistence.ObjectReferenceQuery;
import pro.taskana.TaskanaEngine;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.impl.TaskServiceImpl;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.impl.configuration.DBCleaner;
import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import pro.taskana.impl.persistence.ClassificationQueryImpl;
import pro.taskana.impl.persistence.ObjectReferenceQueryImpl;
import pro.taskana.impl.util.IdGenerator;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.persistence.ClassificationQuery;
import pro.taskana.persistence.ObjectReferenceQuery;
import javax.security.auth.login.LoginException;
import javax.sql.DataSource;

24
lib/taskana-core/src/test/java/org/taskana/impl/integration/WorkbasketServiceImplIntTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.integration;
package pro.taskana.impl.integration;
import java.io.FileNotFoundException;
import java.sql.SQLException;
@ -14,17 +14,17 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.taskana.TaskanaEngine;
import org.taskana.WorkbasketService;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.impl.configuration.DBCleaner;
import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import org.taskana.impl.util.IdGenerator;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAccessItem;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketService;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.impl.configuration.DBCleaner;
import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
import pro.taskana.impl.util.IdGenerator;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAccessItem;
/**

8
lib/taskana-core/src/test/java/org/taskana/impl/persistence/ClassificationQueryImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ClassificationQueryImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ -13,9 +13,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.Classification;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.Classification;
/**
* Test for ClassificationQueryImpl.

8
lib/taskana-core/src/test/java/org/taskana/impl/persistence/ObjectReferenceQueryImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ -13,9 +13,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.ObjectReference;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.ObjectReference;
/**
* Test for ObjectReferenceQueryImpl.

10
lib/taskana-core/src/test/java/org/taskana/impl/persistence/TaskQueryImplTest.java → lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TaskQueryImplTest.java
View File

@ -1,4 +1,4 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ -13,10 +13,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.impl.TaskanaEngineImpl;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.TaskanaEngineImpl;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
/**
* Test for TaskQueryImpl.

8
lib/taskana-core/src/test/java/org/taskana/impl/persistence/TestClassificationQuery.java → lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TestClassificationQuery.java
View File

@ -1,8 +1,8 @@
package org.taskana.impl.persistence;
package pro.taskana.impl.persistence;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Classification;
import org.taskana.persistence.ClassificationQuery;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Classification;
import pro.taskana.persistence.ClassificationQuery;
import java.util.ArrayList;
import java.util.Date;

6
lib/taskana-spring-example/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-spring-example</artifactId>
<version>0.0.1-SNAPSHOT</version>
<parent>
@ -40,12 +40,12 @@
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-spring</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

8
lib/taskana-spring-example/src/main/java/org/taskana/ExampleBootstrap.java → lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java
View File

@ -1,13 +1,13 @@
package org.taskana;
package pro.taskana;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.model.Task;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.model.Task;
@Component
@Transactional

2
lib/taskana-spring-example/src/main/java/org/taskana/SpringBootWebApplication.java → lib/taskana-spring-example/src/main/java/pro/taskana/SpringBootWebApplication.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
lib/taskana-spring-example/src/main/resources/application.properties
View File

@ -1 +1 @@
logging.level.org.taskana=DEBUG
logging.level.pro.taskana=DEBUG

2
lib/taskana-spring-example/src/main/resources/applicationContext.xml
View File

@ -21,7 +21,7 @@
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="taskanaEngineConfiguration" class="org.taskana.configuration.SpringTaskanaEngineConfiguration">
<bean id="taskanaEngineConfiguration" class="pro.taskana.configuration.SpringTaskanaEngineConfiguration">
<property name="dataSource" ref="dataSource" />
</bean>

4
lib/taskana-spring/pom.xml
View File

@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-spring</artifactId>
<version>0.0.1-SNAPSHOT</version>
@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

6
lib/taskana-spring/src/main/java/org/taskana/SpringTaskanaEngineImpl.java → lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java
View File

@ -1,12 +1,12 @@
package org.taskana;
package pro.taskana;
import java.sql.SQLException;
import javax.annotation.PostConstruct;
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
import org.taskana.configuration.SpringTaskanaEngineConfiguration;
import org.taskana.impl.TaskanaEngineImpl;
import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
import pro.taskana.impl.TaskanaEngineImpl;
/**
* This class configures the TaskanaEngine for spring

6
lib/taskana-spring/src/main/java/org/taskana/configuration/SpringTaskanaEngineConfiguration.java → lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java
View File

@ -1,4 +1,4 @@
package org.taskana.configuration;
package pro.taskana.configuration;
import java.sql.SQLException;
@ -6,8 +6,8 @@ import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.SpringTaskanaEngineImpl;
import org.taskana.TaskanaEngine;
import pro.taskana.SpringTaskanaEngineImpl;
import pro.taskana.TaskanaEngine;
/**
* This class configures the TaskanaEngineConfiguration for spring

6
lib/taskana-spring/src/test/java/org/taskana/TaskanaComponent.java → lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java
View File

@ -1,10 +1,10 @@
package org.taskana;
package pro.taskana;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Task;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Task;
@Component
@Transactional

2
lib/taskana-spring/src/test/java/org/taskana/TransactionTest.java → lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java
View File

@ -1,4 +1,4 @@
package org.taskana;
package pro.taskana;
import java.sql.Connection;
import java.sql.DriverManager;

4
lib/taskana-spring/src/test/resources/test-applicationContext.xml
View File

@ -23,7 +23,7 @@
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="taskEngineConfiguration" class="org.taskana.SpringTaskEngineConfiguration">
<bean id="taskEngineConfiguration" class="pro.taskana.SpringTaskEngineConfiguration">
<property name="dataSource" ref="dataSource" />
<property name="transactionManager" ref="transactionManager" />
</bean>
@ -31,5 +31,5 @@
<bean id="taskEngine" factory-bean="taskEngineConfiguration" factory-method="createTaskEngineConfiguration" />
<bean id="taskService" factory-bean="taskEngine" factory-method="getTaskService" />
<bean class="org.taskana.TaskanaComponent" />
<bean class="pro.taskana.TaskanaComponent" />
</beans>

4
rest/pom.xml
View File

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>rest</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.taskana</groupId>
<groupId>pro.taskana</groupId>
<artifactId>taskana-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

6
rest/src/main/java/org/taskana/rest/ClassificationController.java → rest/src/main/java/pro/taskana/rest/ClassificationController.java
View File

@ -1,15 +1,15 @@
/**
*
*/
package org.taskana.rest;
package pro.taskana.rest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.taskana.ClassificationService;
import org.taskana.model.Classification;
import pro.taskana.ClassificationService;
import pro.taskana.model.Classification;
import java.util.List;

18
rest/src/main/java/org/taskana/rest/MonitorController.java → rest/src/main/java/pro/taskana/rest/MonitorController.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest;
package pro.taskana.rest;
import java.time.LocalDate;
import java.time.format.DateTimeFormatterBuilder;
@ -12,14 +12,14 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.taskana.TaskService;
import org.taskana.WorkbasketService;
import org.taskana.model.DueWorkbasketCounter;
import org.taskana.model.TaskState;
import org.taskana.model.TaskStateCounter;
import org.taskana.model.Workbasket;
import org.taskana.rest.model.WorkbasketCounterDataDto;
import org.taskana.rest.model.WorkbasketCounterDto;
import pro.taskana.TaskService;
import pro.taskana.WorkbasketService;
import pro.taskana.model.DueWorkbasketCounter;
import pro.taskana.model.TaskState;
import pro.taskana.model.TaskStateCounter;
import pro.taskana.model.Workbasket;
import pro.taskana.rest.model.WorkbasketCounterDataDto;
import pro.taskana.rest.model.WorkbasketCounterDto;
@RestController
@RequestMapping(path = "/v1/monitor", produces = { MediaType.APPLICATION_JSON_VALUE })

18
rest/src/main/java/org/taskana/rest/RestApplication.java → rest/src/main/java/pro/taskana/rest/RestApplication.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest;
package pro.taskana.rest;
import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
import org.slf4j.Logger;
@ -11,14 +11,14 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Scope;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import org.springframework.http.converter.json.SpringHandlerInstantiator;
import org.taskana.ClassificationService;
import org.taskana.TaskService;
import org.taskana.TaskanaEngine;
import org.taskana.WorkbasketService;
import org.taskana.configuration.TaskanaEngineConfiguration;
import org.taskana.model.Workbasket;
import org.taskana.rest.serialization.WorkbasketMixIn;
import org.taskana.sampledata.SampleDataGenerator;
import pro.taskana.ClassificationService;
import pro.taskana.TaskService;
import pro.taskana.TaskanaEngine;
import pro.taskana.WorkbasketService;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.model.Workbasket;
import pro.taskana.rest.serialization.WorkbasketMixIn;
import pro.taskana.sampledata.SampleDataGenerator;
import javax.annotation.PostConstruct;
import java.sql.SQLException;

12
rest/src/main/java/org/taskana/rest/TaskController.java → rest/src/main/java/pro/taskana/rest/TaskController.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest;
package pro.taskana.rest;
import java.util.List;
@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.taskana.TaskService;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.TaskNotFoundException;
import org.taskana.model.Task;
import org.taskana.rest.query.TaskFilter;
import pro.taskana.TaskService;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.model.Task;
import pro.taskana.rest.query.TaskFilter;
@RestController
@RequestMapping(path = "/v1/tasks", produces = { MediaType.APPLICATION_JSON_VALUE })

14
rest/src/main/java/org/taskana/rest/WorkbasketController.java → rest/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest;
package pro.taskana.rest;
import java.util.ArrayList;
import java.util.Arrays;
@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.taskana.WorkbasketService;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.Workbasket;
import org.taskana.model.WorkbasketAccessItem;
import org.taskana.model.WorkbasketAuthorization;
import pro.taskana.WorkbasketService;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.Workbasket;
import pro.taskana.model.WorkbasketAccessItem;
import pro.taskana.model.WorkbasketAuthorization;
@RestController
@RequestMapping(path = "/v1/workbaskets", produces = { MediaType.APPLICATION_JSON_VALUE })

2
rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDataDto.java → rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDataDto.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.model;
package pro.taskana.rest.model;
import java.util.List;

2
rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDto.java → rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDto.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.model;
package pro.taskana.rest.model;
import java.util.List;

18
rest/src/main/java/org/taskana/rest/query/TaskFilter.java → rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.query;
package pro.taskana.rest.query;
import java.util.ArrayList;
import java.util.Arrays;
@ -7,14 +7,14 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import org.taskana.ClassificationService;
import org.taskana.TaskService;
import org.taskana.exceptions.NotAuthorizedException;
import org.taskana.model.Task;
import org.taskana.model.TaskState;
import org.taskana.persistence.ClassificationQuery;
import org.taskana.persistence.ObjectReferenceQuery;
import org.taskana.persistence.TaskQuery;
import pro.taskana.ClassificationService;
import pro.taskana.TaskService;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.model.Task;
import pro.taskana.model.TaskState;
import pro.taskana.persistence.ClassificationQuery;
import pro.taskana.persistence.ObjectReferenceQuery;
import pro.taskana.persistence.TaskQuery;
@Component
public class TaskFilter {

2
rest/src/main/java/org/taskana/rest/security/CustomAutenticationProvider.java → rest/src/main/java/pro/taskana/rest/security/CustomAutenticationProvider.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.security;
package pro.taskana.rest.security;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.jaas.JaasAuthenticationToken;

2
rest/src/main/java/org/taskana/rest/security/RoleGranterFromMap.java → rest/src/main/java/pro/taskana/rest/security/RoleGranterFromMap.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.security;
package pro.taskana.rest.security;
import java.security.Principal;
import java.util.Collections;

2
rest/src/main/java/org/taskana/rest/security/SampleLoginModule.java → rest/src/main/java/pro/taskana/rest/security/SampleLoginModule.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.security;
package pro.taskana.rest.security;
import java.util.Map;

2
rest/src/main/java/org/taskana/rest/security/WebSecurityConfig.java → rest/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.security;
package pro.taskana.rest.security;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;

8
rest/src/main/java/org/taskana/rest/serialization/DistributionTargetDeserializer.java → rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java
View File

@ -1,4 +1,4 @@
package org.taskana.rest.serialization;
package pro.taskana.rest.serialization;
import java.io.IOException;
import java.util.ArrayList;
@ -8,9 +8,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import org.taskana.WorkbasketService;
import org.taskana.exceptions.WorkbasketNotFoundException;
import org.taskana.model.Workbasket;
import pro.taskana.WorkbasketService;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.model.Workbasket;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;

4
rest/src/main/java/org/taskana/rest/serialization/DistributionTargetSerializer.java → rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java
View File

@ -1,10 +1,10 @@
package org.taskana.rest.serialization;
package pro.taskana.rest.serialization;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.taskana.model.Workbasket;
import pro.taskana.model.Workbasket;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;

4
rest/src/main/java/org/taskana/rest/serialization/WorkbasketMixIn.java → rest/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java
View File

@ -1,8 +1,8 @@
package org.taskana.rest.serialization;
package pro.taskana.rest.serialization;
import java.util.List;
import org.taskana.model.Workbasket;
import pro.taskana.model.Workbasket;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

2
rest/src/main/java/org/taskana/sampledata/SampleDataGenerator.java → rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
View File

@ -1,4 +1,4 @@
package org.taskana.sampledata;
package pro.taskana.sampledata;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.slf4j.Logger;

2
rest/src/main/resources/application.properties
View File

@ -1 +1 @@
logging.level.org.taskana=DEBUG
logging.level.pro.taskana=DEBUG

2
rest/src/main/resources/pss_jaas.config
View File

@ -1,3 +1,3 @@
taskana {
org.taskana.rest.security.SampleLoginModule required;
pro.taskana.rest.security.SampleLoginModule required;
};