Extract Squid into its own module

objective-c-squid/pom.xml

@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.sonarqubecommunity.objectivec</groupId>
+        <artifactId>objective-c</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>objective-c-squid</artifactId>
+
+    <name>SonarQube Objective-C (Community) :: Squid</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.sonar</groupId>
+            <artifactId>sonar-plugin-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.sslr</groupId>
+            <artifactId>sslr-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.sslr-squid-bridge</groupId>
+            <artifactId>sslr-squid-bridge</artifactId>
+        </dependency>
+        <!-- unit tests -->
+        <dependency>
+            <groupId>org.codehaus.sonar</groupId>
+            <artifactId>sonar-testing-harness</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.sslr</groupId>
+            <artifactId>sslr-testing-harness</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCAstScanner.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/ObjectiveCConfiguration.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCGrammar.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCKeyword.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCMetric.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCPunctuator.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/ObjectiveCTokenType.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/api/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/CheckList.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/checks/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SonarComponents.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/SyntaxHighlighterVisitor.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/highlighter/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/BackslashChannel.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/CharacterLiteralsChannel.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/ObjectiveCLexer.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/StringLiteralsChannel.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/lexer/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/ObjectiveCParser.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/main/java/org/sonar/objectivec/parser/package-info.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/ObjectiveCAstScannerTest.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/api/ObjectiveCPunctuatorTest.java → 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:[email protected]
  *

sonar-objective-c-plugin/src/test/java/org/sonar/objectivec/lexer/ObjectiveCLexerTest.java → 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:[email protected]
  *

pom.xml

@@ -28,6 +28,7 @@
     </licenses>
 
     <modules>
+        <module>objective-c-squid</module>
         <module>sonar-objective-c-plugin</module>
         <module>sslr-objective-c-toolkit</module>
         <module>its</module>

sonar-objective-c-plugin/pom.xml

@@ -30,12 +30,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.sonarsource.sslr</groupId>
-            <artifactId>sslr-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sonarsource.sslr-squid-bridge</groupId>
-            <artifactId>sslr-squid-bridge</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>objective-c-squid</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.plist</groupId>
@@ -47,11 +44,6 @@
             <artifactId>sonar-testing-harness</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.sonarsource.sslr</groupId>
-            <artifactId>sslr-testing-harness</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

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;

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 {
 

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;

sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveC.java → 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;

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;

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;
 

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;

sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCCpdMapping.java → 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;
 

sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/ObjectiveCTokenizer.java → 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;

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;

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;

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;
 

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 {