I took the head but I don't know why there was this diff on canonical
path...
I merged my beta 10 version to the head and might have done a mistake.
That's a stupid mistake I shouldn't have done... Worked to hastily...

About the strange diff, I just put a bad option... I'm not really used to
cvs yet...
I used most source safe on this Earth except cvs (MKS, Visual Source Safe,
Clearcase, StarTeam...). Yes you might find it sad...
I didn't really choose...

Anyway, thanks to have included the patch and sorted out the flaws...

BTW, I found out why I wasn't able to compile maven on my computer.
It's because if you have a build.properties containing something like
maven.repo.local=${maven.home}/repository maven get lost.
The echo looks like this:

     [echo] maven.home = C:\maven
     [echo] maven.home.local = C:\Documents and
Settings\Administrator\.maven
     [echo] maven.repo.local = ${maven.home}/repository

And the repository falls in a directory named ${maven.home} in the maven
directory checked-out from cvs.
And somewhere in the build when maven is building itself, it fails.

Then, if above that you don't have a junit.jar in your ant lib dir (I was
having a junit.3.8.1 one... ) you will get test failures.
I'm using ant-1.5.4

I don't know if these are known issues.

Regards,
Henri

----- Original Message ----- 
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Friday, November 14, 2003 9:17 AM
Subject: cvs commit: maven-plugins/checkstyle/src/plugin-resources
checkstyle.jsl


> vmassol     2003/11/14 00:17:15
>
>   Modified:    checkstyle/xdocs changes.xml
>                checkstyle/src/plugin-resources checkstyle.jsl
>   Log:
>   Applied patch from Henri Tremblay for <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?id=12696";>MAVEN-1036</a
>. The Checkstyle HTML report now provides information on severity.
>
>   Revision  Changes    Path
>   1.15      +5 -0      maven-plugins/checkstyle/xdocs/changes.xml
>
>   Index: changes.xml
>   ===================================================================
>   RCS file: /home/cvs/maven-plugins/checkstyle/xdocs/changes.xml,v
>   retrieving revision 1.14
>   retrieving revision 1.15
>   diff -u -r1.14 -r1.15
>   --- changes.xml 12 Nov 2003 19:09:07 -0000 1.14
>   +++ changes.xml 14 Nov 2003 08:17:15 -0000 1.15
>   @@ -10,6 +10,11 @@
>
>        <release version="2.2" date="in CVS">
>          <action dev="vmassol" type="fix">
>   +      Applied patch from Henri Tremblay for
>   +      <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?id=12696";>MAVEN-1036</a
>.
>   +      The Checkstyle HTML report now provides information on severity.
>   +      </action>
>   +      <action dev="vmassol" type="fix">
>            Prevent projects who do not use the head check from failing if
they
>            don't provide a license file.
>          </action>
>
>
>
>   1.11      +21 -4
maven-plugins/checkstyle/src/plugin-resources/checkstyle.jsl
>
>   Index: checkstyle.jsl
>   ===================================================================
>   RCS file:
/home/cvs/maven-plugins/checkstyle/src/plugin-resources/checkstyle.jsl,v
>   retrieving revision 1.10
>   retrieving revision 1.11
>   diff -u -r1.10 -r1.11
>   --- checkstyle.jsl 30 Jul 2003 00:50:37 -0000 1.10
>   +++ checkstyle.jsl 14 Nov 2003 08:17:15 -0000 1.11
>   @@ -33,14 +33,20 @@
>
>            <section name="Summary">
>              <j:set var="fileCount"><x:expr select="count(file)"/></j:set>
>   -          <j:set var="errorCount"><x:expr
select="count(file/error)"/></j:set>
>   +          <j:set var="infoCount"><x:expr
select="count(file/[EMAIL PROTECTED]'info'])"/></j:set>
>   +          <j:set var="warningCount"><x:expr
select="count(file/[EMAIL PROTECTED]'warning'])"/></j:set>
>   +          <j:set var="errorCount"><x:expr
select="count(file/[EMAIL PROTECTED]'error'])"/></j:set>
>              <table>
>                <tr>
>                  <th>Files</th>
>   +              <th width="75">Infos</th>
>   +              <th width="75">Warnings</th>
>                  <th width="75">Errors</th>
>                </tr>
>                <tr>
>                  <td><doc:formatAsNumber string="${fileCount}"
pattern="0"/></td>
>   +              <td><doc:formatAsNumber string="${infoCount}"
pattern="0"/></td>
>   +              <td><doc:formatAsNumber string="${warningCount}"
pattern="0"/></td>
>                  <td><doc:formatAsNumber string="${errorCount}"
pattern="0"/></td>
>                </tr>
>              </table>
>   @@ -50,7 +56,9 @@
>              <table>
>                <tr>
>                  <th>Files</th>
>   -              <th width="75">Errors</th>
>   +              <th width="30">I</th>
>   +              <th width="30">W</th>
>   +              <th width="30">E</th>
>                </tr>
>                <j:set var="fullSrcDir"
value="${pom.build.sourceDirectory}"/>
>                <j:set var="srcDir"
value="${fileutil.file(fullSrcDir).getCanonicalPath()}"/>
>   @@ -63,13 +71,17 @@
>                  <j:set var="name"
value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
>                  <util:replace var="name" value="${name}" oldChar="\\"
newChar="/"/>
>                  <!--- +1 is for the trailing slash above -->
>   -              <j:set var="errorCount"><x:expr
select="count($file/error)"/></j:set>
>   +              <j:set var="infoCount"><x:expr
select="count($file/[EMAIL PROTECTED]'info'])"/></j:set>
>   +              <j:set var="warningCount"><x:expr
select="count($file/[EMAIL PROTECTED]'warning'])"/></j:set>
>   +              <j:set var="errorCount"><x:expr
select="count($file/[EMAIL PROTECTED]'error'])"/></j:set>
>
>   -              <j:if test="${errorCount != 0}">
>   +              <j:if test="${errorCount + warningCount + infoCount !=
0}">
>                    <tr>
>                      <td>
>                        <a href="#${name}">${name}</a>
>                      </td>
>   +                  <td><doc:formatAsNumber string="${infoCount}"
pattern="0"/></td>
>   +                  <td><doc:formatAsNumber string="${warningCount}"
pattern="0"/></td>
>                      <td><doc:formatAsNumber string="${errorCount}"
pattern="0"/></td>
>                    </tr>
>                  </j:if>
>   @@ -87,6 +99,7 @@
>                    <table>
>                      <tr>
>                        <th>Error</th>
>   +                    <th width="75">Severity</th>
>                        <th width="75">Line</th>
>                      </tr>
>                      <x:set var="errors" select="$file/error"/>
>   @@ -96,6 +109,10 @@
>                            <j:set var="errorMessage"
value="${error.attribute('message').getValue()}"/>
>                            ${htmlescape.getText(errorMessage)}
>                          </td>
>   +                      <td>
>   +                        <j:set var="severity"
value="${error.attribute('severity').getValue()}"/>
>   +                        ${htmlescape.getText(severity)}
>   +                      </td>
>                          <td>
>                            <j:set var="line"
value="${error.attribute('line').getValue()}"/>
>                            <j:set var="lastIndex"
value="${name.lastIndexOf('.java')}"/>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to