Merge pull request #856 from Bertk/rmsqale

remove sqale model
SonarOpenCommunity · May 5, 2016 · 0d3b1bb · 0d3b1bb
2 parents 59a56dd + 2782682
commit 0d3b1bb
Show file tree

Hide file tree

Showing 14 changed files with 3,066 additions and 32,899 deletions.
diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxRuleRepository.java
@@ -39,7 +39,6 @@ public void define(Context context) {
       rule.setInternalKey(rule.key());
     }
 
-    SqaleXmlLoader.load(repository, "/com/sonar/sqale/cxx-model.xml");
     repository.done();
   }
 }
diff --git a/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java b/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java
@@ -62,17 +62,6 @@ public void define(Context context) {
       }
     }
 
-    SqaleXmlLoader.load(repository, "/com/sonar/sqale/cxx-model.xml");
-    for (String sqaleDefs : settings.getStringArray(SQALES_KEY)) {
-      if (StringUtils.isNotBlank(sqaleDefs)) {
-        try {
-          CxxSqaleXmlLoader.load(repository, new StringReader(sqaleDefs));
-        } catch (Exception ex) {
-          CxxUtils.LOG.info("Cannot load SQALE XML '{}'", ex);
-        }
-      }
-    }
-
     repository.done();
   }
 

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxAbstractRuleRepository.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxAbstractRuleRepository.java
@@ -81,7 +81,6 @@ public void define(Context context) {
     }
 
     //i18nLoader.load(repository); //@todo?
-    SqaleXmlLoader.load(repository, "/com/sonar/sqale/cxx-model.xml");
     repository.done();
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,6 @@ public void define(Context context) { @@
         }
         //i18nLoader.load(repository); //@todo?
-        SqaleXmlLoader.load(repository, "/com/sonar/sqale/cxx-model.xml");
         repository.done();
       }
@@ Expand Down @@