Move issue workflow from sonar-core to sonar-server

39 files changed, 46 insertions, 50 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
index 1e9b9cd90da..cc01fdf8611 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
@@ -26,7 +26,7 @@ import org.sonar.api.issue.Issue;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.core.issue.IssueUpdater;
-import org.sonar.core.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.IssueWorkflow;
 import org.sonar.core.util.Uuids;
 import org.sonar.server.computation.analysis.AnalysisMetadataHolder;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
index 6112565f2aa..1689511d525 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
@@ -41,7 +41,7 @@ import org.sonar.core.issue.ActionPlanStats;
 import org.sonar.core.issue.DefaultActionPlan;
 import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.FieldDiffs;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.db.component.ResourceDao;
 import org.sonar.db.component.ResourceDto;
 import org.sonar.db.component.ResourceQuery;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
index 3d5ef020ea5..c9bee6d5f74 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
@@ -45,8 +45,8 @@ import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.DefaultIssueBuilder;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.core.issue.IssueUpdater;
-import org.sonar.core.issue.workflow.IssueWorkflow;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.ComponentDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
index 81b3e6cecc8..9fd9ec3500f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
@@ -28,8 +28,8 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.server.ServerSide;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.core.issue.workflow.IssueWorkflow;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.server.user.UserSession;
 
 @ServerSide
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java
index 66bd5779bce..6d2f2ac7c70 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Function.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import javax.annotation.Nullable;
 import org.sonar.api.issue.Issue;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java
index 316dfe1b692..9b9c88b303a 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/FunctionExecutor.java
@@ -17,10 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import javax.annotation.Nullable;
-import org.sonar.api.batch.BatchSide;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.user.User;
@@ -28,7 +27,6 @@ import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.core.issue.IssueUpdater;
 
-@BatchSide
 @ServerSide
 public class FunctionExecutor {
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsBeingClosed.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java
index daf3a2ed4aa..186060ea8a4 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsBeingClosed.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsBeingClosed.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.condition.Condition;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsManual.java
index d47a98a34d6..56336ad8e1b 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IsManual.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.condition.Condition;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
index 8ceb48e0d44..bb65c579d52 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IssueWorkflow.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/IssueWorkflow.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import java.util.List;
 import org.picocontainer.Startable;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/OrCondition.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/OrCondition.java
index 094c5d711b2..9eb9239dee5 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/OrCondition.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/OrCondition.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.condition.Condition;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetCloseDate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java
index 46f7145fecf..c5d42162b39 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetCloseDate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetCloseDate.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 class SetCloseDate implements Function {
   private final boolean set;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetClosed.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java
index 4b0e5344b4b..cb2b9f2471c 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetClosed.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetClosed.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.sonar.api.issue.Issue;
 import org.sonar.core.issue.DefaultIssue;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetResolution.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java
index 41684d29e63..b0a5992b635 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/SetResolution.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/SetResolution.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import javax.annotation.Nullable;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java
index 8be9b9f5e98..60510a4b77f 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/State.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/StateMachine.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java
index 215e5039d4a..f643ec96dbe 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/StateMachine.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/StateMachine.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java
index 1bcc5ed54d2..a0659390c93 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/Transition.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/UnsetAssignee.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java
index 258fb597160..8ac7cd59aee 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/UnsetAssignee.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/UnsetAssignee.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 enum UnsetAssignee implements Function {
   INSTANCE;
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java
index 40a98550148..cf6d81f4186 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/workflow/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java
index 7c6e1dcf4c7..6de68b3d926 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java
@@ -22,7 +22,7 @@ package org.sonar.server.issue.ws;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.server.issue.ActionService;
 import org.sonar.server.issue.IssueService;
 import org.sonar.server.user.UserSession;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
index 76597e92797..a24ccaad198 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.Set;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.ActionPlanDto;
 import org.sonar.db.issue.IssueChangeDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
index 8bc24de9622..246fe4eb118 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
@@ -35,7 +35,7 @@ import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.Duration;
 import org.sonar.api.utils.Durations;
 import org.sonar.api.utils.Paging;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.issue.ActionPlanDto;
 import org.sonar.db.issue.IssueChangeDto;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 02fb6cd3345..9236429f5ba 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -32,8 +32,8 @@ import org.sonar.api.rules.XMLRuleParser;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.core.component.DefaultResourceTypes;
 import org.sonar.core.issue.IssueUpdater;
-import org.sonar.core.issue.workflow.FunctionExecutor;
-import org.sonar.core.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.FunctionExecutor;
+import org.sonar.server.issue.workflow.IssueWorkflow;
 import org.sonar.core.timemachine.Periods;
 import org.sonar.core.user.DefaultUserFinder;
 import org.sonar.core.user.DeprecatedUserFinder;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java
index 19eb16134df..844d0ff8bbf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java
@@ -26,7 +26,7 @@ import org.sonar.api.utils.Duration;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.IssueChangeContext;
 import org.sonar.core.issue.IssueUpdater;
-import org.sonar.core.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.IssueWorkflow;
 import org.sonar.db.protobuf.DbCommons;
 import org.sonar.db.protobuf.DbIssues;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
index b0c47aa7ea0..4544480729c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
@@ -36,7 +36,7 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java
index 087531cff55..2ea9787433b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.IssueChangeContext;
-import org.sonar.core.issue.workflow.IssueWorkflow;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.IssueWorkflow;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.server.tester.UserSessionRule;
 
 import static com.google.common.collect.Lists.newArrayList;
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java
index 259193eb77e..62ebe571d57 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsBeingClosedTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.core.issue.DefaultIssue;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonar.core.issue.workflow.IsBeingClosed.INSTANCE;
+import static org.sonar.server.issue.workflow.IsBeingClosed.INSTANCE;
 
 public class IsBeingClosedTest {
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsManualTest.java
index 923d8e77010..c8458031b03 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IsManualTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.core.issue.DefaultIssue;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonar.core.issue.workflow.IsManual.INSTANCE;
+import static org.sonar.server.issue.workflow.IsManual.INSTANCE;
 
 public class IsManualTest {
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
index ba3571e4441..1900c2c0ce1 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/OrConditionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/OrConditionTest.java
index b8f3e50e39a..7b72a1a3741 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/OrConditionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/OrConditionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetCloseDateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java
index 92378fa5f03..09ab2d4f525 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetCloseDateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetCloseDateTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetClosedTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java
index 0c4341935ad..3638ebd0ad5 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetClosedTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetClosedTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.sonar.core.issue.workflow.SetClosed.INSTANCE;
+import static org.sonar.server.issue.workflow.SetClosed.INSTANCE;
 
 public class SetClosedTest {
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetResolutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java
index c8f690a0863..ed397d30a0c 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/SetResolutionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/SetResolutionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateMachineTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java
index 4d25dd37ae9..222a7d491e5 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateMachineTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java
index 660674a2fd8..7677c3e3954 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/TransitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
index 626dd6b2515..a8535a0c09c 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/TransitionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 import org.sonar.api.issue.condition.Condition;
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/UnsetAssigneeTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java
index 7977dd1adfb..8ed5c835a87 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/UnsetAssigneeTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/UnsetAssigneeTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.workflow;
+package org.sonar.server.issue.workflow;
 
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.sonar.core.issue.workflow.UnsetAssignee.INSTANCE;
+import static org.sonar.server.issue.workflow.UnsetAssignee.INSTANCE;
 
 public class UnsetAssigneeTest {
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java
index 1aeb60521bc..8db1776c588 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java
@@ -30,7 +30,7 @@ import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.server.issue.ActionService;
 import org.sonar.server.issue.IssueService;
 import org.sonar.server.tester.UserSessionRule;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java
index 973defab5c9..67ad2c679d4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java
@@ -41,7 +41,7 @@ import org.sonar.core.issue.DefaultActionPlan;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.FieldDiffs;
-import org.sonar.core.issue.workflow.Transition;
+import org.sonar.server.issue.workflow.Transition;
 import org.sonar.core.user.DefaultUser;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index 2e265e2640d..1c7d13a0df5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -91,7 +91,6 @@ import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.batch.source.CodeColorizers;
 import org.sonar.batch.test.TestPlanBuilder;
 import org.sonar.batch.test.TestableBuilder;
-import org.sonar.core.issue.workflow.FunctionExecutor;
 import org.sonar.core.metric.BatchMetrics;
 import org.sonar.core.platform.ComponentContainer;
 
@@ -175,7 +174,6 @@ public class ProjectScanContainer extends ComponentContainer {
       new QualityProfileProvider(),
 
       // issues
-      FunctionExecutor.class,
       IssueCache.class,
       DefaultProjectIssues.class,
       IssueTransition.class,