- fixing compilation issues

kiegroup · Dec 12, 2012 · f061ab2 · f061ab2
1 parent e73cfd0
commit f061ab2
Show file tree

Hide file tree

Showing 185 changed files with 589 additions and 442 deletions.
diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessBuilderImpl.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessBuilderImpl.java
@@ -112,9 +112,9 @@ public List<DroolsError> getErrors() {
     }
 
     public void buildProcess(final Process process, Resource resource) {
-        if ( resource != null && ((InternalResource)resource).hasURL() ) {
-            ((org.jbpm.process.core.Process) process).setResource( resource );
-        }
+//        if ( resource != null && ((InternalResource)resource).hasURL() ) {
+//            ((org.jbpm.process.core.Process) process).setResource( resource );
+//        }
         boolean hasErrors = false;
         ProcessValidator validator = processValidators.get(((Process)process).getType());
         if (validator == null) {

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/Process.java b/jbpm-flow/src/main/java/org/jbpm/process/core/Process.java
@@ -19,9 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.io.ResourcedObject;
-
-public interface Process extends org.kie.definition.process.Process, ContextContainer, ResourcedObject {
+public interface Process extends org.kie.definition.process.Process, ContextContainer {
 
     /**
      * Sets the id of this process.

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java b/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java
@@ -1,5 +1,10 @@
 package org.jbpm.process.instance;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.drools.RuleBase;
 import org.drools.SessionConfiguration;
 import org.drools.common.AbstractWorkingMemory;
@@ -29,16 +34,11 @@
 import org.kie.event.rule.DefaultAgendaEventListener;
 import org.kie.event.rule.MatchCreatedEvent;
 import org.kie.event.rule.RuleFlowGroupDeactivatedEvent;
+import org.kie.internal.utils.CompositeClassLoader;
 import org.kie.runtime.StatefulKnowledgeSession;
 import org.kie.runtime.process.EventListener;
 import org.kie.runtime.process.ProcessInstance;
 import org.kie.runtime.process.WorkItemManager;
-import org.kie.util.CompositeClassLoader;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class ProcessRuntimeImpl implements InternalProcessRuntime {
 

diff --git a/...man-task-core/src/main/java/org/jbpm/process/workitem/wsht/AbstractHTWorkItemHandler.java b/...man-task-core/src/main/java/org/jbpm/process/workitem/wsht/AbstractHTWorkItemHandler.java
@@ -20,11 +20,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.runtime.KnowledgeRuntime;
-import org.kie.runtime.StatefulKnowledgeSession;
-import org.kie.runtime.process.WorkItem;
-import org.kie.runtime.process.WorkItemHandler;
-import org.kie.runtime.process.WorkItemManager;
 import org.jbpm.eventmessaging.EventResponseHandler;
 import org.jbpm.task.I18NText;
 import org.jbpm.task.OrganizationalEntity;
@@ -37,6 +32,11 @@
 import org.jbpm.task.service.ContentData;
 import org.jbpm.task.utils.ContentMarshallerHelper;
 import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.KnowledgeRuntime;
+import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.runtime.process.WorkItem;
+import org.kie.runtime.process.WorkItemHandler;
+import org.kie.runtime.process.WorkItemManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...human-task-core/src/main/java/org/jbpm/process/workitem/wsht/AsyncWSHumanTaskHandler.java b/...human-task-core/src/main/java/org/jbpm/process/workitem/wsht/AsyncWSHumanTaskHandler.java
@@ -21,12 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.runtime.Environment;
-import org.kie.runtime.KnowledgeRuntime;
-import org.kie.runtime.StatefulKnowledgeSession;
-import org.kie.runtime.process.WorkItem;
-import org.kie.runtime.process.WorkItemHandler;
-import org.kie.runtime.process.WorkItemManager;
 import org.jbpm.eventmessaging.EventResponseHandler;
 import org.jbpm.eventmessaging.Payload;
 import org.jbpm.task.AsyncTaskService;
@@ -51,6 +45,12 @@
 import org.jbpm.task.service.responsehandlers.AbstractBaseResponseHandler;
 import org.jbpm.task.utils.ContentMarshallerHelper;
 import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.Environment;
+import org.kie.runtime.KnowledgeRuntime;
+import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.runtime.process.WorkItem;
+import org.kie.runtime.process.WorkItemHandler;
+import org.kie.runtime.process.WorkItemManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...e/src/main/java/org/jbpm/process/workitem/wsht/GenericCommandBasedWSHumanTaskHandler.java b/...e/src/main/java/org/jbpm/process/workitem/wsht/GenericCommandBasedWSHumanTaskHandler.java
@@ -26,11 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.runtime.KnowledgeRuntime;
-import org.kie.runtime.StatefulKnowledgeSession;
-import org.kie.runtime.process.WorkItem;
-import org.kie.runtime.process.WorkItemHandler;
-import org.kie.runtime.process.WorkItemManager;
 import org.jbpm.eventmessaging.EventResponseHandler;
 import org.jbpm.eventmessaging.Payload;
 import org.jbpm.task.AccessType;
@@ -55,6 +50,11 @@
 import org.jbpm.task.service.TaskClientHandler.GetTaskResponseHandler;
 import org.jbpm.task.service.responsehandlers.AbstractBaseResponseHandler;
 import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.KnowledgeRuntime;
+import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.runtime.process.WorkItem;
+import org.kie.runtime.process.WorkItemHandler;
+import org.kie.runtime.process.WorkItemManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...uman-task-core/src/main/java/org/jbpm/process/workitem/wsht/GenericHTWorkItemHandler.java b/...uman-task-core/src/main/java/org/jbpm/process/workitem/wsht/GenericHTWorkItemHandler.java
@@ -19,28 +19,28 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.task.TaskService;
-import org.jbpm.task.utils.OnErrorAction;
-import org.kie.runtime.KnowledgeRuntime;
-import org.kie.runtime.StatefulKnowledgeSession;
-import org.jbpm.task.Task;
-import org.jbpm.task.event.TaskEventKey;
-import org.jbpm.task.service.ContentData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.kie.runtime.process.WorkItem;
-import org.kie.runtime.process.WorkItemManager;
 import org.jbpm.eventmessaging.EventResponseHandler;
 import org.jbpm.eventmessaging.Payload;
 import org.jbpm.task.Content;
 import org.jbpm.task.Status;
+import org.jbpm.task.Task;
+import org.jbpm.task.TaskService;
+import org.jbpm.task.event.TaskEventKey;
 import org.jbpm.task.event.entity.TaskCompletedEvent;
 import org.jbpm.task.event.entity.TaskEvent;
 import org.jbpm.task.event.entity.TaskFailedEvent;
 import org.jbpm.task.event.entity.TaskSkippedEvent;
+import org.jbpm.task.service.ContentData;
 import org.jbpm.task.service.PermissionDeniedException;
 import org.jbpm.task.service.responsehandlers.AbstractBaseResponseHandler;
 import org.jbpm.task.utils.ContentMarshallerHelper;
+import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.KnowledgeRuntime;
+import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.runtime.process.WorkItem;
+import org.kie.runtime.process.WorkItemManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GenericHTWorkItemHandler extends AbstractHTWorkItemHandler {
 

diff --git a/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/HumanTaskHandlerHelper.java b/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/HumanTaskHandlerHelper.java
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.runtime.Environment;
-import org.kie.runtime.process.WorkItem;
 import org.drools.time.TimeUtils;
 import org.jbpm.process.core.timer.BusinessCalendar;
 import org.jbpm.task.Deadline;
@@ -22,6 +20,8 @@
 import org.jbpm.task.OrganizationalEntity;
 import org.jbpm.task.Reassignment;
 import org.jbpm.task.User;
+import org.kie.runtime.Environment;
+import org.kie.runtime.process.WorkItem;
 
 public class HumanTaskHandlerHelper {
 

diff --git a/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/LocalHTWorkItemHandler.java b/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/LocalHTWorkItemHandler.java
@@ -15,9 +15,9 @@
  */
 package org.jbpm.process.workitem.wsht;
 
-import org.kie.runtime.KnowledgeRuntime;
 import org.jbpm.task.TaskService;
 import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.KnowledgeRuntime;
 
 
 public class LocalHTWorkItemHandler extends GenericHTWorkItemHandler{

diff --git a/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/PeopleAssignmentHelper.java b/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/PeopleAssignmentHelper.java
@@ -18,13 +18,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.kie.runtime.process.WorkItem;
 import org.jbpm.task.Group;
 import org.jbpm.task.OrganizationalEntity;
 import org.jbpm.task.PeopleAssignments;
 import org.jbpm.task.Task;
 import org.jbpm.task.TaskData;
 import org.jbpm.task.User;
+import org.kie.runtime.process.WorkItem;
 
 /**
  * A class responsible for assigning the various ownerships (actors, groups, business 

diff --git a/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/SyncWSHumanTaskHandler.java b/...-human-task-core/src/main/java/org/jbpm/process/workitem/wsht/SyncWSHumanTaskHandler.java
@@ -21,11 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.kie.runtime.KnowledgeRuntime;
-import org.kie.runtime.StatefulKnowledgeSession;
-import org.kie.runtime.process.WorkItem;
-import org.kie.runtime.process.WorkItemHandler;
-import org.kie.runtime.process.WorkItemManager;
 import org.jbpm.eventmessaging.EventResponseHandler;
 import org.jbpm.eventmessaging.Payload;
 import org.jbpm.task.Content;
@@ -48,6 +43,11 @@
 import org.jbpm.task.service.responsehandlers.AbstractBaseResponseHandler;
 import org.jbpm.task.utils.ContentMarshallerHelper;
 import org.jbpm.task.utils.OnErrorAction;
+import org.kie.runtime.KnowledgeRuntime;
+import org.kie.runtime.StatefulKnowledgeSession;
+import org.kie.runtime.process.WorkItem;
+import org.kie.runtime.process.WorkItemHandler;
+import org.kie.runtime.process.WorkItemManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/AsyncTaskService.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/AsyncTaskService.java
@@ -16,13 +16,9 @@
 package org.jbpm.task;
 
 import java.util.List;
+
 import org.jbpm.eventmessaging.EventKey;
 import org.jbpm.eventmessaging.EventResponseHandler;
-import org.jbpm.task.Attachment;
-import org.jbpm.task.Comment;
-import org.jbpm.task.Content;
-import org.jbpm.task.OrganizationalEntity;
-import org.jbpm.task.Task;
 import org.jbpm.task.service.ContentData;
 import org.jbpm.task.service.FaultData;
 import org.jbpm.task.service.TaskClientHandler.AddAttachmentResponseHandler;

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/Deadline.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/Deadline.java
@@ -23,7 +23,6 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.*;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -33,8 +32,7 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.SequenceGenerator;
 
 import org.jbpm.task.utils.CollectionUtils;
 

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/Task.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/Task.java
@@ -24,7 +24,17 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
 
 import org.jbpm.task.utils.CollectionUtils;
 

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/TaskData.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/TaskData.java
@@ -16,14 +16,6 @@
 
 package org.jbpm.task;
 
-import org.jbpm.task.service.ContentData;
-import org.jbpm.task.service.FaultData;
-import org.jbpm.task.service.IllegalTaskStateException;
-import org.jbpm.task.utils.CollectionUtils;
-
-import javax.persistence.*;
-
-import java.io.EOFException;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -33,6 +25,19 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Embeddable;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+import org.jbpm.task.service.ContentData;
+import org.jbpm.task.service.FaultData;
+import org.jbpm.task.service.IllegalTaskStateException;
+import org.jbpm.task.utils.CollectionUtils;
+
 @Embeddable
 public class TaskData
         implements

diff --git a/...pm-human-task-core/src/main/java/org/jbpm/task/admin/TaskCleanUpProcessEventListener.java b/...pm-human-task-core/src/main/java/org/jbpm/task/admin/TaskCleanUpProcessEventListener.java
@@ -16,9 +16,10 @@
 package org.jbpm.task.admin;
 
 import java.util.List;
+
 import org.drools.event.DefaultProcessEventListener;
-import org.kie.event.process.ProcessCompletedEvent;
 import org.jbpm.task.query.TaskSummary;
+import org.kie.event.process.ProcessCompletedEvent;
 
 /**
  *

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/admin/TasksAdmin.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/admin/TasksAdmin.java
@@ -17,6 +17,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import org.jbpm.task.query.TaskSummary;
 
 

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/admin/TasksAdminImpl.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/admin/TasksAdminImpl.java
@@ -15,16 +15,14 @@
  */
 package org.jbpm.task.admin;
 
-import static org.jbpm.task.service.persistence.TaskPersistenceManager.*;
+import static org.jbpm.task.service.persistence.TaskPersistenceManager.addParametersToMap;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
-import javax.persistence.EntityManagerFactory;
 import org.jbpm.task.Content;
-
 import org.jbpm.task.Status;
 import org.jbpm.task.Task;
 import org.jbpm.task.query.TaskSummary;

diff --git a/...ask/jbpm-human-task-core/src/main/java/org/jbpm/task/event/InternalTaskEventListener.java b/...ask/jbpm-human-task-core/src/main/java/org/jbpm/task/event/InternalTaskEventListener.java
@@ -18,10 +18,6 @@
 
 
 import org.jbpm.task.Status;
-import org.jbpm.task.event.entity.TaskClaimedEvent;
-import org.jbpm.task.event.entity.TaskCompletedEvent;
-import org.jbpm.task.event.entity.TaskFailedEvent;
-import org.jbpm.task.event.entity.TaskSkippedEvent;
 import org.jbpm.task.event.entity.TaskUserEvent;
 import org.jbpm.task.service.TaskServiceSession;
 

diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/event/TaskEventSupport.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/event/TaskEventSupport.java
@@ -19,7 +19,6 @@
 import java.util.Iterator;
 
 import org.drools.event.AbstractEventSupport;
-import org.jbpm.task.event.entity.TaskEvent;
 import org.jbpm.task.event.entity.TaskEventFactory;
 import org.jbpm.task.event.entity.TaskUserEvent;
 

diff --git a/...uman-task/jbpm-human-task-core/src/main/java/org/jbpm/task/event/TaskEventsAdminImpl.java b/...uman-task/jbpm-human-task-core/src/main/java/org/jbpm/task/event/TaskEventsAdminImpl.java
@@ -15,18 +15,14 @@
  */
 package org.jbpm.task.event;
 
-import static org.jbpm.task.service.persistence.TaskPersistenceManager.*;
+import static org.jbpm.task.service.persistence.TaskPersistenceManager.addParametersToMap;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.Query;
-
 import org.jbpm.task.event.entity.TaskEvent;
 import org.jbpm.task.event.entity.TaskEventType;
-import org.jbpm.task.service.IncorrectParametersException;
 import org.jbpm.task.service.persistence.TaskPersistenceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;