aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch/src/main/java/org/sonar/batch/bootstrap
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2011-11-11 15:20:42 +0100
committersimonbrandhof <simon.brandhof@gmail.com>2011-11-11 15:21:22 +0100
commita28fe51af8c5eeeb22f0ed2e734534f691b7f801 (patch)
tree3fda567ee093dae28f290d8adb57053edda6e81c /sonar-batch/src/main/java/org/sonar/batch/bootstrap
parentfdcfd70b54b4ed3a97ae0f6ca5d4ac2aa7ebeb7e (diff)
downloadsonarqube-a28fe51af8c5eeeb22f0ed2e734534f691b7f801.tar.gz
sonarqube-a28fe51af8c5eeeb22f0ed2e734534f691b7f801.zip
Fix loading of file exclusions - do not cache exclusions in Project
Diffstat (limited to 'sonar-batch/src/main/java/org/sonar/batch/bootstrap')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
index 73997640662..134c0b0f6d9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
@@ -33,7 +33,6 @@ import org.sonar.api.utils.IocContainer;
import org.sonar.api.utils.SonarException;
import org.sonar.batch.*;
import org.sonar.batch.components.TimeMachineConfiguration;
-import org.sonar.batch.config.DeprecatedConfigurationProvider;
import org.sonar.batch.config.ProjectSettings;
import org.sonar.batch.events.EventBus;
import org.sonar.batch.index.DefaultIndex;
@@ -70,7 +69,6 @@ public class ProjectModule extends Module {
addCoreSingleton(project);
addCoreSingleton(project.getConfiguration());
addCoreSingleton(ProjectSettings.class);
- addAdapter(new DeprecatedConfigurationProvider());
addCoreSingleton(IocContainer.class);
for (Object component : projectDefinition.getContainerExtensions()) {
@@ -134,9 +132,9 @@ public class ProjectModule extends Module {
DefaultIndex index = getComponentByType(DefaultIndex.class);
index.setCurrentProject(project,
- getComponentByType(ResourceFilters.class),
- getComponentByType(ViolationFilters.class),
- getComponentByType(RulesProfile.class));
+ getComponentByType(ResourceFilters.class),
+ getComponentByType(ViolationFilters.class),
+ getComponentByType(RulesProfile.class));
// TODO See http://jira.codehaus.org/browse/SONAR-2126
// previously MavenProjectBuilder was responsible for creation of ProjectFileSystem