SONAR-1378 validate property types + update type of core properties

8 files changed, 197 insertions, 193 deletions

diff --git a/plugins/sonar-checkstyle-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstylePlugin.java b/plugins/sonar-checkstyle-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstylePlugin.java
index 515b8d15e04..9bba008989b 100644
--- a/plugins/sonar-checkstyle-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstylePlugin.java
+++ b/plugins/sonar-checkstyle-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstylePlugin.java
@@ -21,6 +21,7 @@ package org.sonar.plugins.checkstyle;
 
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
+import org.sonar.api.PropertyType;
 import org.sonar.api.SonarPlugin;
 
 import java.util.Arrays;
@@ -35,7 +36,7 @@ import java.util.List;
       + " See <a href='http://checkstyle.sourceforge.net/config.html'>Checkstyle configuration page</a> to get more information on those filters.",
     project = false,
     global = true,
-    type = Property.Type.TEXT)})
+    type = PropertyType.TEXT)})
 public final class CheckstylePlugin extends SonarPlugin {
 
   public List getExtensions() {
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 b0d273c9fe6..71c09d25209 100644
--- 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
@@ -20,11 +20,9 @@
 package org.sonar.plugins.core;
 
 import com.google.common.collect.Lists;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.Properties;
-import org.sonar.api.Property;
-import org.sonar.api.SonarPlugin;
+import org.sonar.api.*;
 import org.sonar.api.checks.NoSonarFilter;
+import org.sonar.api.PropertyType;
 import org.sonar.api.resources.Java;
 import org.sonar.plugins.core.batch.ExcludedResourceFilter;
 import org.sonar.plugins.core.batch.IndexProjectPostJob;
@@ -50,177 +48,177 @@ import org.sonar.plugins.core.widgets.reviews.*;
 import java.util.List;
 
 @Properties({
-    @Property(
-        key = CoreProperties.SERVER_BASE_URL,
-        defaultValue = CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE,
-        name = "Server base URL",
-        description = "HTTP URL of this Sonar server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.",
-        project = false,
-        global = true,
-        category = CoreProperties.CATEGORY_GENERAL),
-    @Property(
-        key = CoreProperties.CORE_COVERAGE_PLUGIN_PROPERTY,
-        defaultValue = "cobertura",
-        name = "Code coverage plugin",
-        description = "Key of the code coverage plugin to use.",
-        project = true,
-        global = true,
-        category = CoreProperties.CATEGORY_CODE_COVERAGE),
-    @Property(
-        key = CoreProperties.CORE_IMPORT_SOURCES_PROPERTY,
-        defaultValue = "" + CoreProperties.CORE_IMPORT_SOURCES_DEFAULT_VALUE,
-        name = "Import sources",
-        description = "Set to false if sources should not be displayed, e.g. for security reasons.",
-        project = true,
-        module = true,
-        global = true,
-        category = CoreProperties.CATEGORY_SECURITY,
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_TENDENCY_DEPTH_PROPERTY,
-        defaultValue = "" + CoreProperties.CORE_TENDENCY_DEPTH_DEFAULT_VALUE,
-        name = "Tendency period",
-        description = TendencyDecorator.PROP_DAYS_DESCRIPTION,
-        project = false,
-        global = true,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS,
-        type = Property.Type.INTEGER),
-    @Property(
-        key = CoreProperties.SKIP_TENDENCIES_PROPERTY,
-        defaultValue = "" + CoreProperties.SKIP_TENDENCIES_DEFAULT_VALUE,
-        name = "Skip tendencies",
-        description = "Skip calculation of measure tendencies",
-        project = true,
-        module = false,
-        global = true,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS,
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_SKIPPED_MODULES_PROPERTY,
-        name = "Exclude modules",
-        description = "Maven artifact ids of modules to exclude (comma-separated).",
-        project = true,
-        global = false,
-        category = CoreProperties.CATEGORY_GENERAL),
-    @Property(
-        key = CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY,
-        defaultValue = "" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE,
-        name = "Force user authentication",
-        description = "Forcing user authentication stops un-logged users to access Sonar.",
-        project = false,
-        global = true,
-        category = CoreProperties.CATEGORY_SECURITY,
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY,
-        defaultValue = "" + CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE,
-        name = "Allow users to sign up online",
-        description = "Users can sign up online.",
-        project = false,
-        global = true,
-        category = CoreProperties.CATEGORY_SECURITY,
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_DEFAULT_GROUP,
-        defaultValue = CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE,
-        name = "Default user group",
-        description = "Any new users will automatically join this group.",
-        project = false,
-        global = true,
-        category = CoreProperties.CATEGORY_SECURITY),
-    @Property(
-        key = CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY,
-        defaultValue = "en",
-        name = "Locale used for violation messages",
-        description = "Locale to be used when generating violation messages. It's up to each rule engine to support this global internationalization property",
-        project = true,
-        global = true,
-        category = CoreProperties.CATEGORY_L10N),
-    @Property(
-        key = "sonar.timemachine.period1",
-        name = "Period 1",
-        description = "Period used to compare measures and track new violations. Values are : <ul class='bullet'><li>Number of days before " +
-            "analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, for example 2010-12-25</li><li>'previous_analysis' to " +
-            "compare to previous analysis</li></ul>" +
-            "Changing this property only take effect after subsequent project inspections.",
-        project = false,
-        global = true,
-        defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
-    @Property(
-        key = "sonar.timemachine.period2",
-        name = "Period 2",
-        description = "See the property 'Period 1'",
-        project = false,
-        global = true,
-        defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
-    @Property(
-        key = "sonar.timemachine.period3",
-        name = "Period 3",
-        description = "See the property 'Period 1'",
-        project = false,
-        global = true,
-        defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
-    @Property(
-        key = "sonar.timemachine.period4",
-        name = "Period 4",
-        description = "Period used to compare measures and track new violations. This property is specific to the project. Values are : " +
-            "<ul class='bullet'><li>Number of days before analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, " +
-            "for example 2010-12-25</li><li>'previous_analysis' to compare to previous analysis</li><li>A version, for example 1.2</li></ul>" +
-            "Changing this property only take effect after subsequent project inspection.",
-        project = true,
-        global = false,
-        defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
-    @Property(
-        key = "sonar.timemachine.period5",
-        name = "Period 5",
-        description = "See the property 'Period 4'",
-        project = true,
-        global = false,
-        defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5,
-        category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
+  @Property(
+    key = CoreProperties.SERVER_BASE_URL,
+    defaultValue = CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE,
+    name = "Server base URL",
+    description = "HTTP URL of this Sonar server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.",
+    project = false,
+    global = true,
+    category = CoreProperties.CATEGORY_GENERAL),
+  @Property(
+    key = CoreProperties.CORE_COVERAGE_PLUGIN_PROPERTY,
+    defaultValue = "cobertura",
+    name = "Code coverage plugin",
+    description = "Key of the code coverage plugin to use.",
+    project = true,
+    global = true,
+    category = CoreProperties.CATEGORY_CODE_COVERAGE),
+  @Property(
+    key = CoreProperties.CORE_IMPORT_SOURCES_PROPERTY,
+    defaultValue = "" + CoreProperties.CORE_IMPORT_SOURCES_DEFAULT_VALUE,
+    name = "Import sources",
+    description = "Set to false if sources should not be displayed, e.g. for security reasons.",
+    project = true,
+    module = true,
+    global = true,
+    category = CoreProperties.CATEGORY_SECURITY,
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_TENDENCY_DEPTH_PROPERTY,
+    defaultValue = "" + CoreProperties.CORE_TENDENCY_DEPTH_DEFAULT_VALUE,
+    name = "Tendency period",
+    description = TendencyDecorator.PROP_DAYS_DESCRIPTION,
+    project = false,
+    global = true,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS,
+    type = PropertyType.INTEGER),
+  @Property(
+    key = CoreProperties.SKIP_TENDENCIES_PROPERTY,
+    defaultValue = "" + CoreProperties.SKIP_TENDENCIES_DEFAULT_VALUE,
+    name = "Skip tendencies",
+    description = "Skip calculation of measure tendencies",
+    project = true,
+    module = false,
+    global = true,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS,
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_SKIPPED_MODULES_PROPERTY,
+    name = "Exclude modules",
+    description = "Maven artifact ids of modules to exclude (comma-separated).",
+    project = true,
+    global = false,
+    category = CoreProperties.CATEGORY_GENERAL),
+  @Property(
+    key = CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY,
+    defaultValue = "" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE,
+    name = "Force user authentication",
+    description = "Forcing user authentication stops un-logged users to access Sonar.",
+    project = false,
+    global = true,
+    category = CoreProperties.CATEGORY_SECURITY,
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY,
+    defaultValue = "" + CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE,
+    name = "Allow users to sign up online",
+    description = "Users can sign up online.",
+    project = false,
+    global = true,
+    category = CoreProperties.CATEGORY_SECURITY,
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_DEFAULT_GROUP,
+    defaultValue = CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE,
+    name = "Default user group",
+    description = "Any new users will automatically join this group.",
+    project = false,
+    global = true,
+    category = CoreProperties.CATEGORY_SECURITY),
+  @Property(
+    key = CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY,
+    defaultValue = "en",
+    name = "Locale used for violation messages",
+    description = "Locale to be used when generating violation messages. It's up to each rule engine to support this global internationalization property",
+    project = true,
+    global = true,
+    category = CoreProperties.CATEGORY_L10N),
+  @Property(
+    key = "sonar.timemachine.period1",
+    name = "Period 1",
+    description = "Period used to compare measures and track new violations. Values are : <ul class='bullet'><li>Number of days before " +
+      "analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, for example 2010-12-25</li><li>'previous_analysis' to " +
+      "compare to previous analysis</li></ul>" +
+      "Changing this property only take effect after subsequent project inspections.",
+    project = false,
+    global = true,
+    defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
+  @Property(
+    key = "sonar.timemachine.period2",
+    name = "Period 2",
+    description = "See the property 'Period 1'",
+    project = false,
+    global = true,
+    defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
+  @Property(
+    key = "sonar.timemachine.period3",
+    name = "Period 3",
+    description = "See the property 'Period 1'",
+    project = false,
+    global = true,
+    defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
+  @Property(
+    key = "sonar.timemachine.period4",
+    name = "Period 4",
+    description = "Period used to compare measures and track new violations. This property is specific to the project. Values are : " +
+      "<ul class='bullet'><li>Number of days before analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, " +
+      "for example 2010-12-25</li><li>'previous_analysis' to compare to previous analysis</li><li>A version, for example 1.2</li></ul>" +
+      "Changing this property only take effect after subsequent project inspection.",
+    project = true,
+    global = false,
+    defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
+  @Property(
+    key = "sonar.timemachine.period5",
+    name = "Period 5",
+    description = "See the property 'Period 4'",
+    project = true,
+    global = false,
+    defaultValue = CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5,
+    category = CoreProperties.CATEGORY_DIFFERENTIAL_VIEWS),
 
 
-    // SERVER-SIDE TECHNICAL PROPERTIES
+  // SERVER-SIDE TECHNICAL PROPERTIES
 
-    @Property(
-        key = "sonar.security.realm",
-        name = "Security Realm",
-        project = false,
-        global = false
-    ),
-    @Property(
-        key = "sonar.security.savePassword",
-        name = "Save external password",
-        project = false,
-        global = false
-    ),
-    @Property(
-        key = "sonar.authenticator.downcase",
-        name = "Downcase login",
-        description = "Downcase login during user authentication, typically for Active Directory",
-        project = false,
-        global = false,
-        defaultValue = "false",
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS,
-        name = "Create user accounts",
-        description = "Create accounts when authenticating users via an external system",
-        project = false,
-        global = false,
-        defaultValue = "true",
-        type = Property.Type.BOOLEAN),
-    @Property(
-        key = CoreProperties.CORE_AUTHENTICATOR_IGNORE_STARTUP_FAILURE,
-        name = "Ignore failures during authenticator startup",
-        defaultValue = "false",
-        project = false,
-        global = false,
-        type = Property.Type.BOOLEAN)
+  @Property(
+    key = "sonar.security.realm",
+    name = "Security Realm",
+    project = false,
+    global = false
+  ),
+  @Property(
+    key = "sonar.security.savePassword",
+    name = "Save external password",
+    project = false,
+    global = false
+  ),
+  @Property(
+    key = "sonar.authenticator.downcase",
+    name = "Downcase login",
+    description = "Downcase login during user authentication, typically for Active Directory",
+    project = false,
+    global = false,
+    defaultValue = "false",
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS,
+    name = "Create user accounts",
+    description = "Create accounts when authenticating users via an external system",
+    project = false,
+    global = false,
+    defaultValue = "true",
+    type = PropertyType.BOOLEAN),
+  @Property(
+    key = CoreProperties.CORE_AUTHENTICATOR_IGNORE_STARTUP_FAILURE,
+    name = "Ignore failures during authenticator startup",
+    defaultValue = "false",
+    project = false,
+    global = false,
+    type = PropertyType.BOOLEAN)
 })
 public final class CorePlugin extends SonarPlugin {
 
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
index ddefdb4fa4c..2708f843d17 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
@@ -19,10 +19,8 @@
  */
 package org.sonar.plugins.cpd;
 
-import org.sonar.api.CoreProperties;
-import org.sonar.api.Properties;
-import org.sonar.api.Property;
-import org.sonar.api.SonarPlugin;
+import org.sonar.api.*;
+import org.sonar.api.PropertyType;
 import org.sonar.plugins.cpd.decorators.DuplicationDensityDecorator;
 import org.sonar.plugins.cpd.decorators.SumDuplicationsDecorator;
 import org.sonar.plugins.cpd.index.IndexFactory;
@@ -43,7 +41,7 @@ import java.util.List;
     module = true,
     global = true,
     category = CoreProperties.CATEGORY_DUPLICATIONS,
-    type = Property.Type.SINGLE_SELECT_LIST,
+    type = PropertyType.SINGLE_SELECT_LIST,
     options = {"sonar", "pmd"}),
   @Property(
     key = CoreProperties.CPD_CROSS_RPOJECT,
@@ -56,7 +54,7 @@ import java.util.List;
     module = true,
     global = true,
     category = CoreProperties.CATEGORY_DUPLICATIONS,
-    type = Property.Type.BOOLEAN),
+    type = PropertyType.BOOLEAN),
   @Property(
     key = CoreProperties.CPD_MINIMUM_TOKENS_PROPERTY,
     defaultValue = CoreProperties.CPD_MINIMUM_TOKENS_DEFAULT_VALUE + "",
@@ -67,7 +65,7 @@ import java.util.List;
     module = true,
     global = true,
     category = CoreProperties.CATEGORY_DUPLICATIONS,
-    type = Property.Type.INTEGER),
+    type = PropertyType.INTEGER),
   @Property(
     key = CoreProperties.CPD_IGNORE_LITERALS_PROPERTY,
     defaultValue = CoreProperties.CPD_IGNORE_LITERALS_DEFAULT_VALUE + "",
@@ -79,7 +77,7 @@ import java.util.List;
     module = true,
     global = true,
     category = CoreProperties.CATEGORY_DUPLICATIONS,
-    type = Property.Type.BOOLEAN),
+    type = PropertyType.BOOLEAN),
   @Property(
     key = CoreProperties.CPD_IGNORE_IDENTIFIERS_PROPERTY,
     defaultValue = CoreProperties.CPD_IGNORE_IDENTIFIERS_DEFAULT_VALUE + "",
@@ -90,7 +88,7 @@ import java.util.List;
     module = true,
     global = true,
     category = CoreProperties.CATEGORY_DUPLICATIONS,
-    type = Property.Type.BOOLEAN)
+    type = PropertyType.BOOLEAN)
 })
 public final class CpdPlugin extends SonarPlugin {
 
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
index 15a74fa8768..4507771468f 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DbCleanerPlugin.java
@@ -21,6 +21,7 @@ package org.sonar.plugins.dbcleaner;
 
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
+import org.sonar.api.PropertyType;
 import org.sonar.api.SonarPlugin;
 import org.sonar.plugins.dbcleaner.api.DbCleanerConstants;
 import org.sonar.plugins.dbcleaner.period.DefaultPeriodCleaner;
@@ -35,20 +36,20 @@ import java.util.List;
       + "the DbCleaner keeps the first one and fully delete the other ones.",
     global = true,
     project = true,
-    type = Property.Type.INTEGER),
+    type = PropertyType.INTEGER),
   @Property(key = DbCleanerConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_MONTH, defaultValue = "52",
     name = "Number of weeks before starting to keep only one snapshot by month",
     description = "After this number of weeks, if there are several snapshots during the same month, "
       + "the DbCleaner keeps the first one and fully delete the other ones.",
     global = true,
     project = true,
-    type = Property.Type.INTEGER),
+    type = PropertyType.INTEGER),
   @Property(key = DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS, defaultValue = "260",
     name = "Number of weeks before starting to delete all remaining snapshots",
     description = "After this number of weeks, all snapshots are fully deleted.",
     global = true,
     project = true,
-    type = Property.Type.INTEGER)
+    type = PropertyType.INTEGER)
 }
 )
 public final class DbCleanerPlugin extends SonarPlugin {
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DefaultPurgeTask.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DefaultPurgeTask.java
index 6fe63815b53..afee357487a 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DefaultPurgeTask.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/DefaultPurgeTask.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.Properties;
 import org.sonar.api.Property;
+import org.sonar.api.PropertyType;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Scopes;
 import org.sonar.core.purge.PurgeDao;
@@ -41,7 +42,7 @@ import org.sonar.plugins.dbcleaner.period.DefaultPeriodCleaner;
     global = true,
     project = true,
     module = false,
-    type = Property.Type.BOOLEAN)
+    type = PropertyType.BOOLEAN)
 })
 public class DefaultPurgeTask implements PurgeTask {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultPurgeTask.class);
diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java
index 115feb801d2..070dfbee8bd 100644
--- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java
+++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java
@@ -20,6 +20,7 @@
 package org.sonar.plugins.findbugs;
 
 import org.sonar.api.*;
+import org.sonar.api.PropertyType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +44,7 @@ import java.util.List;
     project = true,
     module = true,
     global = true,
-    type = Property.Type.INTEGER),
+    type = PropertyType.INTEGER),
   @Property(
     key = FindbugsConstants.EXCLUDES_FILTERS_PROPERTY,
     name = "Excludes Filters",
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 7ff09ae2a5e..2f3e06c1be6 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -549,6 +549,12 @@ property.category.duplications=Duplications
 property.category.localization=Localization
 property.category.server_id=Server ID
 
+property.error.notBoolean=Valid options are "true" and "false"
+property.error.notInteger=Only digits are allowed
+property.error.notFloat=Not a floating point number
+property.error.notInOptions=Not a valid option
+
+
 
 #------------------------------------------------------------------------------
 #
diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/SquidPlugin.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/SquidPlugin.java
index 6e06dd8fde6..7932d233545 100644
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/SquidPlugin.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/SquidPlugin.java
@@ -19,10 +19,8 @@
  */
 package org.sonar.plugins.squid;
 
-import org.sonar.api.CoreProperties;
-import org.sonar.api.Properties;
-import org.sonar.api.Property;
-import org.sonar.api.SonarPlugin;
+import org.sonar.api.*;
+import org.sonar.api.PropertyType;
 import org.sonar.plugins.squid.decorators.*;
 
 import java.util.Arrays;
@@ -37,7 +35,7 @@ import java.util.List;
     project = true,
     global = true,
     category = CoreProperties.CATEGORY_JAVA,
-    type = Property.Type.BOOLEAN),
+    type = PropertyType.BOOLEAN),
   @Property(key = SquidPluginProperties.FIELDS_TO_EXCLUDE_FROM_LCOM4_COMPUTATION,
     defaultValue = SquidPluginProperties.FIELDS_TO_EXCLUDE_FROM_LCOM4_COMPUTATION_DEFAULT_VALUE,
     name = "List of fields to exclude from LCOM4 computation",
@@ -55,7 +53,7 @@ import java.util.List;
     project = true,
     global = true,
     category = CoreProperties.CATEGORY_JAVA,
-    type = Property.Type.BOOLEAN)
+    type = PropertyType.BOOLEAN)
 })
 public final class SquidPlugin extends SonarPlugin {