From 8a4587ef7ee4189c0a46170bca4c0ef0368d7ec8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Fri, 18 Aug 2017 17:13:49 +0200
Subject: [PATCH] SONAR-9590 rename sonar-process-monitor to sonar-main

---
 server/pom.xml                                                | 2 +-
 server/{sonar-process-monitor => sonar-main}/pom.xml          | 4 ++--
 .../src/main/java/org/sonar/application/AppFileSystem.java    | 0
 .../src/main/java/org/sonar/application/AppLogging.java       | 0
 .../src/main/java/org/sonar/application/AppReloader.java      | 0
 .../src/main/java/org/sonar/application/AppReloaderImpl.java  | 0
 .../src/main/java/org/sonar/application/AppState.java         | 0
 .../src/main/java/org/sonar/application/AppStateFactory.java  | 0
 .../src/main/java/org/sonar/application/AppStateImpl.java     | 0
 .../src/main/java/org/sonar/application/AppStateListener.java | 0
 .../src/main/java/org/sonar/application/FileSystem.java       | 0
 .../src/main/java/org/sonar/application/NodeLifecycle.java    | 0
 .../src/main/java/org/sonar/application/Scheduler.java        | 0
 .../src/main/java/org/sonar/application/SchedulerImpl.java    | 0
 .../org/sonar/application/cluster/AppStateClusterImpl.java    | 0
 .../java/org/sonar/application/cluster/ClusterProcess.java    | 0
 .../java/org/sonar/application/cluster/ClusterProperties.java | 0
 .../java/org/sonar/application/cluster/HazelcastCluster.java  | 0
 .../main/java/org/sonar/application/cluster/package-info.java | 0
 .../main/java/org/sonar/application/config/AppSettings.java   | 0
 .../java/org/sonar/application/config/AppSettingsImpl.java    | 0
 .../java/org/sonar/application/config/AppSettingsLoader.java  | 0
 .../org/sonar/application/config/AppSettingsLoaderImpl.java   | 0
 .../java/org/sonar/application/config/ClusterSettings.java    | 0
 .../java/org/sonar/application/config/CommandLineParser.java  | 0
 .../java/org/sonar/application/config/FileSystemSettings.java | 0
 .../main/java/org/sonar/application/config/JdbcSettings.java  | 0
 .../org/sonar/application/config/SonarQubeVersionHelper.java  | 0
 .../main/java/org/sonar/application/config/package-info.java  | 0
 .../src/main/java/org/sonar/application/package-info.java     | 0
 .../org/sonar/application/process/AbstractProcessMonitor.java | 0
 .../java/org/sonar/application/process/EsProcessMonitor.java  | 0
 .../main/java/org/sonar/application/process/Lifecycle.java    | 0
 .../application/process/ProcessCommandsProcessMonitor.java    | 0
 .../org/sonar/application/process/ProcessEventListener.java   | 0
 .../java/org/sonar/application/process/ProcessLauncher.java   | 0
 .../org/sonar/application/process/ProcessLauncherImpl.java    | 0
 .../sonar/application/process/ProcessLifecycleListener.java   | 0
 .../java/org/sonar/application/process/ProcessMonitor.java    | 0
 .../main/java/org/sonar/application/process/SQProcess.java    | 0
 .../org/sonar/application/process/StopRequestWatcher.java     | 0
 .../org/sonar/application/process/StopRequestWatcherImpl.java | 0
 .../java/org/sonar/application/process/StreamGobbler.java     | 0
 .../main/java/org/sonar/application/process/package-info.java | 0
 .../resources/org/sonar/application/process/elasticsearch.yml | 0
 .../src/main/resources/sonarqube-version.txt                  | 0
 .../test/java/org/sonar/application/AppFileSystemTest.java    | 0
 .../src/test/java/org/sonar/application/AppLoggingTest.java   | 0
 .../test/java/org/sonar/application/AppReloaderImplTest.java  | 0
 .../test/java/org/sonar/application/AppStateFactoryTest.java  | 0
 .../src/test/java/org/sonar/application/AppStateImplTest.java | 0
 .../test/java/org/sonar/application/SchedulerImplTest.java    | 0
 .../src/test/java/org/sonar/application/TestAppState.java     | 0
 .../sonar/application/cluster/AppStateClusterImplTest.java    | 0
 .../org/sonar/application/cluster/ClusterProcessTest.java     | 0
 .../org/sonar/application/cluster/ClusterPropertiesTest.java  | 0
 .../org/sonar/application/cluster/HazelcastClusterTest.java   | 0
 .../org/sonar/application/cluster/HazelcastTestHelper.java    | 0
 .../org/sonar/application/config/AppSettingsImplTest.java     | 0
 .../sonar/application/config/AppSettingsLoaderImplTest.java   | 0
 .../sonar/application/config/ClusterSettingsLoopbackTest.java | 0
 .../org/sonar/application/config/ClusterSettingsTest.java     | 0
 .../org/sonar/application/config/CommandLineParserTest.java   | 0
 .../org/sonar/application/config/FileSystemSettingsTest.java  | 0
 .../java/org/sonar/application/config/JdbcSettingsTest.java   | 0
 .../sonar/application/config/SonarQubeVersionHelperTest.java  | 0
 .../java/org/sonar/application/config/TestAppSettings.java    | 0
 .../java/org/sonar/application/process/LifecycleTest.java     | 0
 .../process/ProcessCommandsProcessMonitorTest.java            | 0
 .../sonar/application/process/ProcessLauncherImplTest.java    | 0
 .../java/org/sonar/application/process/SQProcessTest.java     | 0
 .../sonar/application/process/StopRequestWatcherImplTest.java | 0
 .../java/org/sonar/application/process/StreamGobblerTest.java | 0
 .../src/test/resources/logback-test.xml                       | 0
 sonar-application/pom.xml                                     | 2 +-
 75 files changed, 4 insertions(+), 4 deletions(-)
 rename server/{sonar-process-monitor => sonar-main}/pom.xml (97%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppFileSystem.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppLogging.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppReloader.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppReloaderImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppState.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppStateFactory.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppStateImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/AppStateListener.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/FileSystem.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/NodeLifecycle.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/Scheduler.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/SchedulerImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/cluster/ClusterProcess.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/cluster/ClusterProperties.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/cluster/HazelcastCluster.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/cluster/package-info.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/AppSettings.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/AppSettingsImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/AppSettingsLoader.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/ClusterSettings.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/CommandLineParser.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/FileSystemSettings.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/JdbcSettings.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/config/package-info.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/package-info.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/EsProcessMonitor.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/Lifecycle.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessEventListener.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessLauncher.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/ProcessMonitor.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/SQProcess.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/StopRequestWatcher.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/StreamGobbler.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/java/org/sonar/application/process/package-info.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/resources/org/sonar/application/process/elasticsearch.yml (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/main/resources/sonarqube-version.txt (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/AppFileSystemTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/AppLoggingTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/AppReloaderImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/AppStateFactoryTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/AppStateImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/SchedulerImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/TestAppState.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/AppSettingsImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/ClusterSettingsTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/CommandLineParserTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/JdbcSettingsTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/config/TestAppSettings.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/LifecycleTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/SQProcessTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/java/org/sonar/application/process/StreamGobblerTest.java (100%)
 rename server/{sonar-process-monitor => sonar-main}/src/test/resources/logback-test.xml (100%)

diff --git a/server/pom.xml b/server/pom.xml
index 6ecf0057406..bd0564d4620 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -14,7 +14,7 @@
 
   <modules>
     <module>sonar-process</module>
-    <module>sonar-process-monitor</module>
+    <module>sonar-main</module>
     <module>sonar-db-core</module>
     <module>sonar-db-migration</module>
     <module>sonar-db-dao</module>
diff --git a/server/sonar-process-monitor/pom.xml b/server/sonar-main/pom.xml
similarity index 97%
rename from server/sonar-process-monitor/pom.xml
rename to server/sonar-main/pom.xml
index 6551c151014..9aa79852803 100644
--- a/server/sonar-process-monitor/pom.xml
+++ b/server/sonar-main/pom.xml
@@ -10,8 +10,8 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>sonar-process-monitor</artifactId>
-  <name>SonarQube :: Process Monitor</name>
+  <artifactId>sonar-main</artifactId>
+  <name>SonarQube :: Main Process</name>
 
   <properties>
     <!--
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppFileSystem.java b/server/sonar-main/src/main/java/org/sonar/application/AppFileSystem.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppFileSystem.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppFileSystem.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppLogging.java b/server/sonar-main/src/main/java/org/sonar/application/AppLogging.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppLogging.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppLogging.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloader.java b/server/sonar-main/src/main/java/org/sonar/application/AppReloader.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloader.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppReloader.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloaderImpl.java b/server/sonar-main/src/main/java/org/sonar/application/AppReloaderImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppReloaderImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppReloaderImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppState.java b/server/sonar-main/src/main/java/org/sonar/application/AppState.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppState.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppState.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateFactory.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateFactory.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateFactory.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppStateFactory.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateImpl.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppStateImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateListener.java b/server/sonar-main/src/main/java/org/sonar/application/AppStateListener.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/AppStateListener.java
rename to server/sonar-main/src/main/java/org/sonar/application/AppStateListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/FileSystem.java b/server/sonar-main/src/main/java/org/sonar/application/FileSystem.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/FileSystem.java
rename to server/sonar-main/src/main/java/org/sonar/application/FileSystem.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/NodeLifecycle.java b/server/sonar-main/src/main/java/org/sonar/application/NodeLifecycle.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/NodeLifecycle.java
rename to server/sonar-main/src/main/java/org/sonar/application/NodeLifecycle.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/Scheduler.java b/server/sonar-main/src/main/java/org/sonar/application/Scheduler.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/Scheduler.java
rename to server/sonar-main/src/main/java/org/sonar/application/Scheduler.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/cluster/AppStateClusterImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProcess.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java
rename to server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProcess.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProperties.java
rename to server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/HazelcastCluster.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
rename to server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/package-info.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/package-info.java
rename to server/sonar-main/src/main/java/org/sonar/application/cluster/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettings.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettings.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/AppSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsImpl.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoader.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoader.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoader.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoader.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java b/server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/AppSettingsLoaderImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/ClusterSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/ClusterSettings.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/CommandLineParser.java b/server/sonar-main/src/main/java/org/sonar/application/config/CommandLineParser.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/CommandLineParser.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/CommandLineParser.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/FileSystemSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/FileSystemSettings.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/JdbcSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/JdbcSettings.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/JdbcSettings.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/JdbcSettings.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java b/server/sonar-main/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/SonarQubeVersionHelper.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/config/package-info.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java
rename to server/sonar-main/src/main/java/org/sonar/application/config/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/package-info.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/package-info.java
rename to server/sonar-main/src/main/java/org/sonar/application/package-info.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/AbstractProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/EsProcessMonitor.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsProcessMonitor.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/EsProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/Lifecycle.java b/server/sonar-main/src/main/java/org/sonar/application/process/Lifecycle.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/Lifecycle.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/Lifecycle.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessCommandsProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessEventListener.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessEventListener.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessEventListener.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessEventListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncher.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncher.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncher.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncher.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessLifecycleListener.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessMonitor.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessMonitor.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessMonitor.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/ProcessMonitor.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/SQProcess.java b/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/SQProcess.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcher.java b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcher.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcher.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcher.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/StopRequestWatcherImpl.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/StreamGobbler.java b/server/sonar-main/src/main/java/org/sonar/application/process/StreamGobbler.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/StreamGobbler.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/StreamGobbler.java
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/package-info.java b/server/sonar-main/src/main/java/org/sonar/application/process/package-info.java
similarity index 100%
rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/package-info.java
rename to server/sonar-main/src/main/java/org/sonar/application/process/package-info.java
diff --git a/server/sonar-process-monitor/src/main/resources/org/sonar/application/process/elasticsearch.yml b/server/sonar-main/src/main/resources/org/sonar/application/process/elasticsearch.yml
similarity index 100%
rename from server/sonar-process-monitor/src/main/resources/org/sonar/application/process/elasticsearch.yml
rename to server/sonar-main/src/main/resources/org/sonar/application/process/elasticsearch.yml
diff --git a/server/sonar-process-monitor/src/main/resources/sonarqube-version.txt b/server/sonar-main/src/main/resources/sonarqube-version.txt
similarity index 100%
rename from server/sonar-process-monitor/src/main/resources/sonarqube-version.txt
rename to server/sonar-main/src/main/resources/sonarqube-version.txt
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppFileSystemTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppFileSystemTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/AppFileSystemTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/AppFileSystemTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppLoggingTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/AppLoggingTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppReloaderImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppReloaderImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/AppReloaderImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/AppReloaderImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateFactoryTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppStateFactoryTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateFactoryTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/AppStateFactoryTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppStateImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/AppStateImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/AppStateImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/TestAppState.java b/server/sonar-main/src/test/java/org/sonar/application/TestAppState.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/TestAppState.java
rename to server/sonar-main/src/test/java/org/sonar/application/TestAppState.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/cluster/AppStateClusterImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterProcessTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterPropertiesTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastClusterTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
rename to server/sonar-main/src/test/java/org/sonar/application/cluster/HazelcastTestHelper.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/CommandLineParserTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/CommandLineParserTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/CommandLineParserTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/CommandLineParserTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/JdbcSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/SonarQubeVersionHelperTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/config/TestAppSettings.java b/server/sonar-main/src/test/java/org/sonar/application/config/TestAppSettings.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/config/TestAppSettings.java
rename to server/sonar-main/src/test/java/org/sonar/application/config/TestAppSettings.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/LifecycleTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/LifecycleTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/LifecycleTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/LifecycleTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/SQProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/SQProcessTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/StreamGobblerTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/StreamGobblerTest.java
similarity index 100%
rename from server/sonar-process-monitor/src/test/java/org/sonar/application/process/StreamGobblerTest.java
rename to server/sonar-main/src/test/java/org/sonar/application/process/StreamGobblerTest.java
diff --git a/server/sonar-process-monitor/src/test/resources/logback-test.xml b/server/sonar-main/src/test/resources/logback-test.xml
similarity index 100%
rename from server/sonar-process-monitor/src/test/resources/logback-test.xml
rename to server/sonar-main/src/test/resources/logback-test.xml
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 0baa854c572..ec4f84def41 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-process-monitor</artifactId>
+      <artifactId>sonar-main</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--must declare this dependency of sonar-process-monitor here, again,-->
-- 
2.39.5