aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-03-23 09:56:27 +0100
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-03-29 13:06:51 +0200
commit17f23a671f57beac9980635459a92b1eb4fb5eb8 (patch)
tree1a791aae7de2b0a39f19ebd21c7b413ec4da35a2 /server/sonar-ce
parentd83d13f77448e4d9f3d041f32de32f4e94ad36f3 (diff)
downloadsonarqube-17f23a671f57beac9980635459a92b1eb4fb5eb8.tar.gz
sonarqube-17f23a671f57beac9980635459a92b1eb4fb5eb8.zip
SONAR-7441 add annotation ComputeEngineSide
Diffstat (limited to 'server/sonar-ce')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java3
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java31
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/platform/package-info.java23
3 files changed, 56 insertions, 1 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 cee129ecb32..ef095ab7de7 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
@@ -38,6 +38,7 @@ import org.sonar.api.utils.UriReader;
import org.sonar.ce.db.CeDbClient;
import org.sonar.ce.db.ReadOnlyPropertiesDao;
import org.sonar.ce.es.EsIndexerEnabler;
+import org.sonar.ce.platform.ComputeEngineExtensionInstaller;
import org.sonar.ce.property.CePropertyDefinitions;
import org.sonar.ce.settings.ComputeEngineSettings;
import org.sonar.ce.user.CeUserSession;
@@ -191,7 +192,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
PluginLoader.class,
CePluginRepository.class,
InstalledPluginReferentialFactory.class,
- ServerExtensionInstaller.class,
+ ComputeEngineExtensionInstaller.class,
// depends on plugins
// RailsAppsDeployer.class,
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java b/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java
new file mode 100644
index 00000000000..70c0d74cbb4
--- /dev/null
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java
@@ -0,0 +1,31 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact 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.platform;
+
+import org.sonar.api.SonarQubeVersion;
+import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.core.platform.PluginRepository;
+import org.sonar.server.plugins.ServerExtensionInstaller;
+
+public class ComputeEngineExtensionInstaller extends ServerExtensionInstaller {
+ public ComputeEngineExtensionInstaller(SonarQubeVersion sonarQubeVersion, PluginRepository pluginRepository) {
+ super(sonarQubeVersion, pluginRepository, ComputeEngineSide.class);
+ }
+}
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/platform/package-info.java b/server/sonar-ce/src/main/java/org/sonar/ce/platform/package-info.java
new file mode 100644
index 00000000000..29dc7df04f1
--- /dev/null
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/platform/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact 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.platform;
+
+import javax.annotation.ParametersAreNonnullByDefault;