Skip to content
Browse files

# Files renamed to reflect the real tools that have created the input…

… data.
  • Loading branch information...
1 parent 04197bb commit 2f417ebc4e680086afcc837ed352ae54487a4b54 @manuelpichler manuelpichler committed Aug 9, 2010
View
6 data/webapps/cruisecontrol/main.jsp
@@ -138,13 +138,13 @@
<%-- phpUnderControl 8 --%>
- <cruisecontrol:tab name="pmd" label="PHPMD">
- <%@ include file="phpunit-pmd.jsp" %>
+ <cruisecontrol:tab name="phpmd" label="PHPMD">
+ <%@ include file="phpmd.jsp" %>
</cruisecontrol:tab>
<%-- phpUnderControl 9 --%>
<cruisecontrol:tab name="cpd" label="PHP-CPD">
- <%@ include file="phpunit-cpd.jsp" %>
+ <%@ include file="php-cpd.jsp" %>
</cruisecontrol:tab>
<%-- phpUnderControl 10 --%>
View
4 data/webapps/cruisecontrol/metrics.cewolf.jsp
@@ -114,7 +114,7 @@ Displays the number of broken and successful builds
<jsp:useBean id="xpathData" class="net.sourceforge.cruisecontrol.chart.XPathChartData" />
<%
xpathData.add("PHP CodeSniffer", "count(/cruisecontrol/checkstyle/file/error)");
- xpathData.add("PHPUnit PMD", "count(/cruisecontrol/pmd/file/violation)");
+ xpathData.add("PHPMD", "count(/cruisecontrol/pmd/file/violation)");
xpathData.add("PHPdoc", "count(/cruisecontrol/build//target[@name='php-documentor']/task[@name='exec']/message[contains(text(), 'WARNING in') or contains(text(), 'WARNING:') or contains(text(), 'ERROR in') or contains(text(), 'ERROR:')])");
%>
<cewolf:chart id="chart" title="Coding violations" type="timeseries" xaxislabel="date" yaxislabel="violations">
@@ -125,4 +125,4 @@ Displays the number of broken and successful builds
</cewolf:data>
<cewolf:chartpostprocessor id="xpathData" />
</cewolf:chart>
-<cewolf:img chartid="chart" renderer="cewolf" width="450" height="280" style="display:inline;margin:0 15px 15px 15px;"/>
+<cewolf:img chartid="chart" renderer="cewolf" width="450" height="280" style="display:inline;margin:0 15px 15px 15px;"/>
View
4 data/webapps/cruisecontrol/phpunit-cpd.jsp → data/webapps/cruisecontrol/php-cpd.jsp
@@ -37,6 +37,6 @@
<%@page errorPage="/error.jsp"%>
<%@ taglib uri="/WEB-INF/cruisecontrol-jsp11.tld" prefix="cruisecontrol"%>
<!--
- CruiseControl's Style Sheet for PHPUnit CPD output
+ CruiseControl's Style Sheet for PHP-CPD's output
-->
-<cruisecontrol:xsl xslFile="/xsl/phpunit-cpd-details.xsl"/>
+<cruisecontrol:xsl xslFile="/xsl/php-cpd-details.xsl"/>
View
4 data/webapps/cruisecontrol/phpunit-pmd.jsp → data/webapps/cruisecontrol/phpmd.jsp
@@ -37,6 +37,6 @@
<%@page errorPage="/error.jsp"%>
<%@ taglib uri="/WEB-INF/cruisecontrol-jsp11.tld" prefix="cruisecontrol"%>
<!--
- CruiseControl's Style Sheet for PHPUnit PMD output
+ CruiseControl's Style Sheet for PHPMD's output
-->
-<cruisecontrol:xsl xslFile="/xsl/phpunit-pmd-details.xsl"/>
+<cruisecontrol:xsl xslFile="/xsl/phpmd-details.xsl"/>
View
2 data/webapps/cruisecontrol/xsl/buildresults.xsl
@@ -38,7 +38,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="maven.xsl"/>
- <xsl:import href="phpunit-pmd.xsl"/>
+ <xsl:import href="phpmd.xsl"/>
<xsl:import href="errors.xsl"/>
<xsl:import href="phpdoc.xsl"/>
<xsl:import href="phpcs.xsl"/>
View
6 ...cruisecontrol/xsl/phpunit-cpd-details.xsl → ...pps/cruisecontrol/xsl/php-cpd-details.xsl
@@ -43,7 +43,7 @@
<xsl:variable name="project" select="/cruisecontrol/info/property[@name='projectname']/@value"/>
- <xsl:include href="./phpunit-pmd-summary.xsl" />
+ <xsl:include href="./phpmd-summary.xsl" />
<xsl:include href="./phphelper.xsl" />
<xsl:template match="/">
@@ -61,7 +61,7 @@
<xsl:template match="pmd">
<xsl:variable name="total.error.count" select="count(file/violation)" />
- <h2>PHPUnit CPD</h2>
+ <h2>PHP-CPD</h2>
<xsl:apply-templates select="." mode="rule-summary"/>
<xsl:apply-templates select="//pmd-cpd/duplication" />
@@ -109,4 +109,4 @@
</table>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
View
24 ...cruisecontrol/xsl/phpunit-pmd-details.xsl → ...bapps/cruisecontrol/xsl/phpmd-details.xsl
@@ -45,14 +45,14 @@
<xsl:variable name="project" select="/cruisecontrol/info/property[@name='projectname']/@value"/>
<xsl:variable name="total.error.count" select="count(/cruisecontrol/pmd/file/violation)" />
- <xsl:include href="./phpunit-pmd-summary.xsl" />
- <xsl:include href="./phpunit-pmd-list.xsl" />
+ <xsl:include href="./phpmd-summary.xsl" />
+ <xsl:include href="./phpmd-list.xsl" />
<xsl:include href="./phphelper.xsl" />
<xsl:template match="/">
- <h2>PHPUnit PMD</h2>
+ <h2>PHPMD</h2>
<xsl:apply-templates select="cruisecontrol/pmd" mode="rule-summary"/>
- <xsl:apply-templates select="cruisecontrol/pmd" mode="phpunit-pmd-list"/>
+ <xsl:apply-templates select="cruisecontrol/pmd" mode="phpmd-list"/>
<table class="result" align="center">
<colgroup>
@@ -63,27 +63,35 @@
</colgroup>
<xsl:for-each select="/cruisecontrol/pmd/file[violation]">
<xsl:sort data-type="number" order="descending" select="count(violation)"/>
- <xsl:apply-templates select="." mode="pmd-file"/>
+ <xsl:apply-templates select="." mode="pmd-file">
+ <xsl:with-param name="position" select="position()" />
+ </xsl:apply-templates>
</xsl:for-each>
</table>
</xsl:template>
<xsl:template match="file" mode="pmd-file">
+ <xsl:param name="position" />
+
<xsl:variable name="javaclass">
<xsl:call-template name="phpname">
<xsl:with-param name="filename" select="@name"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="filename" select="translate(@name,'\','/')"/>
<thead>
- <tr><td colspan="3"><br/></td></tr>
+ <tr>
+ <td colspan="3">
+ <br />
+ </td>
+ </tr>
<tr>
<th colspan="3">
<xsl:value-of select="$javaclass"/>
(<xsl:value-of select="count(violation)"/>)
</th>
<th>
- Priority
+ Priority <a name="a{$position}"></a>
</th>
</tr>
</thead>
@@ -160,4 +168,4 @@
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
View
8 ...ps/cruisecontrol/xsl/phpunit-pmd-list.xsl → .../webapps/cruisecontrol/xsl/phpmd-list.xsl
@@ -42,7 +42,7 @@
<xsl:variable name="currentlog"
select="substring(cruisecontrol/info/property[@name='logfile']/@value, 0, string-length(cruisecontrol/info/property[@name='logfile']/@value) - 3)" />
- <xsl:template match="pmd" mode="phpunit-pmd-list">
+ <xsl:template match="pmd" mode="phpmd-list">
<p/>
<table class="result">
<colgroup>
@@ -52,13 +52,13 @@
</colgroup>
<thead>
<tr>
- <th colspan="2">PHPUnit PMD Violations in Files</th>
+ <th colspan="2">PHPMD Violations in Files</th>
<th>Errors / Warnings</th>
</tr>
</thead>
<tbody>
<xsl:for-each select="/cruisecontrol/pmd/file[violation]">
- <xsl:sort select="@name" />
+ <xsl:sort data-type="number" order="descending" select="count(violation)"/>
<xsl:variable name="errors" select="/cruisecontrol/pmd/file[@name=current()/@name]/violation"/>
<xsl:variable name="errorCount" select="count($errors)"/>
<tr>
@@ -99,4 +99,4 @@
</tfoot>
</table>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
View
8 ...cruisecontrol/xsl/phpunit-pmd-summary.xsl → ...bapps/cruisecontrol/xsl/phpmd-summary.xsl
@@ -51,7 +51,7 @@
</colgroup>
<thead>
<tr>
- <th colspan="2">PHPUnit PMD rule</th>
+ <th colspan="2">PHPMD rule</th>
<th>Files</th>
<th>Errors / Warnings</th>
</tr>
@@ -73,7 +73,7 @@
<xsl:value-of select="@ruleset"/>
</xsl:when>
<xsl:otherwise>
- <xsl:text>PHPUnit PMD</xsl:text>
+ <xsl:text>PHPMD</xsl:text>
</xsl:otherwise>
</xsl:choose> / <xsl:value-of select="@rule"/></td>
<td align="right"><xsl:value-of select="$fileCount"/></td>
@@ -88,7 +88,7 @@
<xsl:attribute name="class">oddrow</xsl:attribute>
</xsl:if>
<td></td>
- <td>PHPUnit CPD / CopyPasteDetection</td>
+ <td>PHP-CPD / CopyPasteDetection</td>
<td align="right"><xsl:value-of select="$duplication.file.count" /></td>
<td align="right"><xsl:value-of select="$duplication.count" /></td>
</tr>
@@ -104,4 +104,4 @@
</table>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
View
2 ...webapps/cruisecontrol/xsl/phpunit-pmd.xsl → data/webapps/cruisecontrol/xsl/phpmd.xsl
@@ -38,7 +38,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html"/>
- <xsl:include href="./phpunit-pmd-summary.xsl" />
+ <xsl:include href="./phpmd-summary.xsl" />
<xsl:param name="pmd.warning.threshold" select="11"/>
View
14 package.xml
@@ -1608,12 +1608,12 @@ example project.
<file name="phpcs.xsl" role="data"/>
<file name="phpdoc.xsl" role="data"/>
<file name="phphelper.xsl" role="data"/>
- <file name="phpunit-cpd-details.xsl" role="data"/>
+ <file name="php-cpd-details.xsl" role="data"/>
<file name="phpunit-details.xsl" role="data"/>
- <file name="phpunit-pmd-details.xsl" role="data"/>
- <file name="phpunit-pmd-list.xsl" role="data"/>
- <file name="phpunit-pmd-summary.xsl" role="data"/>
- <file name="phpunit-pmd.xsl" role="data"/>
+ <file name="phpmd-details.xsl" role="data"/>
+ <file name="phpmd-list.xsl" role="data"/>
+ <file name="phpmd-summary.xsl" role="data"/>
+ <file name="phpmd.xsl" role="data"/>
<file name="phpunit.xsl" role="data"/>
</dir>
<dir name="WEB-INF/lib">
@@ -1656,10 +1656,10 @@ example project.
<file name="phpcs.jsp" role="data">
<tasks:replace from="- SVN" to="version" type="package-info"/>
</file>
- <file name="phpunit-cpd.jsp" role="data">
+ <file name="php-cpd.jsp" role="data">
<tasks:replace from="- SVN" to="version" type="package-info"/>
</file>
- <file name="phpunit-pmd.jsp" role="data">
+ <file name="phpmd.jsp" role="data">
<tasks:replace from="- SVN" to="version" type="package-info"/>
</file>
<file name="phpunit.jsp" role="data">
View
14 src/Commands/InstallCommand.php
@@ -74,8 +74,8 @@ class phpucInstallCommand extends phpucAbstractCommand implements phpucConsoleCo
'/webapps/cruisecontrol/metrics.cewolf.jsp',
'/webapps/cruisecontrol/phpcs.jsp',
'/webapps/cruisecontrol/phpunit.jsp',
- '/webapps/cruisecontrol/phpunit-pmd.jsp',
- '/webapps/cruisecontrol/phpunit-cpd.jsp',
+ '/webapps/cruisecontrol/phpmd.jsp',
+ '/webapps/cruisecontrol/php-cpd.jsp',
'/webapps/cruisecontrol/servertime.jsp',
'/webapps/cruisecontrol/css/php-under-control.css',
'/webapps/cruisecontrol/css/SyntaxHighlighter.css',
@@ -113,12 +113,12 @@ class phpucInstallCommand extends phpucAbstractCommand implements phpucConsoleCo
'/webapps/cruisecontrol/xsl/phpdoc.xsl',
'/webapps/cruisecontrol/xsl/phphelper.xsl',
'/webapps/cruisecontrol/xsl/phpunit.xsl',
- '/webapps/cruisecontrol/xsl/phpunit-cpd-details.xsl',
+ '/webapps/cruisecontrol/xsl/php-cpd-details.xsl',
'/webapps/cruisecontrol/xsl/phpunit-details.xsl',
- '/webapps/cruisecontrol/xsl/phpunit-pmd.xsl',
- '/webapps/cruisecontrol/xsl/phpunit-pmd-details.xsl',
- '/webapps/cruisecontrol/xsl/phpunit-pmd-list.xsl',
- '/webapps/cruisecontrol/xsl/phpunit-pmd-summary.xsl',
+ '/webapps/cruisecontrol/xsl/phpmd.xsl',
+ '/webapps/cruisecontrol/xsl/phpmd-details.xsl',
+ '/webapps/cruisecontrol/xsl/phpmd-list.xsl',
+ '/webapps/cruisecontrol/xsl/phpmd-summary.xsl',
'/webapps/cruisecontrol/WEB-INF/lib/php-under-control.jar',
);

0 comments on commit 2f417eb

Please sign in to comment.
Something went wrong with that request. Please try again.