SONAR-2357 Add samples to build + improve samples for rules

diff --git a/pom.xml b/pom.xml
index 63566a08a17a9d27e73dff41079fd374b048aba0..0b1ecbd6d0f1164139f15eb77ca68fc79bfb9442 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
     <!-- public artifacts to be deployed to central repository -->
     <module>archetypes/sonar-basic-plugin</module>
     <module>archetypes/sonar-gwt-plugin</module>
+    <module>sonar-application</module>
     <module>sonar-batch</module>
     <module>sonar-batch-bootstrapper</module>
     <module>sonar-batch-maven-compat</module>
@@ -20,6 +21,7 @@
     <module>sonar-check-api</module>
     <module>sonar-colorizer</module>
     <module>sonar-core</module>
+    <module>sonar-core-maven-plugin</module>
     <module>sonar-deprecated</module>
     <module>sonar-duplications</module>
     <module>sonar-graph</module>
@@ -29,6 +31,7 @@
     <module>sonar-maven-plugin</module>
     <module>sonar-maven3-plugin</module>
     <module>sonar-plugin-api</module>
+    <module>sonar-server</module>
     <module>sonar-squid</module>
     <module>sonar-testing-harness</module>
     <module>sonar-ws-client</module>
@@ -920,11 +923,18 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
-        <module>sonar-core-maven-plugin</module>
-        <module>sonar-server</module>
-        <module>sonar-application</module>
+        <module>samples</module>
       </modules>
     </profile>
+    
+    <profile>
+      <id>dev</id>
+      <activation>
+        <property>
+          <name>dev</name>
+        </property>
+      </activation>
+    </profile>
 
     <profile>
       <id>release</id>

diff --git a/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleQualityProfile.java b/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleQualityProfile.java
index 65ba4d9c26de4d7e8d78b6b4da98f4b07e4b482e..ac6e981085be6ac40ccec11bc7def6613f6a6ae2 100644 (file)
--- a/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleQualityProfile.java
+++ b/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleQualityProfile.java
@@ -3,6 +3,7 @@ package com.mycompany.sonar.standard.rules;
 import org.sonar.api.profiles.ProfileDefinition;
 import org.sonar.api.profiles.RulesProfile;
 import org.sonar.api.resources.Java;
+import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.utils.ValidationMessages;
 
@@ -19,7 +20,8 @@ public class SampleQualityProfile extends ProfileDefinition {
   public RulesProfile createProfile(ValidationMessages validation) {
     RulesProfile profile = RulesProfile.create("Sample profile", Java.KEY);
     profile.activateRule(ruleRepository.getRule1(), RulePriority.MAJOR);
-    profile.activateRule(ruleRepository.getRule1(), null);
+    profile.activateRule(ruleRepository.getRule2(), null);
+    profile.activateRule(Rule.create("checkstyle", "com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck", null), null);
     return profile;
   }
 }

diff --git a/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleRuleRepository.java b/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleRuleRepository.java
index 964a2e8ed79a2be8565c49daff58f0ccc3c27933..4bd909a3b11aba409a0796d2517ef5001c52c37a 100644 (file)
--- a/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleRuleRepository.java
+++ b/samples/standard-plugin/src/main/java/com/mycompany/sonar/standard/rules/SampleRuleRepository.java
@@ -8,6 +8,9 @@ import org.sonar.api.rules.RuleRepository;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * This class declares rules. It is not the engine used to execute rules during project analysis.
+ */
 public class SampleRuleRepository extends RuleRepository {
 
   public static final String REPOSITORY_KEY = "sample";