rename to package org.sonar.ce.task.projectanalysis

from package org.sonar.server.computation.task.projectanalysis

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java

@@ -17,12 +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.server.computation.task.projectanalysis;
+package org.sonar.ce.task.projectanalysis;
 
+import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl;
+import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor;
 import org.sonar.server.computation.queue.ReportSubmitter;
 import org.sonar.core.platform.Module;
-import org.sonar.server.computation.task.projectanalysis.container.ContainerFactoryImpl;
-import org.sonar.server.computation.task.projectanalysis.taskprocessor.ReportTaskProcessor;
+import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl;
+import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor;
 import org.sonar.server.computation.task.step.ComputationStepExecutor;
 
 public class ProjectAnalysisTaskModule extends Module {

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Analysis.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolder.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import java.util.Map;
 import javax.annotation.CheckForNull;
@@ -113,11 +113,11 @@ public interface AnalysisMetadataHolder {
    *
    * In case of analysis of main branch, the returned value is the main branch,
    * so its uuid and key are the same in
-   * {@link org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder#getRoot().
+   * {@link org.sonar.ce.task.projectanalysis.component.TreeRootHolder#getRoot().
    *
    * In case of analysis of non-main branch or pull request, the returned value
    * is the main branch. Its uuid and key are different than
-   * {@link org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder#getRoot().
+   * {@link org.sonar.ce.task.projectanalysis.component.TreeRootHolder#getRoot().
    *
    * @throws IllegalStateException if project has not been set
    */

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Branch.java

@@ -17,12 +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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import java.util.Optional;
 import javax.annotation.concurrent.Immutable;
+import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator;
 import org.sonar.db.component.BranchType;
-import org.sonar.server.computation.task.projectanalysis.component.ComponentKeyGenerator;
+import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator;
 
 @Immutable
 public interface Branch extends ComponentKeyGenerator {

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import java.util.Map;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Organization.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.db.organization.OrganizationDto;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactory.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactory.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.config.Configuration;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPlugin.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPlugin.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.server.computation.task.projectanalysis.analysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.computation.task.projectanalysis;
+package org.sonar.ce.task.projectanalysis.analysis;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/ComponentImpl.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.server.computation.task.projectanalysis.api.measurecomputer;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.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.server.computation.task.projectanalysis.api.measurecomputer;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
@@ -35,15 +35,15 @@ import org.sonar.api.ce.measure.Measure;
 import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerContext;
 import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinition;
 import org.sonar.api.ce.measure.Settings;
+import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository;
+import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepository;
+import org.sonar.ce.task.projectanalysis.measure.MeasureRepository;
+import org.sonar.ce.task.projectanalysis.metric.Metric;
+import org.sonar.ce.task.projectanalysis.metric.MetricRepository;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository;
-import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository;
-import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository;
-import org.sonar.server.computation.task.projectanalysis.metric.Metric;
-import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder;
 
 public class MeasureComputerContextImpl implements MeasureComputerContext {
 
@@ -51,14 +51,14 @@ public class MeasureComputerContextImpl implements MeasureComputerContext {
   private final MeasureRepository measureRepository;
   private final MetricRepository metricRepository;
 
-  private final org.sonar.server.computation.task.projectanalysis.component.Component internalComponent;
+  private final org.sonar.ce.task.projectanalysis.component.Component internalComponent;
   private final Component component;
   private final List<DefaultIssue> componentIssues;
 
   private MeasureComputerDefinition definition;
   private Set<String> allowedMetrics;
 
-  public MeasureComputerContextImpl(org.sonar.server.computation.task.projectanalysis.component.Component component, ConfigurationRepository config,
+  public MeasureComputerContextImpl(org.sonar.ce.task.projectanalysis.component.Component component, ConfigurationRepository config,
     MeasureRepository measureRepository, MetricRepository metricRepository, ComponentIssuesRepository componentIssuesRepository) {
     this.config = config;
     this.internalComponent = component;
@@ -110,7 +110,7 @@ public class MeasureComputerContextImpl implements MeasureComputerContext {
   @CheckForNull
   public Measure getMeasure(String metric) {
     validateInputMetric(metric);
-    Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure> measure = measureRepository.getRawMeasure(internalComponent, metricRepository.getByKey(metric));
+    Optional<org.sonar.ce.task.projectanalysis.measure.Measure> measure = measureRepository.getRawMeasure(internalComponent, metricRepository.getByKey(metric));
     if (measure.isPresent()) {
       return new MeasureImpl(measure.get());
     }
@@ -178,17 +178,17 @@ public class MeasureComputerContextImpl implements MeasureComputerContext {
     return componentIssues;
   }
 
-  private static Component newComponent(org.sonar.server.computation.task.projectanalysis.component.Component component) {
+  private static Component newComponent(org.sonar.ce.task.projectanalysis.component.Component component) {
     return new ComponentImpl(
       component.getKey(),
       Component.Type.valueOf(component.getType().name()),
-      component.getType() == org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE
+      component.getType() == org.sonar.ce.task.projectanalysis.component.Component.Type.FILE
         ? new ComponentImpl.FileAttributesImpl(component.getFileAttributes().getLanguageKey(), component.getFileAttributes().isUnitTest())
         : null);
   }
 
   private class ComponentToMeasure
-    implements Function<org.sonar.server.computation.task.projectanalysis.component.Component, Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure>> {
+    implements Function<org.sonar.ce.task.projectanalysis.component.Component, Optional<org.sonar.ce.task.projectanalysis.measure.Measure>> {
 
     private final Metric metric;
 
@@ -197,17 +197,17 @@ public class MeasureComputerContextImpl implements MeasureComputerContext {
     }
 
     @Override
-    public Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure> apply(@Nonnull org.sonar.server.computation.task.projectanalysis.component.Component input) {
+    public Optional<org.sonar.ce.task.projectanalysis.measure.Measure> apply(@Nonnull org.sonar.ce.task.projectanalysis.component.Component input) {
       return measureRepository.getRawMeasure(input, metric);
     }
   }
 
-  private enum ToMeasureAPI implements Function<Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure>, Measure> {
+  private enum ToMeasureAPI implements Function<Optional<org.sonar.ce.task.projectanalysis.measure.Measure>, Measure> {
     INSTANCE;
 
     @Nullable
     @Override
-    public Measure apply(@Nonnull Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure> input) {
+    public Measure apply(@Nonnull Optional<org.sonar.ce.task.projectanalysis.measure.Measure> input) {
       return input.isPresent() ? new MeasureImpl(input.get()) : null;
     }
   }

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.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.server.computation.task.projectanalysis.api.measurecomputer;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.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.server.computation.task.projectanalysis.api.measurecomputer;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.ce.measure.MeasureComputer;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureImpl.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.server.computation.task.projectanalysis.api.measurecomputer;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import java.util.EnumSet;
 import java.util.Locale;
@@ -27,20 +27,20 @@ import org.sonar.api.ce.measure.Measure;
 import static com.google.common.base.Preconditions.checkState;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.BOOLEAN;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.DOUBLE;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.INT;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.LONG;
-import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.STRING;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.BOOLEAN;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.DOUBLE;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.INT;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.LONG;
+import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.STRING;
 
 @Immutable
 public class MeasureImpl implements Measure {
 
-  private static final EnumSet<org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType> ALLOWED_VALUE_TYPES = EnumSet.of(INT, LONG, DOUBLE, STRING, BOOLEAN);
+  private static final EnumSet<org.sonar.ce.task.projectanalysis.measure.Measure.ValueType> ALLOWED_VALUE_TYPES = EnumSet.of(INT, LONG, DOUBLE, STRING, BOOLEAN);
 
-  private final org.sonar.server.computation.task.projectanalysis.measure.Measure measure;
+  private final org.sonar.ce.task.projectanalysis.measure.Measure measure;
 
-  public MeasureImpl(org.sonar.server.computation.task.projectanalysis.measure.Measure measure) {
+  public MeasureImpl(org.sonar.ce.task.projectanalysis.measure.Measure measure) {
     this.measure = requireNonNull(measure, "Measure couldn't be null");
     checkState(ALLOWED_VALUE_TYPES.contains(measure.getValueType()), "Only following types are allowed %s", ALLOWED_VALUE_TYPES);
   }
@@ -75,7 +75,7 @@ public class MeasureImpl implements Measure {
     return measure.getBooleanValue();
   }
 
-  private void checkValueType(org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType expected) {
+  private void checkValueType(org.sonar.ce.task.projectanalysis.measure.Measure.ValueType expected) {
     if (measure.getValueType() != expected) {
       throw new IllegalStateException(format("Value can not be converted to %s because current value type is a %s",
         expected.toString().toLowerCase(Locale.US),

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.computation.task.projectanalysis.scm;
+package org.sonar.ce.task.projectanalysis.api.measurecomputer;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/BranchImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/BranchImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import java.util.Optional;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/CeTaskImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.ce.posttask.CeTask;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.concurrent.Immutable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToCondition.java

@@ -17,14 +17,16 @@
  * 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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import com.google.common.base.Function;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import org.sonar.api.ce.posttask.QualityGate;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus;
+import org.sonar.ce.task.projectanalysis.qualitygate.Condition;
+import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus;
+import org.sonar.ce.task.projectanalysis.qualitygate.Condition;
+import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.lang.String.format;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import java.util.Collection;
 import java.util.Date;
@@ -37,14 +37,14 @@ import org.sonar.api.ce.posttask.ScannerContext;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.batch.BatchReportReader;
+import org.sonar.ce.task.projectanalysis.qualitygate.Condition;
+import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolder;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatusHolder;
 import org.sonar.core.util.stream.MoreCollectors;
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
-import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateHolder;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus;
-import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatusHolder;
 import org.sonar.server.computation.task.step.ComputationStepExecutor;
 
 import static java.lang.String.format;
@@ -133,7 +133,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor
     if (!analysisMetadataHolder.isOrganizationsEnabled()) {
       return null;
     }
-    org.sonar.server.computation.task.projectanalysis.analysis.Organization organization = analysisMetadataHolder.getOrganization();
+    org.sonar.ce.task.projectanalysis.analysis.Organization organization = analysisMetadataHolder.getOrganization();
     return new OrganizationImpl(organization.getName(), organization.getKey());
   }
 
@@ -164,9 +164,9 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor
 
   @CheckForNull
   private QualityGateImpl createQualityGate() {
-    Optional<org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate> qualityGateOptional = this.qualityGateHolder.getQualityGate();
+    Optional<org.sonar.ce.task.projectanalysis.qualitygate.QualityGate> qualityGateOptional = this.qualityGateHolder.getQualityGate();
     if (qualityGateOptional.isPresent()) {
-      org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate qualityGate = qualityGateOptional.get();
+      org.sonar.ce.task.projectanalysis.qualitygate.QualityGate qualityGate = qualityGateOptional.get();
 
       return new QualityGateImpl(
         String.valueOf(qualityGate.getId()),
@@ -179,7 +179,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor
 
   @CheckForNull
   private BranchImpl createBranch() {
-    org.sonar.server.computation.task.projectanalysis.analysis.Branch analysisBranch = analysisMetadataHolder.getBranch();
+    org.sonar.ce.task.projectanalysis.analysis.Branch analysisBranch = analysisMetadataHolder.getBranch();
     if (!analysisBranch.isLegacyFeature()) {
       String branchKey = analysisBranch.getType() == PULL_REQUEST ? analysisBranch.getPullRequestKey() : analysisBranch.getName();
       return new BranchImpl(analysisBranch.isMain(), branchKey, Branch.Type.valueOf(analysisBranch.getType().name()));

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ProjectImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.ce.posttask.Project;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/QualityGateImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ScannerContextImpl.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.server.computation.task.projectanalysis.api.posttask;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.computation.task.projectanalysis.step;
+package org.sonar.ce.task.projectanalysis.api.posttask;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.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.server.computation.task.projectanalysis.batch;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import java.io.File;
 import org.sonar.ce.queue.CeTask;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.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.server.computation.task.projectanalysis.batch;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import java.io.File;
 import java.util.Objects;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReader.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.server.computation.task.projectanalysis.batch;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import java.util.Optional;
 import javax.annotation.CheckForNull;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImpl.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.server.computation.task.projectanalysis.batch;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import com.google.common.base.Throwables;
 import com.google.protobuf.InvalidProtocolBufferException;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.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.server.computation.task.projectanalysis.batch;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import java.io.File;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/package-info.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.computation.task.projectanalysis.view;
+package org.sonar.ce.task.projectanalysis.batch;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoader.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoader.java

@@ -17,12 +17,12 @@
  * 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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.Nullable;
 import org.sonar.api.utils.MessageException;
 import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder;
 
 import static org.apache.commons.lang.StringUtils.trimToNull;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderDelegate.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderDelegate.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.scanner.protocol.output.ScannerReport;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersister.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersister.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import org.sonar.db.DbSession;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Date;
 import javax.annotation.Nullable;
@@ -28,8 +28,8 @@ import org.sonar.db.component.BranchDto;
 import org.sonar.db.component.BranchType;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.protobuf.DbProjectBranches;
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
-import org.sonar.server.computation.task.projectanalysis.analysis.Branch;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.Branch;
 
 import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT;
 import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Component.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.EnumSet;
 import java.util.List;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentCrawler.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 /**
  * Allow to crawl a component tree from a given component

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctions.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.base.Function;
 import javax.annotation.Nonnull;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentKeyGenerator.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentKeyGenerator.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.Nullable;
 import org.sonar.scanner.protocol.output.ScannerReport;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.List;
 import java.util.function.Function;
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus;
-import org.sonar.server.computation.task.projectanalysis.analysis.Branch;
+import org.sonar.ce.task.projectanalysis.analysis.Branch;
 import org.sonar.server.project.Project;
 
 import static com.google.common.base.MoreObjects.firstNonNull;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactory.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactory.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.HashMap;
 import java.util.List;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentVisitor.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public interface ComponentVisitor {
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepository.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import org.sonar.api.config.Configuration;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryImpl.java

@@ -17,13 +17,15 @@
  * 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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import org.sonar.api.config.Configuration;
-import org.sonar.server.computation.task.projectanalysis.analysis.ProjectConfigurationFactory;
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory;
+import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
 
 /**
  * Repository of component settings implementation based on a memory cache.

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/CrawlerDepthLimit.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepository.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public interface DbIdsRepository {
   /**

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepositoryImpl.java

@@ -17,9 +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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
-import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toReportRef;
+import static org.sonar.ce.task.projectanalysis.component.ComponentFunctions.toReportRef;
 
 /**
  * Cache of persisted component (component id and snapshot id) that can be used in the persistence steps

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -26,7 +26,7 @@ import org.sonar.core.component.ComponentKeys;
 import org.sonar.db.component.BranchDto;
 import org.sonar.db.component.BranchType;
 import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.server.computation.task.projectanalysis.analysis.Branch;
+import org.sonar.ce.task.projectanalysis.analysis.Branch;
 
 import static java.lang.String.format;
 import static org.apache.commons.lang.StringUtils.isEmpty;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import static java.util.Objects.requireNonNull;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DequeBasedPath.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.ArrayDeque;
 import java.util.Deque;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Developer.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 /**
  * Developers are created by the Developer Cockpit plugin

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolder.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Collection;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolderImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Collection;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/FileAttributes.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -26,7 +26,7 @@ import javax.annotation.concurrent.Immutable;
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
- * The attributes specific to a Component of type {@link org.sonar.server.computation.task.projectanalysis.component.Component.Type#FILE}.
+ * The attributes specific to a Component of type {@link Component.Type#FILE}.
  */
 @Immutable
 public class FileAttributes {

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MapBasedDbIdsRepository.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.base.Function;
 import java.util.HashMap;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuids.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuids.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +28,7 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.component.BranchDto;
 import org.sonar.db.component.ComponentDto;
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
 
 import static com.google.common.base.Preconditions.checkState;
 import static org.sonar.db.component.ComponentDto.removeBranchAndPullRequestFromKey;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepository.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public interface MutableDbIdsRepository extends DbIdsRepository {
   /**

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDisabledComponentsHolder.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Collection;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolder.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public interface MutableTreeRootHolder extends TreeRootHolder {
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareCrawler.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -27,8 +27,8 @@ import javax.annotation.concurrent.Immutable;
 import static com.google.common.collect.FluentIterable.from;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER;
-import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
+import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER;
+import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
 
 /**
  * A {@link ComponentCrawler} which provide access to a representation of the path from the root to the currently visited

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitor.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.NoSuchElementException;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorAdapter.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import static java.util.Objects.requireNonNull;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorWrapper.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import static java.lang.String.format;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathElementImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.concurrent.Immutable;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ReportAttributes.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Optional;
 import javax.annotation.CheckForNull;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssues.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssues.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Collections;
 import java.util.HashMap;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/SubViewAttributes.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolder.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Optional;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderImpl.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
@@ -26,7 +26,7 @@ import javax.annotation.CheckForNull;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
-import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER;
+import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER;
 
 /**
  * Holds the reference to the root of the {@link Component} tree for the current CE run.

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitor.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 /**
  * A {@link ComponentVisitor} which can exposes methods which ensure the type of the visited Component.

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorAdapter.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import static java.util.Objects.requireNonNull;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorWrapper.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public class TypeAwareVisitorWrapper implements VisitorWrapper {
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributes.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ViewAttributes.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import java.util.Arrays;
 import javax.annotation.concurrent.Immutable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitException.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import static java.lang.String.format;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorWrapper.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 public interface VisitorWrapper extends TypeAwareVisitor {
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorsCrawler.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.server.computation.task.projectanalysis.component;
+package org.sonar.ce.task.projectanalysis.component;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.ce.task.projectanalysis.component;
+
+import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.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.server.computation.task.projectanalysis.container;
+package org.sonar.ce.task.projectanalysis.container;
 
 import javax.annotation.Nullable;
 import org.sonar.ce.queue.CeTask;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.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.server.computation.task.projectanalysis.container;
+package org.sonar.ce.task.projectanalysis.container;
 
 import javax.annotation.Nullable;
 import org.sonar.ce.queue.CeTask;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java

@@ -0,0 +1,292 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * 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.ce.task.projectanalysis.container;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.sonar.ce.organization.DefaultOrganizationLoader;
+import org.sonar.ce.queue.CeTask;
+import org.sonar.ce.settings.SettingsLoader;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderImpl;
+import org.sonar.ce.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor;
+import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl;
+import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderImpl;
+import org.sonar.ce.task.projectanalysis.component.BranchLoader;
+import org.sonar.ce.task.projectanalysis.component.BranchPersisterImpl;
+import org.sonar.ce.task.projectanalysis.component.ConfigurationRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.component.DbIdsRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.component.DisabledComponentsHolderImpl;
+import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids;
+import org.sonar.ce.task.projectanalysis.component.ShortBranchComponentsWithIssues;
+import org.sonar.ce.task.projectanalysis.component.TreeRootHolderImpl;
+import org.sonar.ce.task.projectanalysis.dbmigration.DbMigrationModule;
+import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolderImpl;
+import org.sonar.ce.task.projectanalysis.duplication.DuplicationMeasures;
+import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.duplication.IntegrateCrossProjectDuplications;
+import org.sonar.ce.task.projectanalysis.event.EventRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.filemove.FileSimilarityImpl;
+import org.sonar.ce.task.projectanalysis.filemove.MutableMovedFilesRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrixDumperImpl;
+import org.sonar.ce.task.projectanalysis.filemove.SourceSimilarityImpl;
+import org.sonar.ce.task.projectanalysis.filesystem.ComputationTempFolderProvider;
+import org.sonar.ce.task.projectanalysis.issue.BaseIssuesLoader;
+import org.sonar.ce.task.projectanalysis.issue.CloseIssuesOnRemovedComponentsVisitor;
+import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesLoader;
+import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.issue.ComponentsWithUnprocessedIssues;
+import org.sonar.ce.task.projectanalysis.issue.DebtCalculator;
+import org.sonar.ce.task.projectanalysis.issue.DefaultAssignee;
+import org.sonar.ce.task.projectanalysis.issue.EffortAggregator;
+import org.sonar.ce.task.projectanalysis.issue.IntegrateIssuesVisitor;
+import org.sonar.ce.task.projectanalysis.issue.IssueAssigner;
+import org.sonar.ce.task.projectanalysis.issue.IssueCache;
+import org.sonar.ce.task.projectanalysis.issue.IssueCounter;
+import org.sonar.ce.task.projectanalysis.issue.IssueCreationDateCalculator;
+import org.sonar.ce.task.projectanalysis.issue.IssueLifecycle;
+import org.sonar.ce.task.projectanalysis.issue.IssueTrackingDelegator;
+import org.sonar.ce.task.projectanalysis.issue.IssueVisitors;
+import org.sonar.ce.task.projectanalysis.issue.IssuesRepositoryVisitor;
+import org.sonar.ce.task.projectanalysis.issue.LoadComponentUuidsHavingOpenIssuesVisitor;
+import org.sonar.ce.task.projectanalysis.issue.MergeBranchTrackerExecution;
+import org.sonar.ce.task.projectanalysis.issue.MovedIssueVisitor;
+import org.sonar.ce.task.projectanalysis.issue.NewEffortAggregator;
+import org.sonar.ce.task.projectanalysis.issue.RemoveProcessedComponentsVisitor;
+import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.issue.RuleTagsCopier;
+import org.sonar.ce.task.projectanalysis.issue.RuleTypeCopier;
+import org.sonar.ce.task.projectanalysis.issue.ScmAccountToUser;
+import org.sonar.ce.task.projectanalysis.issue.ScmAccountToUserLoader;
+import org.sonar.ce.task.projectanalysis.issue.ShortBranchIssueMerger;
+import org.sonar.ce.task.projectanalysis.issue.ShortBranchIssuesLoader;
+import org.sonar.ce.task.projectanalysis.issue.ShortBranchTrackerExecution;
+import org.sonar.ce.task.projectanalysis.issue.TrackerBaseInputFactory;
+import org.sonar.ce.task.projectanalysis.issue.TrackerExecution;
+import org.sonar.ce.task.projectanalysis.issue.TrackerMergeBranchInputFactory;
+import org.sonar.ce.task.projectanalysis.issue.TrackerRawInputFactory;
+import org.sonar.ce.task.projectanalysis.issue.UpdateConflictResolver;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.BranchCoverageRule;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.CommentDensityRule;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.CommonRuleEngineImpl;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.DuplicatedBlockRule;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.LineCoverageRule;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.SkippedTestRule;
+import org.sonar.ce.task.projectanalysis.issue.commonrule.TestErrorRule;
+import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter;
+import org.sonar.ce.task.projectanalysis.language.LanguageRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.measure.MeasureComputersHolderImpl;
+import org.sonar.ce.task.projectanalysis.measure.MeasureComputersVisitor;
+import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto;
+import org.sonar.ce.task.projectanalysis.metric.MetricModule;
+import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl;
+import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultTextConverterImpl;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolderImpl;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateServiceImpl;
+import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatusHolderImpl;
+import org.sonar.ce.task.projectanalysis.qualitymodel.MaintainabilityMeasuresVisitor;
+import org.sonar.ce.task.projectanalysis.qualitymodel.NewMaintainabilityMeasuresVisitor;
+import org.sonar.ce.task.projectanalysis.qualitymodel.NewReliabilityAndSecurityRatingMeasuresVisitor;
+import org.sonar.ce.task.projectanalysis.qualitymodel.RatingSettings;
+import org.sonar.ce.task.projectanalysis.qualitymodel.ReliabilityAndSecurityRatingMeasuresVisitor;
+import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl;
+import org.sonar.ce.task.projectanalysis.scm.ScmInfoDbLoader;
+import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.source.DbLineHashVersion;
+import org.sonar.ce.task.projectanalysis.source.LastCommitVisitor;
+import org.sonar.ce.task.projectanalysis.source.SignificantCodeRepository;
+import org.sonar.ce.task.projectanalysis.source.SourceHashRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.source.SourceLinesDiffImpl;
+import org.sonar.ce.task.projectanalysis.source.SourceLinesHashCache;
+import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.source.SourceLinesRepositoryImpl;
+import org.sonar.ce.task.projectanalysis.step.ReportComputationSteps;
+import org.sonar.ce.task.projectanalysis.step.SmallChangesetQualityGateSpecialCase;
+import org.sonar.ce.task.projectanalysis.webhook.WebhookPostTask;
+import org.sonar.core.issue.tracking.Tracker;
+import org.sonar.core.platform.ContainerPopulator;
+import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
+import org.sonar.server.computation.task.container.TaskContainer;
+import org.sonar.server.computation.task.step.ComputationStepExecutor;
+import org.sonar.server.computation.task.step.ComputationSteps;
+import org.sonar.server.computation.taskprocessor.MutableTaskResultHolderImpl;
+import org.sonar.server.view.index.ViewIndex;
+
+public final class ProjectAnalysisTaskContainerPopulator implements ContainerPopulator<TaskContainer> {
+  private static final ReportAnalysisComponentProvider[] NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS = new ReportAnalysisComponentProvider[0];
+
+  private final CeTask task;
+  private final ReportAnalysisComponentProvider[] componentProviders;
+
+  public ProjectAnalysisTaskContainerPopulator(CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders) {
+    this.task = task;
+    this.componentProviders = componentProviders == null ? NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS : componentProviders;
+  }
+
+  @Override
+  public void populateContainer(TaskContainer container) {
+    ComputationSteps steps = new ReportComputationSteps(container);
+    container.add(SettingsLoader.class);
+    container.add(DefaultOrganizationLoader.class);
+    container.add(task);
+    container.add(steps);
+    container.addSingletons(componentClasses());
+    for (ReportAnalysisComponentProvider componentProvider : componentProviders) {
+      container.addSingletons(componentProvider.getComponents());
+    }
+    container.addSingletons(steps.orderedStepClasses());
+  }
+
+  /**
+   * List of all objects to be injected in the picocontainer dedicated to computation stack.
+   * Does not contain the steps declared in {@link ReportComputationSteps#orderedStepClasses()}.
+   */
+  private static List<Object> componentClasses() {
+    return Arrays.asList(
+      PostProjectAnalysisTasksExecutor.class,
+      ComputationStepExecutor.class,
+
+      // File System
+      new ComputationTempFolderProvider(),
+
+      DbMigrationModule.class,
+
+      MetricModule.class,
+
+      // holders
+      AnalysisMetadataHolderImpl.class,
+      CrossProjectDuplicationStatusHolderImpl.class,
+      BatchReportDirectoryHolderImpl.class,
+      TreeRootHolderImpl.class,
+      PeriodHolderImpl.class,
+      QualityGateHolderImpl.class,
+      QualityGateStatusHolderImpl.class,
+      RatingSettings.class,
+      ActiveRulesHolderImpl.class,
+      MeasureComputersHolderImpl.class,
+      MutableTaskResultHolderImpl.class,
+      BatchReportReaderImpl.class,
+      MergeBranchComponentUuids.class,
+      ShortBranchComponentsWithIssues.class,
+
+      // repositories
+      LanguageRepositoryImpl.class,
+      MeasureRepositoryImpl.class,
+      EventRepositoryImpl.class,
+      ConfigurationRepositoryImpl.class,
+      DbIdsRepositoryImpl.class,
+      DisabledComponentsHolderImpl.class,
+      QualityGateServiceImpl.class,
+      EvaluationResultTextConverterImpl.class,
+      SourceLinesRepositoryImpl.class,
+      SourceHashRepositoryImpl.class,
+      SourceLinesDiffImpl.class,
+      ScmInfoRepositoryImpl.class,
+      ScmInfoDbLoader.class,
+      DuplicationRepositoryImpl.class,
+      SourceLinesHashRepositoryImpl.class,
+      DbLineHashVersion.class,
+      SignificantCodeRepository.class,
+      SourceLinesHashCache.class,
+
+      // issues
+      RuleRepositoryImpl.class,
+      ScmAccountToUserLoader.class,
+      ScmAccountToUser.class,
+      IssueCache.class,
+      DefaultAssignee.class,
+      IssueVisitors.class,
+      IssueLifecycle.class,
+      ComponentsWithUnprocessedIssues.class,
+      ComponentIssuesRepositoryImpl.class,
+      IssueFilter.class,
+
+      // common rules
+      CommonRuleEngineImpl.class,
+      BranchCoverageRule.class,
+      LineCoverageRule.class,
+      CommentDensityRule.class,
+      DuplicatedBlockRule.class,
+      TestErrorRule.class,
+      SkippedTestRule.class,
+
+      // order is important: RuleTypeCopier must be the first one. And DebtAggregator must be before NewDebtAggregator (new debt requires
+      // debt)
+      RuleTypeCopier.class,
+      RuleTagsCopier.class,
+      IssueCreationDateCalculator.class,
+      DebtCalculator.class,
+      EffortAggregator.class,
+      NewEffortAggregator.class,
+      IssueAssigner.class,
+      IssueCounter.class,
+      MovedIssueVisitor.class,
+      IssuesRepositoryVisitor.class,
+      RemoveProcessedComponentsVisitor.class,
+
+      // visitors : order is important, measure computers must be executed at the end in order to access to every measures / issues
+      LoadComponentUuidsHavingOpenIssuesVisitor.class,
+      IntegrateIssuesVisitor.class,
+      CloseIssuesOnRemovedComponentsVisitor.class,
+      MaintainabilityMeasuresVisitor.class,
+      NewMaintainabilityMeasuresVisitor.class,
+      ReliabilityAndSecurityRatingMeasuresVisitor.class,
+      NewReliabilityAndSecurityRatingMeasuresVisitor.class,
+      LastCommitVisitor.class,
+      MeasureComputersVisitor.class,
+
+      UpdateConflictResolver.class,
+      TrackerBaseInputFactory.class,
+      TrackerRawInputFactory.class,
+      TrackerMergeBranchInputFactory.class,
+      Tracker.class,
+      TrackerExecution.class,
+      ShortBranchTrackerExecution.class,
+      MergeBranchTrackerExecution.class,
+      ComponentIssuesLoader.class,
+      BaseIssuesLoader.class,
+      IssueTrackingDelegator.class,
+      BranchPersisterImpl.class,
+      ShortBranchIssuesLoader.class,
+      ShortBranchIssueMerger.class,
+
+      // filemove
+      ScoreMatrixDumperImpl.class,
+      SourceSimilarityImpl.class,
+      FileSimilarityImpl.class,
+      MutableMovedFilesRepositoryImpl.class,
+
+      // duplication
+      IntegrateCrossProjectDuplications.class,
+      DuplicationMeasures.class,
+
+      // views
+      ViewIndex.class,
+
+      BranchLoader.class,
+      MeasureToMeasureDto.class,
+      SmallChangesetQualityGateSpecialCase.class,
+
+      // webhooks
+      WebhookPostTask.class);
+  }
+
+}

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.ce.task.projectanalysis.container;
+
+import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModule.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModule.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.server.computation.task.projectanalysis.dbmigration;
+package org.sonar.ce.task.projectanalysis.dbmigration;
 
 import org.sonar.core.platform.Module;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.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.server.computation.task.projectanalysis.dbmigration;
+package org.sonar.ce.task.projectanalysis.dbmigration;
 
 import com.google.common.collect.Iterables;
 import java.sql.SQLException;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.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.server.computation.task.projectanalysis.dbmigration;
+package org.sonar.ce.task.projectanalysis.dbmigration;
 
 import org.sonar.server.platform.db.migration.step.MigrationStep;
 
 /**
  * Marker interface of {@link MigrationStep} for the implementations to be run in
- * {@link org.sonar.server.computation.task.projectanalysis.step.DbMigrationsStep DbMigrationsStep}.
+ * {@link org.sonar.ce.task.projectanalysis.step.DbMigrationsStep DbMigrationsStep}.
  * <p>
  * {@link MigrationStep} execute during project report analysis should perform <strong>only data change operations</strong>.
  */

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.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.server.computation.task.projectanalysis.dbmigration;
+package org.sonar.ce.task.projectanalysis.dbmigration;
 
 import java.util.List;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.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.server.computation.task.projectanalysis.dbmigration;
+package org.sonar.ce.task.projectanalysis.dbmigration;
 
 import java.util.Arrays;
 import java.util.List;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.ce.task.projectanalysis.dbmigration;
+
+import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/AbstractDuplicate.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import javax.annotation.Nullable;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicate.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import java.util.Objects;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java

@@ -17,9 +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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
 
 /**
  * A simple holder to know if the cross project duplication should be computed or not.

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import javax.annotation.CheckForNull;
 import org.picocontainer.Startable;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
+import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
 
 import static com.google.common.base.Preconditions.checkState;
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DetailedTextBlock.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import java.util.Objects;
 import javax.annotation.Nullable;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplicate.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 public interface Duplicate {
   TextBlock getTextBlock();

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplication.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationMeasures.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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import static com.google.common.collect.FluentIterable.from;
 import static com.google.common.collect.Iterables.isEmpty;
@@ -36,18 +36,20 @@ import java.util.Set;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
-import org.sonar.server.computation.task.projectanalysis.component.Component;
-import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler;
-import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder;
-import org.sonar.server.computation.task.projectanalysis.formula.Counter;
-import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext;
-import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext;
-import org.sonar.server.computation.task.projectanalysis.formula.Formula;
-import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor;
-import org.sonar.server.computation.task.projectanalysis.measure.Measure;
-import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository;
-import org.sonar.server.computation.task.projectanalysis.metric.Metric;
-import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository;
+import org.sonar.ce.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler;
+import org.sonar.ce.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler;
+import org.sonar.ce.task.projectanalysis.component.TreeRootHolder;
+import org.sonar.ce.task.projectanalysis.formula.Counter;
+import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext;
+import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext;
+import org.sonar.ce.task.projectanalysis.formula.Formula;
+import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor;
+import org.sonar.ce.task.projectanalysis.measure.Measure;
+import org.sonar.ce.task.projectanalysis.measure.MeasureRepository;
+import org.sonar.ce.task.projectanalysis.metric.Metric;
+import org.sonar.ce.task.projectanalysis.metric.MetricRepository;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepository.java

@@ -17,9 +17,10 @@
  * 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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
-import org.sonar.server.computation.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.Component;
 
 /**
  * Repository of code duplications in files of the project.

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImpl.java

@@ -17,13 +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.server.computation.task.projectanalysis.duplication;
+package org.sonar.ce.task.projectanalysis.duplication;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import java.util.Collection;
 import java.util.Collections;
-import org.sonar.server.computation.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.Component;
+import org.sonar.ce.task.projectanalysis.component.Component;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;