Temporary commit before merging with Simon's modifications on

RuleFailure

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index 37281c10c46a8845920f8841cdcf8941bff687f8..b0827f546f4de732cd34ceffb79959ec7258612e 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -214,6 +214,7 @@ public class CorePlugin extends SonarPlugin {
     extensions.add(NoSonarFilter.class);
     extensions.add(DirectoriesDecorator.class);
     extensions.add(FilesDecorator.class);
+    extensions.add(ReviewsDecorator.class);
 
     // time machine
     extensions.add(TendencyDecorator.class);

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ReviewsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ReviewsDecorator.java
new file mode 100644 (file)
index 0000000..040dc72
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ReviewsDecorator.java
@@ -0,0 +1,46 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2011 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar 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.
+ *
+ * Sonar 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 Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.plugins.core.sensors;
+
+import org.sonar.api.batch.Decorator;
+import org.sonar.api.batch.DecoratorContext;
+import org.sonar.api.batch.DependedUpon;
+import org.sonar.api.resources.Project;
+import org.sonar.api.resources.Resource;
+
+/**
+ * Decorator that currently only closes a review when its corresponding violation has been fixed.
+ */
+@DependedUpon("ViolationPersisterDecorator")
+public class ReviewsDecorator implements Decorator {
+
+  public boolean shouldExecuteOnProject(Project project) {
+    return true;
+  }
+
+  public void decorate(Resource resource, DecoratorContext context) {
+    //
+  }
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName();
+  }
+}

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb
deleted file mode 100644 (file)
index 4ef60d3..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Sonar, entreprise quality control tool.
-# Copyright (C) 2008-2011 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# Sonar 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.
-#
-# Sonar 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 Sonar; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
-#
-
-#
-# Sonar 2.8
-#
-class CreateReview < ActiveRecord::Migration
-
-  def self.up
-    create_table 'reviews' do |t|
-      t.column 'created_at',           :datetime
-      t.column 'user_id',                      :integer,       :null => true
-      t.column 'review_type',          :string,        :null => true,  :limit => 10
-      t.column 'status',                       :string,        :null => true,  :limit => 10
-      t.column 'severity',                     :string,        :null => true,  :limit => 10
-      t.column 'rule_failure_id',      :integer,       :null => true   
-      t.column 'resource_id',          :integer,       :null => true   
-      t.column 'resource_line',        :integer,       :null => true      
-    end
-    
-    create_table 'review_comments' do |t|
-      t.column 'created_at',           :datetime
-      t.column 'review_id',            :integer
-      t.column 'user_id',                      :integer,       :null => true
-      t.column 'review_text',          :text,          :null => true
-    end
-    
-  end
-
-end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb
new file mode 100644 (file)
index 0000000..4ef60d3
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb
@@ -0,0 +1,47 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2011 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# Sonar 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.
+#
+# Sonar 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 Sonar; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+#
+
+#
+# Sonar 2.8
+#
+class CreateReview < ActiveRecord::Migration
+
+  def self.up
+    create_table 'reviews' do |t|
+      t.column 'created_at',           :datetime
+      t.column 'user_id',                      :integer,       :null => true
+      t.column 'review_type',          :string,        :null => true,  :limit => 10
+      t.column 'status',                       :string,        :null => true,  :limit => 10
+      t.column 'severity',                     :string,        :null => true,  :limit => 10
+      t.column 'rule_failure_id',      :integer,       :null => true   
+      t.column 'resource_id',          :integer,       :null => true   
+      t.column 'resource_line',        :integer,       :null => true      
+    end
+    
+    create_table 'review_comments' do |t|
+      t.column 'created_at',           :datetime
+      t.column 'review_id',            :integer
+      t.column 'user_id',                      :integer,       :null => true
+      t.column 'review_text',          :text,          :null => true
+    end
+    
+  end
+
+end