diff --git a/objective-c-squid/pom.xml b/objective-c-squid/pom.xml new file mode 100644 index 00000000..73a4be35 --- /dev/null +++ b/objective-c-squid/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + + + org.sonarqubecommunity.objectivec + objective-c + 0.5.0-SNAPSHOT + + + objective-c-squid + + SonarQube Objective-C (Community) :: Squid + + + + org.codehaus.sonar + sonar-plugin-api + + + org.sonarsource.sslr + sslr-core + + + org.sonarsource.sslr-squid-bridge + sslr-squid-bridge + + + + org.codehaus.sonar + sonar-testing-harness + test + + + org.sonarsource.sslr + sslr-testing-harness + test + + + junit + junit + test + + + org.easytesting + fest-assert + test + + + ch.qos.logback + logback-classic + test + + + diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java b/objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java similarity index 99% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java index 676d2726..6ccc5f04 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java b/objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java similarity index 96% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java index 86330a9e..1a424d21 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java similarity index 96% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java index 5043dcce..fe2f1146 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java similarity index 99% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java index 34ab334b..142e7e6a 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java similarity index 97% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java index c8edcd1b..194dcd17 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java similarity index 98% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java index 556d4347..f994e9ba 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java similarity index 97% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java index ca0c79ec..43712110 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/api/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/api/package-info.java index 33f68629..176f3d34 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/api/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/CheckList.java b/objective-c-squid/src/main/java/org/sonar/objectivec/checks/CheckList.java similarity index 96% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/CheckList.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/checks/CheckList.java index bc1a9cce..0d9c55eb 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/CheckList.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/checks/CheckList.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/checks/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/checks/package-info.java index c4dff5c7..64255f1c 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/checks/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java similarity index 97% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java index fdaa0319..422e288a 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java similarity index 99% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java index d9ead3f6..25cb2c12 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/package-info.java index 1054849a..0d67a3fd 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/highlighter/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java similarity index 97% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java index a05d355b..4bdaf728 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java similarity index 98% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java index 3fd75e11..bb3c603a 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java similarity index 99% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java index 040c6493..4d97e16c 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java similarity index 99% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java index 1116acd6..0ce6e785 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/lexer/package-info.java index 31ac5496..fb8724fa 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/lexer/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/package-info.java index 7786918c..424a3dbb 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java b/objective-c-squid/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java similarity index 97% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java index 3a4a14b2..3fbda558 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/package-info.java b/objective-c-squid/src/main/java/org/sonar/objectivec/parser/package-info.java similarity index 95% rename from sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/package-info.java rename to objective-c-squid/src/main/java/org/sonar/objectivec/parser/package-info.java index b84ce086..4b22d0b6 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/package-info.java +++ b/objective-c-squid/src/main/java/org/sonar/objectivec/parser/package-info.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java b/objective-c-squid/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java similarity index 97% rename from sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java rename to objective-c-squid/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java index 4771bccf..2988862a 100644 --- a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java +++ b/objective-c-squid/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java b/objective-c-squid/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java similarity index 96% rename from sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java rename to objective-c-squid/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java index a451307c..adf5f744 100644 --- a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java +++ b/objective-c-squid/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java b/objective-c-squid/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java similarity index 98% rename from sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java rename to objective-c-squid/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java index 8905db3f..a9671742 100644 --- a/sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java +++ b/objective-c-squid/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java @@ -1,5 +1,5 @@ /* - * SonarQube Objective-C (Community) Plugin + * SonarQube Objective-C (Community) :: Squid * Copyright (C) 2012-2016 OCTO Technology, Backelite, and contributors * mailto:sonarqube@googlegroups.com * diff --git a/sonar-objective-c-plugin/src/test/resources/Profile.m b/objective-c-squid/src/test/resources/Profile.m similarity index 100% rename from sonar-objective-c-plugin/src/test/resources/Profile.m rename to objective-c-squid/src/test/resources/Profile.m diff --git a/sonar-objective-c-plugin/src/test/resources/objcSample.h b/objective-c-squid/src/test/resources/objcSample.h similarity index 100% rename from sonar-objective-c-plugin/src/test/resources/objcSample.h rename to objective-c-squid/src/test/resources/objcSample.h diff --git a/pom.xml b/pom.xml index c9885e79..ab48fc98 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ + objective-c-squid sonar-objective-c-plugin sslr-objective-c-toolkit its diff --git a/sonar-objective-c-plugin/pom.xml b/sonar-objective-c-plugin/pom.xml index 532273cd..7063dc7e 100644 --- a/sonar-objective-c-plugin/pom.xml +++ b/sonar-objective-c-plugin/pom.xml @@ -30,12 +30,9 @@ provided - org.sonarsource.sslr - sslr-core - - - org.sonarsource.sslr-squid-bridge - sslr-squid-bridge + ${project.groupId} + objective-c-squid + ${project.version} com.googlecode.plist @@ -47,11 +44,6 @@ sonar-testing-harness test - - org.sonarsource.sslr - sslr-testing-harness - test - junit junit diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCPlugin.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCPlugin.java index 816f58c2..b4715cd3 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCPlugin.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCPlugin.java @@ -22,11 +22,13 @@ import org.sonar.api.SonarPlugin; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; +import org.sonar.plugins.objectivec.api.ObjectiveC; import org.sonar.plugins.objectivec.clang.ClangProfile; import org.sonar.plugins.objectivec.clang.ClangProfileImporter; import org.sonar.plugins.objectivec.clang.ClangRulesDefinition; import org.sonar.plugins.objectivec.clang.ClangSensor; import org.sonar.plugins.objectivec.cobertura.CoberturaSensor; +import org.sonar.plugins.objectivec.cpd.ObjectiveCCpdMapping; import org.sonar.plugins.objectivec.lizard.LizardSensor; import org.sonar.plugins.objectivec.oclint.OCLintProfile; import org.sonar.plugins.objectivec.oclint.OCLintProfileImporter; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCProfile.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCProfile.java index c2bac26c..376eb542 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCProfile.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCProfile.java @@ -24,6 +24,7 @@ import org.sonar.api.profiles.RulesProfile; import org.sonar.api.utils.ValidationMessages; import org.sonar.objectivec.checks.CheckList; +import org.sonar.plugins.objectivec.api.ObjectiveC; public class ObjectiveCProfile extends ProfileDefinition { diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCSquidSensor.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCSquidSensor.java index 0d06de65..7a2889ed 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCSquidSensor.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCSquidSensor.java @@ -42,6 +42,7 @@ import org.sonar.objectivec.api.ObjectiveCMetric; import org.sonar.objectivec.checks.CheckList; import org.sonar.objectivec.highlighter.SonarComponents; +import org.sonar.plugins.objectivec.api.ObjectiveC; import org.sonar.squidbridge.AstScanner; import org.sonar.squidbridge.SquidAstVisitor; import org.sonar.squidbridge.api.CheckMessage; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveC.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/api/ObjectiveC.java similarity index 98% rename from sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveC.java rename to sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/api/ObjectiveC.java index ba2ac7f7..08c8cea2 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveC.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/api/ObjectiveC.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.objectivec; +package org.sonar.plugins.objectivec.api; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfile.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfile.java index 4360e4da..3070c262 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfile.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfile.java @@ -24,7 +24,7 @@ import org.sonar.api.profiles.ProfileDefinition; import org.sonar.api.profiles.RulesProfile; import org.sonar.api.utils.ValidationMessages; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.io.IOException; import java.io.InputStreamReader; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfileImporter.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfileImporter.java index 415b4ce0..1fde82c3 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfileImporter.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangProfileImporter.java @@ -25,7 +25,7 @@ import org.sonar.api.profiles.RulesProfile; import org.sonar.api.profiles.XMLProfileParser; import org.sonar.api.utils.ValidationMessages; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.io.Reader; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangRulesDefinition.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangRulesDefinition.java index e49a31a0..d72d0c25 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangRulesDefinition.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/clang/ClangRulesDefinition.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import org.sonar.squidbridge.rules.SqaleXmlLoader; import java.util.Map; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCCpdMapping.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCCpdMapping.java similarity index 94% rename from sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCCpdMapping.java rename to sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCCpdMapping.java index c8386e0c..aadc15a3 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCCpdMapping.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCCpdMapping.java @@ -17,12 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.objectivec; +package org.sonar.plugins.objectivec.cpd; import net.sourceforge.pmd.cpd.Tokenizer; import org.sonar.api.batch.AbstractCpdMapping; import org.sonar.api.batch.fs.FileSystem; import org.sonar.api.resources.Language; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.nio.charset.Charset; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCTokenizer.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCTokenizer.java similarity index 98% rename from sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCTokenizer.java rename to sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCTokenizer.java index 8557d807..b2565310 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCTokenizer.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/cpd/ObjectiveCTokenizer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.objectivec; +package org.sonar.plugins.objectivec.cpd; import com.sonar.sslr.api.Token; import com.sonar.sslr.impl.Lexer; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/lizard/LizardSensor.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/lizard/LizardSensor.java index c742581c..4ca4d2e7 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/lizard/LizardSensor.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/lizard/LizardSensor.java @@ -30,7 +30,7 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.scan.filesystem.PathResolver; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.io.File; import java.util.List; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfile.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfile.java index d498952e..a5f11733 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfile.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfile.java @@ -24,7 +24,7 @@ import org.sonar.api.profiles.ProfileDefinition; import org.sonar.api.profiles.RulesProfile; import org.sonar.api.utils.ValidationMessages; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.io.IOException; import java.io.InputStreamReader; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfileImporter.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfileImporter.java index 9a7c8b89..205ff16a 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfileImporter.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintProfileImporter.java @@ -25,7 +25,7 @@ import org.sonar.api.profiles.RulesProfile; import org.sonar.api.profiles.XMLProfileParser; import org.sonar.api.utils.ValidationMessages; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import java.io.Reader; diff --git a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintRulesDefinition.java b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintRulesDefinition.java index f310fbc7..cb80925b 100644 --- a/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintRulesDefinition.java +++ b/sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/oclint/OCLintRulesDefinition.java @@ -21,7 +21,7 @@ import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; -import org.sonar.plugins.objectivec.ObjectiveC; +import org.sonar.plugins.objectivec.api.ObjectiveC; import org.sonar.squidbridge.rules.SqaleXmlLoader; public final class OCLintRulesDefinition implements RulesDefinition { diff --git a/sslr-objective-c-toolkit/pom.xml b/sslr-objective-c-toolkit/pom.xml index 4ccda2fa..425c1e8d 100644 --- a/sslr-objective-c-toolkit/pom.xml +++ b/sslr-objective-c-toolkit/pom.xml @@ -20,7 +20,7 @@ ${project.groupId} - sonar-objective-c-plugin + objective-c-squid ${project.version} @@ -67,7 +67,7 @@ - ${project.groupId}:sonar-objective-c-plugin + ${project.groupId}:objective-c-squid org.sonarsource.sslr:sslr-core org.sonarsource.sslr:sslr-xpath jaxen:jaxen @@ -105,8 +105,8 @@ - 4700000 - 4600000 + 3500000 + 3400000 ${project.build.directory}/${project.build.finalName}.jar