diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-03-14 16:51:28 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-03-21 16:44:05 +0100 |
| commit | 950454051f247863735b75d251bee8460c7e07be (patch) | |
| tree | 072c642008908e323280031e2345ad60f5525da7 /server/sonar-ce | |
| parent | 447c95967ca0c5468538cf100f9bcd4c76a8b8bc (diff) | |
| download | sonarqube-950454051f247863735b75d251bee8460c7e07be.tar.gz sonarqube-950454051f247863735b75d251bee8460c7e07be.zip | |
SONAR-6732 disable Compute Engine in WebServer
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 5 | ||||
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index ad8abbfd0a9..4afc8215683 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -34,6 +34,7 @@ import org.sonar.api.server.rule.RulesDefinitionXmlLoader; import org.sonar.api.utils.Durations; import org.sonar.api.utils.System2; import org.sonar.api.utils.UriReader; +import org.sonar.ce.property.CePropertyDefinitions; import org.sonar.core.component.DefaultResourceTypes; import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.i18n.DefaultI18n; @@ -65,7 +66,6 @@ import org.sonar.server.component.ComponentFinder; import org.sonar.server.component.ComponentService; import org.sonar.server.computation.CeModule; import org.sonar.server.computation.container.ReportProcessingModule; -import org.sonar.server.computation.property.CePropertyDefinitions; import org.sonar.server.computation.queue.CeQueueModule; import org.sonar.server.computation.queue.PurgeCeActivities; import org.sonar.server.computation.taskprocessor.CeTaskProcessorModule; @@ -111,6 +111,7 @@ import org.sonar.server.plugins.InstalledPluginReferentialFactory; import org.sonar.server.plugins.ServerExtensionInstaller; import org.sonar.server.plugins.ServerPluginJarExploder; import org.sonar.server.plugins.ServerPluginRepository; +import org.sonar.server.properties.ProjectSettingsFactory; import org.sonar.server.qualityprofile.BuiltInProfiles; import org.sonar.server.qualityprofile.QProfileComparison; import org.sonar.server.qualityprofile.QProfileLookup; @@ -554,6 +555,8 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { CeTaskProcessorModule.class, // CeWsModule.class, no Web Service in CE + ProjectSettingsFactory.class, + // UI // GlobalNavigationAction.class, no Web Service in CE // SettingsNavigationAction.class, no Web Service in CE diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index fd255a25fe4..44a2b815a9e 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -79,8 +79,8 @@ public class ComputeEngineContainerImplTest { + 59 // content of MigrationStepModule + 10 // level 2 + 5 // level 3 - + 76 // level 4 - + 6 // content of CeModule + + 77 // level 4 + + 5 // content of CeModule + 7 // content of CeQueueModule + 4 // content of ReportProcessingModule + 4 // content of CeTaskProcessorModule |