Move all report config into etc/.

This was previously all under checkstyle/ which is weird as there's
a whole bunch of non-checkstyle stuff. Move everything into the nice
etc/ folder to keep it out of the way and sanely organised.

Change-Id: I0df52e8eddc6588c775a5173b624144807f1e59a
Reviewed-on: http://gerrit.dmdirc.com/3102
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.gitignore

@@ -34,6 +34,7 @@ __history
 /reports/checkstyle.*
 /reports/deadcode.txt
 /etc/clover.license
+/etc/clover/clover.license
 /.clover
 /test_profile
 /*.key

build-reports.xml

@@ -29,43 +29,42 @@
     </target>
     
     <target name="checkstyle-all" depends="-init-checkstyle">
-        <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure" failOnViolation="false">
+        <checkstyle config="etc/checkstyle/dmdirc.xml" failureProperty="checkstyle.failure" failOnViolation="false">
             <fileset dir="src/" includes="**/*.java" excludes="net/miginfocom/**"/>
             <fileset dir="modules/plugins/src/" includes="**/*.java"/>
             <fileset dir="modules/parser/src/" includes="**/*.java"/>
             <fileset dir="modules/util/src/" includes="**/*.java"/>
             <formatter type="xml" tofile="reports/checkstyle.xml"/>
         </checkstyle>
-        <xslt in="reports/checkstyle.xml" out="reports/checkstyle.html" style="checkstyle/checkstyle.xsl"/>
+        <xslt in="reports/checkstyle.xml" out="reports/checkstyle.html" style="etc/checkstyle/checkstyle.xsl"/>
     </target>
     
     <target name="-move-index">
-        <!-- <copy file="checkstyle/index.html" tofile="reports/index.html"/> -->
-        <copy file="checkstyle/sorttable.js" tofile="reports/sorttable.js"/>
+        <copy file="etc/reports/sorttable.js" tofile="reports/sorttable.js"/>
     </target>
     
     <target name="pmd" description="Run PMD." depends="-init-pmd">
         <pmd shortFilenames="true">
-            <ruleset>checkstyle/pmd_checks.xml</ruleset>
+            <ruleset>etc/pmd/full.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
             <fileset dir="modules/plugins/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/util/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/parser/src/" includes="com/dmdirc/**/*.java"/>
         </pmd>
-        <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
+        <xslt in="reports/report-pmd.xml" style="etc/pmd/pmd.xslt" out="reports/report-pmd.html" />
     </target>
 
     <target name="pmd-minimal" description="Run PMD with minimal ruleset." depends="-init-pmd">
         <pmd shortFilenames="true">
-            <ruleset>checkstyle/pmd_minimal.xml</ruleset>
+            <ruleset>etc/pmd/minimal.xml</ruleset>
             <formatter type="xml" toFile="reports/report-pmd.xml" linkPrefix="http://pmd.sourceforge.net/xref/"/>
             <fileset dir="src/" includes="com/dmdirc/**/*.java" />
             <fileset dir="modules/plugins/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/util/src/" includes="com/dmdirc/**/*.java"/>
             <fileset dir="modules/parser/src/" includes="com/dmdirc/**/*.java"/>
         </pmd>
-        <xslt in="reports/report-pmd.xml" style="checkstyle/pmd.xslt" out="reports/report-pmd.html" />
+        <xslt in="reports/report-pmd.xml" style="etc/pmd/pmd.xslt" out="reports/report-pmd.html" />
     </target>
     
     <target name="cpd" description="Run CPD." depends="-init-cpd">
@@ -74,7 +73,7 @@
                 <include name="**/*.java"/>
             </fileset>
         </cpd>
-        <xslt in="reports/report-cpd.xml" style="checkstyle/cpd.xslt" out="reports/report-cpd.html" />
+        <xslt in="reports/report-cpd.xml" style="etc/cpd/cpd.xslt" out="reports/report-cpd.html" />
     </target>
     
     <target name="findbugs" depends="-init-findbugs,jar" description="Run Findbugs.">
@@ -86,7 +85,7 @@
             <sourcePath path="src/" />
             <class location="dist/DMDirc.jar" />
         </findbugs>
-        <xslt in="reports/findbugs/report-fb.xml" style="checkstyle/findbugs.xslt" out="reports/report-fb.html" />
+        <xslt in="reports/findbugs/report-fb.xml" style="etc/findbugs/findbugs.xslt" out="reports/report-fb.html" />
     </target>
 
     <target name="-init-proguard" depends="-init-dependencies">

build-tests.xml

@@ -5,13 +5,13 @@
     <target name="-init-clover" depends="-init-dependencies">
         <taskdef resource="cloverlib.xml" classpathref="test-classpath"/>
         <taskdef resource="cloverjunitlib.xml" classpathref="test-classpath"/>
-        <property name="clover.license.path" location="etc/clover.license"/>
+        <property name="clover.license.path" location="etc/clover/clover.license"/>
         <property name="clover.init.string" location=".clover/clover.db"/>
 
         <condition property="clover.installed">
             <and>
                 <available classname="com.atlassian.clover.CloverInstr"/>
-                <available file="etc/clover.license"/>
+                <available file="etc/clover/clover.license"/>
             </and>
         </condition>
 
@@ -94,7 +94,7 @@
             description="Run tests and generate Clover XML and HTML reports."/>
 
     <target name="teamcity-clover-report">
-        <xslt in="reports/clover/clover.xml" style="checkstyle/clover.xsl" out="teamcity-info.xml" />
+        <xslt in="reports/clover/clover.xml" style="etc/clover/clover.xsl" out="teamcity-info.xml" />
     </target>
 
 </project>

build.xml

@@ -20,7 +20,7 @@
         <echo>Downloading private files, if this fails please pass username and</echo>
         <echo>password to ant using -Dusername=... -Dpassword=...</echo>
 
-        <get src="http://www.dmdirc.com/private/clover.license" dest="etc/clover.license" username="${username}" password="${password}"/>
+        <get src="http://www.dmdirc.com/private/clover.license" dest="etc/clover/clover.license" username="${username}" password="${password}"/>
 
         <get dest="installer/signing/" username="${username}" password="${password}">
             <url url="http://www.dmdirc.com/private/DMDirc.cer"/>
@@ -33,8 +33,8 @@
         <!-- Re-evaluate as the license is probably here now -->
         <condition property="clover.installed">
             <and>
-                <available classname="com.cenqua.clover.CloverInstr"/>
-                <available file="etc/clover.license"/>
+                <available classname="com.atlassian.clover.CloverInstr"/>
+                <available file="etc/clover/clover.license"/>
             </and>
         </condition>
     </target>

checkstyle/index.html

@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
-  <title>DMDirc</title>
-  <link rel="stylesheet" type="text/css" href="/res/style.css">
- </head>
- <body>
-  <div id="container">
-   <img id="logo" src="/res/logo.png" alt="DMDirc logo">
-   <h1>DMDirc</h1>
-   <ul id="menu">
-    <li><a href="/">Main Site</a></li>
-   </ul>
-   <div id="content">
-
-    <h1>DMDirc reports</h1>
-    <h2>Findbugs report</h2>
-    <ul>
-      <li><a href="report-fb.html" title="Findbugs report">Findbugs Report</a></li>
-    </ul>
-
-    <h2>Copy and paste detection report</h2>
-    <ul>
-      <li><a href="report-cpd.html" title="CPD Report">CPD Report</a></li>
-    </ul>
-
-    <h2>PMD Report</h2>
-    <ul>
-      <li><a href="report-pmd.html" title="PMD Report">PMD Report</a></li>
-    </ul>
-
-    <h2>Checkstyle reports</h2>
-    <ul>
-      <li><a href="report-all.html" title="Whole project">Whole project</a></li>
-      <li><a href="report-actions.html" title="Actions">Actions</a></li>
-      <li><a href="report-commandparser.html" title="Command Parser">Command Parser</a></li>
-      <li><a href="report-core.html" title="Core">Core</a></li>
-      <li><a href="report-config.html" title="Config">Config</a></li>
-      <li><a href="report-logger.html" title="Logger">Logger</a></li>
-      <li><a href="report-parser.html" title="Parser">Parser</a></li>
-      <li><a href="report-plugins.html" title="Plugins">Plugins</a></li>
-      <li><a href="report-ui.html" title="UI">UI</a></li>
-    </ul>
-
-   </div>
-   <div id="footer">
-   </div>
-  </div>
- </body>
-</html>

checkstyle/dmdirc_checks.xml → etc/checkstyle/dmdirc.xml

@@ -16,7 +16,7 @@
     <module name="NewlineAtEndOfFile"/>
 
     <module name="Header">
-        <property name="headerFile" value="checkstyle/dmdirc.license"/>
+        <property name="headerFile" value="etc/checkstyle/dmdirc.license"/>
         <property name="ignoreLines" value="2, 21"/>
     </module>