From 5b8fdc0fefa57b102971e073208955003c0e6f3c Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Mon, 8 Nov 2010 15:10:44 +0000
Subject: [PATCH] improve integration tests: rename the reference plugin with
 standard convention of artifact ids

---
 tests/integration/pom.xml                                     | 2 +-
 .../{reference-plugin => sonar-it-reference-plugin}/pom.xml   | 4 ++--
 .../src/main/java/itests/ITestsPlugin.java                    | 0
 .../src/main/java/itests/SampleSensor.java                    | 0
 .../itests/ServerSideExtensionUsingExternalDependency.java    | 0
 .../src/main/java/itests/footer/SampleFooter.java             | 0
 .../java/itests/languages/LanguageWithoutRulesEngine.java     | 0
 .../src/main/java/itests/page/GwtSamplePage.java              | 0
 .../src/main/java/itests/page/RubyApiTestsPage.java           | 0
 .../src/main/java/itests/page/client/GwtModule.java           | 0
 .../src/main/java/itests/resourcetab/SampleResourceTab.java   | 0
 .../java/itests/resourcetab/client/GwtSampleResourceTab.java  | 0
 .../src/main/java/itests/ws/RubyWebService.java               | 0
 .../src/main/resources/itests/page/GwtModule.gwt.xml          | 0
 .../main/resources/itests/page/ruby_api_tests_page.html.erb   | 0
 .../resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml | 0
 .../src/main/resources/itests/resourcetab/public/sample.html  | 0
 .../src/main/resources/itests/ws/ruby_ws_controller.rb        | 0
 .../src/main/resources/static/file.html                       | 0
 tests/integration/tests/build.xml                             | 4 ++--
 tests/integration/tests/pom.xml                               | 2 +-
 21 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/pom.xml (98%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/ITestsPlugin.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/SampleSensor.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/ServerSideExtensionUsingExternalDependency.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/footer/SampleFooter.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/languages/LanguageWithoutRulesEngine.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/page/GwtSamplePage.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/page/RubyApiTestsPage.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/page/client/GwtModule.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/resourcetab/SampleResourceTab.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/resourcetab/client/GwtSampleResourceTab.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/java/itests/ws/RubyWebService.java (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/itests/page/GwtModule.gwt.xml (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/itests/page/ruby_api_tests_page.html.erb (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/itests/resourcetab/public/sample.html (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/itests/ws/ruby_ws_controller.rb (100%)
 rename tests/integration/{reference-plugin => sonar-it-reference-plugin}/src/main/resources/static/file.html (100%)

diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index fe363492826..c62430f66b4 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -13,7 +13,7 @@
   <name>Sonar :: Integration Tests</name>
 
   <modules>
-    <module>reference-plugin</module>
+    <module>sonar-it-reference-plugin</module>
     <module>checkstyle-extensions</module>
     <module>pmd-extensions</module>
     <module>tests</module>
diff --git a/tests/integration/reference-plugin/pom.xml b/tests/integration/sonar-it-reference-plugin/pom.xml
similarity index 98%
rename from tests/integration/reference-plugin/pom.xml
rename to tests/integration/sonar-it-reference-plugin/pom.xml
index fbe536ac8ac..3e256ae9fbe 100644
--- a/tests/integration/reference-plugin/pom.xml
+++ b/tests/integration/sonar-it-reference-plugin/pom.xml
@@ -7,7 +7,7 @@
     <version>2.4-SNAPSHOT</version>
   </parent>
   
-  <artifactId>reference-plugin</artifactId>
+  <artifactId>sonar-it-reference-plugin</artifactId>
   <name>Sonar :: Integration Tests :: Reference Plugin</name>
   <packaging>sonar-plugin</packaging>
   <description>My Sonar plugin</description>
@@ -92,7 +92,7 @@
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4</version>
         <extensions>true</extensions>
         <configuration>
           <pluginClass>itests.ITestsPlugin</pluginClass>
diff --git a/tests/integration/reference-plugin/src/main/java/itests/ITestsPlugin.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/ITestsPlugin.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/ITestsPlugin.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/ITestsPlugin.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/SampleSensor.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/SampleSensor.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/SampleSensor.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/SampleSensor.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/ServerSideExtensionUsingExternalDependency.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/ServerSideExtensionUsingExternalDependency.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/ServerSideExtensionUsingExternalDependency.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/ServerSideExtensionUsingExternalDependency.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/footer/SampleFooter.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/footer/SampleFooter.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/footer/SampleFooter.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/footer/SampleFooter.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/languages/LanguageWithoutRulesEngine.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/languages/LanguageWithoutRulesEngine.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/languages/LanguageWithoutRulesEngine.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/languages/LanguageWithoutRulesEngine.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/page/GwtSamplePage.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/GwtSamplePage.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/page/GwtSamplePage.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/GwtSamplePage.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/page/RubyApiTestsPage.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/RubyApiTestsPage.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/page/RubyApiTestsPage.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/RubyApiTestsPage.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/page/client/GwtModule.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/client/GwtModule.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/page/client/GwtModule.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/page/client/GwtModule.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/resourcetab/SampleResourceTab.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/resourcetab/SampleResourceTab.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/resourcetab/SampleResourceTab.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/resourcetab/SampleResourceTab.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/resourcetab/client/GwtSampleResourceTab.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/resourcetab/client/GwtSampleResourceTab.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/resourcetab/client/GwtSampleResourceTab.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/resourcetab/client/GwtSampleResourceTab.java
diff --git a/tests/integration/reference-plugin/src/main/java/itests/ws/RubyWebService.java b/tests/integration/sonar-it-reference-plugin/src/main/java/itests/ws/RubyWebService.java
similarity index 100%
rename from tests/integration/reference-plugin/src/main/java/itests/ws/RubyWebService.java
rename to tests/integration/sonar-it-reference-plugin/src/main/java/itests/ws/RubyWebService.java
diff --git a/tests/integration/reference-plugin/src/main/resources/itests/page/GwtModule.gwt.xml b/tests/integration/sonar-it-reference-plugin/src/main/resources/itests/page/GwtModule.gwt.xml
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/itests/page/GwtModule.gwt.xml
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/itests/page/GwtModule.gwt.xml
diff --git a/tests/integration/reference-plugin/src/main/resources/itests/page/ruby_api_tests_page.html.erb b/tests/integration/sonar-it-reference-plugin/src/main/resources/itests/page/ruby_api_tests_page.html.erb
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/itests/page/ruby_api_tests_page.html.erb
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/itests/page/ruby_api_tests_page.html.erb
diff --git a/tests/integration/reference-plugin/src/main/resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml b/tests/integration/sonar-it-reference-plugin/src/main/resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/itests/resourcetab/GwtSampleResourceTab.gwt.xml
diff --git a/tests/integration/reference-plugin/src/main/resources/itests/resourcetab/public/sample.html b/tests/integration/sonar-it-reference-plugin/src/main/resources/itests/resourcetab/public/sample.html
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/itests/resourcetab/public/sample.html
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/itests/resourcetab/public/sample.html
diff --git a/tests/integration/reference-plugin/src/main/resources/itests/ws/ruby_ws_controller.rb b/tests/integration/sonar-it-reference-plugin/src/main/resources/itests/ws/ruby_ws_controller.rb
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/itests/ws/ruby_ws_controller.rb
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/itests/ws/ruby_ws_controller.rb
diff --git a/tests/integration/reference-plugin/src/main/resources/static/file.html b/tests/integration/sonar-it-reference-plugin/src/main/resources/static/file.html
similarity index 100%
rename from tests/integration/reference-plugin/src/main/resources/static/file.html
rename to tests/integration/sonar-it-reference-plugin/src/main/resources/static/file.html
diff --git a/tests/integration/tests/build.xml b/tests/integration/tests/build.xml
index 16d74fc489f..1b21d45cdca 100644
--- a/tests/integration/tests/build.xml
+++ b/tests/integration/tests/build.xml
@@ -24,8 +24,8 @@
       <fileset dir="${basedir}/target/sonar-gwt-sample-plugin/target/">
         <include name="sonar-gwt-sample-plugin-*-SNAPSHOT.jar"/>
       </fileset>
-      <fileset dir="${basedir}/../reference-plugin/">
-        <include name="target/reference-plugin-*-SNAPSHOT.jar"/>
+      <fileset dir="${basedir}/../sonar-it-reference-plugin/">
+        <include name="target/sonar-it-reference-plugin-*-SNAPSHOT.jar"/>
       </fileset>
     </copy>
   </target>
diff --git a/tests/integration/tests/pom.xml b/tests/integration/tests/pom.xml
index 7832c3402ba..86043ce6409 100644
--- a/tests/integration/tests/pom.xml
+++ b/tests/integration/tests/pom.xml
@@ -215,7 +215,7 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar.tests</groupId>
-      <artifactId>reference-plugin</artifactId>
+      <artifactId>sonar-it-reference-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
 
-- 
2.39.5