Moved Languages in ModuleContainer

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
index 530a4ce0527b50bbf6673a169230499f0d0fc21f..4a36fc6120641dbee6d88378c105fca3ec661c63 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
@@ -17,11 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.sonar.api.batch.BatchExtensionDictionnary;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.database.model.Snapshot;
+import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
 import org.sonar.api.scan.filesystem.FileExclusions;
 import org.sonar.api.scan.filesystem.PathResolver;
@@ -88,6 +90,7 @@ public abstract class ModuleContainer extends Container {
 
     container.addSingleton(RulesDao.class);
     container.addSingleton(LastSnapshots.class);
+    container.addSingleton(Languages.class);
 
     // file system
     container.addSingleton(PathResolver.class);

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
index 2fa80eac3a3a8a64ab9b49bbf877c03b6ec499dc..1df65ec74cbbfdfcfacea5a04ed133b501140a7e 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
@@ -17,13 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.EmailSettings;
-import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
@@ -106,7 +106,6 @@ public class ProjectLessTaskContainer extends Container {
     container.addSingleton(PastSnapshotFinderByPreviousVersion.class);
     container.addSingleton(PastMeasuresLoader.class);
     container.addSingleton(PastSnapshotFinder.class);
-    container.addSingleton(Languages.class);
     container.addSingleton(DefaultModelFinder.class);
     container.addSingleton(MetricProvider.class);
     container.addSingleton(DefaultResourceCreationLock.class);

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
index 1dccf54a284bdbc51107de44245c12f4d62e9961..a5ea55a2da97eb8db177ba6deddbf4f680e619a0 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
@@ -17,6 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.slf4j.Logger;
@@ -69,9 +70,6 @@ public class ProjectTaskContainer extends Container {
     installer.installTaskExtensions(container, true);
   }
 
-  /**
-   * Used by views plugin to emulate a project
-   */
   private void registerCoreComponentsRequiringProject() {
     container.addSingleton(ProjectExclusions.class);
     container.addSingleton(ProjectReactorReady.class);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
index 8b41ff61f1063a458dd3618b10bfafd61e01a998..8a025a32108d6300a46e1a77a5d8c0cfb21db09c 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Language.java
@@ -19,15 +19,15 @@
  */
 package org.sonar.api.resources;
 
+import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
-import org.sonar.api.task.TaskExtension;
 
 /**
  * The extension point to define a new language
  *
  * @since 1.10
  */
-public interface Language extends TaskExtension, ServerExtension {
+public interface Language extends BatchExtension, ServerExtension {
 
   /**
    * For example "java". Should not be more than 20 chars.

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
index 07a00f6a38c0b95a16e2bd44307ed8e41ad730cd..55482c948120529a240a8228890268661b4e7860 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
@@ -21,8 +21,8 @@ package org.sonar.api.resources;
 
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.ArrayUtils;
+import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.api.task.TaskComponent;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +34,7 @@ import java.util.Map;
  *
  * @since 1.10
  */
-public class Languages implements TaskComponent, ServerComponent {
+public class Languages implements BatchComponent, ServerComponent {
 
   private final Map<String, Language> map = Maps.newHashMap();