clirr-devel — Discussion about the source code of Clirr

[Clirr-devel] CVS: clirr/maven plugin.jelly,1.2,1.3

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/maven
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16229

Modified Files:
	plugin.jelly 
Log Message:
added classpath for dependencies

Index: plugin.jelly
===================================================================
RCS file: /cvsroot/clirr/clirr/maven/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly	15 Jul 2004 13:34:58 -0000	1.2
+++ plugin.jelly	22 Aug 2004 13:03:09 -0000	1.3
@@ -115,6 +115,12 @@
           includes="${clirr.baseline.destination.basename}"/>
       <newFiles dir="${maven.build.dir}" includes="${maven.final.name}.jar"/>
       <formatter type="xml" outfile="${clirr.report.file}"/>
+
+      <newClassPath refid="maven.dependency.classpath"/>
+
+      <!-- TODO: If the old version has different dependencies, this is not correct. -->
+      <origClassPath refid="maven.dependency.classpath"/>
+
     </clirr>  
   
   </goal>

Re: [Clirr-devel] running clirr on cactus

[<lak...@t-...>]

OK, I can now reproduce your problem. Thanks for guiding me through the 
Cactus setup.

Lars

PS: Note that I have added Maven to the main navigation, as I have 
sucessfully tested it on commons-collections and commons-logging, so it 
seems that it "kinda works".


Vincent Massol wrote:

>Hi Lars,
>
>I've tried adding the newClasspah and oldClasspath as follows in
>plugin.jelly:
>
>    <clirr failOnWarning="${clirr.fail.on.warning}"
>        failOnError="${clirr.fail.on.error}">
>      <origFiles dir="${clirr.baseline.destination.dir}" 
>          includes="${clirr.baseline.destination.basename}"/>
>      <newFiles dir="${maven.build.dir}"
>includes="${maven.final.name}.jar"/>
>      <formatter type="xml" outfile="${clirr.report.file}"/>
>
>      <newClassPath refid="maven.dependency.classpath"/>
>      <oldClassPath refid="maven.dependency.classpath"/>
>
>    </clirr>  
>
>But I still get the same error.
>
>Here's what I do to run clirr on the cactus framework project:
>
>* cd to jakarta-cactus/framework
>* create a build.properties file and add the following to it:
>
>clirr.baseline.destination = C:/Documents and Settings/Vincent
>Massol/.maven/repository/cactus/jars/cactus-13-1.6.1.jar
>
>(i.e. the location of the previous version to compare with)
>
>* type "maven clirr"
>
>You're right, I need to sort out the organization. Actually Cactus does not
>really build with Maven yet (it's a work in progress which is not
>progressing much right now). But forcing the location of the base jar should
>work.
>
>Thanks
>-Vincent
>
>  
>

[Clirr-devel] CVS: clirr/core/xdocs navigation.xml,1.2,1.3

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32125/core/xdocs

Modified Files:
	navigation.xml 
Log Message:
there is no individual download for core, removed in from navbar

Index: navigation.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/core/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml	11 Jul 2004 12:18:50 -0000	1.2
+++ navigation.xml	22 Aug 2004 12:04:12 -0000	1.3
@@ -11,8 +11,6 @@
         <menu name="Clirr Core">
             <item name="Overview"
                 href="/index.html"/>
-            <item name="Download"
-                href="/download.html"/>
             <item name="Running Clirr">
               <item name="From Ant"
                 href="/anttask.html"/>

[Clirr-devel] CVS: clirr/xdocs contributing.xml,1.2,1.3

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31759/xdocs

Modified Files:
	contributing.xml 
Log Message:
fixed typo

Index: contributing.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/xdocs/contributing.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contributing.xml	20 Sep 2003 13:02:54 -0000	1.2
+++ contributing.xml	22 Aug 2004 12:02:26 -0000	1.3
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
 <document>
     <properties>
         <title>Clirr Ant Task</title>
@@ -6,7 +8,7 @@
     <body>
         <section name="Contributing to Clirr">
             <p>
-                If you have made an improvent to the Clirr source code, documentation,
+                If you have made an improvement to the Clirr source code, documentation,
                 or anything else, please consider contributing it back to the community.
             </p>
             <p>
@@ -16,7 +18,7 @@
             </p>
             <p>
                 Note that anything you contribute must have the same license
-                as the rest of Clirr, i.e. LGPL, Copyright Lars Kühne.
+                as the rest of Clirr, i.e. LGPL, Copyright Lars Kühne.
             </p>
         </section>
         <section name="Copyright Lars? Why not copyright myself?">

[Clirr-devel] CVS: clirr/xdocs navigation.xml,1.8,1.9

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29018/xdocs

Modified Files:
	navigation.xml 
Log Message:
added link to maven plugin

Index: navigation.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/xdocs/navigation.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- navigation.xml	10 Jul 2004 13:45:23 -0000	1.8
+++ navigation.xml	22 Aug 2004 11:52:05 -0000	1.9
@@ -18,6 +18,8 @@
                 href="/clirr-core/anttask.html"/>
               <item name="Command-line"
                 href="/clirr-core/runcli.html"/>
+              <item name="Maven"
+                href="/clirr-maven/index.html"/>
             </item>
             <item name="Contributing"
                 href="/contributing.html"/>

[Clirr-devel] CVS: clirr/maven/xdocs using.xml,1.1,1.2

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/maven/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28685/maven/xdocs

Modified Files:
	using.xml 
Log Message:
real content

Index: using.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/maven/xdocs/using.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- using.xml	15 Jul 2004 13:34:22 -0000	1.1
+++ using.xml	22 Aug 2004 11:50:43 -0000	1.2
@@ -10,7 +10,20 @@
     <section name="Using the Clirr plugin">
       <ol>
         <li>
-          xxx
+          Make sure you have the Clirr plugin <a href="installing.html">installed</a>.
+        </li>
+        <li>
+          Make sure you have the old versions of your project 
+          <a href="http://maven.apache.org/reference/project-descriptor.html#versions">declared</a>
+          in your POM. The versions should be declared from oldest to youngest.
+          Clirr will check the current code against the latest released version, ingnoring
+          the current development version (version control tag 'HEAD').
+          <!-- TODO: docs for checking against a specific version -->
+        </li>
+        <li>
+          Type "maven clirr". This will create an XML file that contains all changes
+          in your public API. For each change, the file includes Clirr's compatibility
+          analysis.
         </li>
       </ol>
     </section>

RE: [Clirr-devel] running clirr on cactus

[Vincent M. <vma...@pi...>]

Hi Lars,

I've tried adding the newClasspah and oldClasspath as follows in
plugin.jelly:

    <clirr failOnWarning=3D"${clirr.fail.on.warning}"
        failOnError=3D"${clirr.fail.on.error}">
      <origFiles dir=3D"${clirr.baseline.destination.dir}"=20
          includes=3D"${clirr.baseline.destination.basename}"/>
      <newFiles dir=3D"${maven.build.dir}"
includes=3D"${maven.final.name}.jar"/>
      <formatter type=3D"xml" outfile=3D"${clirr.report.file}"/>

      <newClassPath refid=3D"maven.dependency.classpath"/>
      <oldClassPath refid=3D"maven.dependency.classpath"/>

    </clirr> =20

But I still get the same error.

Here's what I do to run clirr on the cactus framework project:

* cd to jakarta-cactus/framework
* create a build.properties file and add the following to it:

clirr.baseline.destination =3D C:/Documents and Settings/Vincent
Massol/.maven/repository/cactus/jars/cactus-13-1.6.1.jar

(i.e. the location of the previous version to compare with)

* type "maven clirr"

You're right, I need to sort out the organization. Actually Cactus does =
not
really build with Maven yet (it's a work in progress which is not
progressing much right now). But forcing the location of the base jar =
should
work.

Thanks
-Vincent


> -----Original Message-----
> From: cli...@li... [mailto:clirr-devel-
> ad...@li...] On Behalf Of Lars K=FChne
> Sent: dimanche 22 ao=FBt 2004 11:52
> To: cli...@li...
> Subject: [Clirr-devel] running clirr on cactus
>=20
> Hi Vincent,
>=20
> I was trying to reproduce your problem with cactus. I have checked out
> the current cactus CVS, cd'ed to framework and did "maven -X clirr".
>=20
> This gives me
>=20
> BUILD FAILED
> File...... /home/lk/.maven/cache/clirr-maven-0.4-SNAPSHOT/plugin.jelly
> Element... j:invokeStatic
> Line...... 75
> Column.... 55
> java.lang.reflect.InvocationTargetException
> com.werken.werkz.UnattainableGoalException: Unable to obtain goal
> [clirr:check] --
> /home/lk/.maven/cache/clirr-maven-0.4-SNAPSHOT/plugin.jelly:75:55:
> <j:invokeStatic> Could not load class: net.sf.clirr.maven.ClirrUtils.
> Reason: java.lang.reflect.InvocationTargetException
>         at com.werken.werkz.Goal.fire(Goal.java:646)
> [...]
> Caused by: java.io.FileNotFoundException:
> http://www.ibiblio.org/maven/cactus/jars/jakarta-cactus-framework-
> 1.6.1.jar
>         at
> org.apache.maven.util.HttpUtils.retrieveArtifact(HttpUtils.java:547)
>         at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:381)
>         at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:287)
>         at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:241)
>         at
> net.sf.clirr.maven.ClirrUtils.getBaselineJar(ClirrUtils.java:80)
>=20
> It seems you organize you jars a bit differently on ibiblio, there are
> no "framework" jars. How do I need to setup cactus to get the correct
> old jar file when running clirr?
>=20
> Lars
>=20
>=20
>=20
>=20
> -------------------------------------------------------
> SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
> 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
> Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
> http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
> _______________________________________________
> Clirr-devel mailing list
> Cli...@li...
> https://lists.sourceforge.net/lists/listinfo/clirr-devel

[Clirr-devel] running clirr on cactus

[<lak...@t-...>]

Hi Vincent,

I was trying to reproduce your problem with cactus. I have checked out 
the current cactus CVS, cd'ed to framework and did "maven -X clirr".

This gives me

BUILD FAILED
File...... /home/lk/.maven/cache/clirr-maven-0.4-SNAPSHOT/plugin.jelly
Element... j:invokeStatic
Line...... 75
Column.... 55
java.lang.reflect.InvocationTargetException
com.werken.werkz.UnattainableGoalException: Unable to obtain goal 
[clirr:check] -- 
/home/lk/.maven/cache/clirr-maven-0.4-SNAPSHOT/plugin.jelly:75:55: 
<j:invokeStatic> Could not load class: net.sf.clirr.maven.ClirrUtils. 
Reason: java.lang.reflect.InvocationTargetException
        at com.werken.werkz.Goal.fire(Goal.java:646)
[...]
Caused by: java.io.FileNotFoundException: 
http://www.ibiblio.org/maven/cactus/jars/jakarta-cactus-framework-1.6.1.jar
        at 
org.apache.maven.util.HttpUtils.retrieveArtifact(HttpUtils.java:547)
        at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:381)
        at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:287)
        at org.apache.maven.util.HttpUtils.getFile(HttpUtils.java:241)
        at net.sf.clirr.maven.ClirrUtils.getBaselineJar(ClirrUtils.java:80)

It seems you organize you jars a bit differently on ibiblio, there are 
no "framework" jars. How do I need to setup cactus to get the correct 
old jar file when running clirr?

Lars

[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.4,1.5

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4922

Modified Files:
	InterfaceSetCheck.java 
Log Message:
avoid NPE

Index: InterfaceSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/InterfaceSetCheck.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InterfaceSetCheck.java	21 Aug 2004 11:10:37 -0000	1.4
+++ InterfaceSetCheck.java	22 Aug 2004 06:47:33 -0000	1.5
@@ -75,8 +75,8 @@
             JavaClass compatInterface = (JavaClass) iter.getLeft();
             JavaClass currentInterface = (JavaClass) iter.getRight();
 
-            if (className.equals(compatInterface.getClassName())
-                || className.equals(currentInterface.getClassName()))
+            if (compatInterface != null && className.equals(compatInterface.getClassName())
+                || currentInterface != null && className.equals(currentInterface.getClassName()))
             {
                 // This occurs because an interface has itself in the set of all interfaces.
                 // We can't just let the test below handle this case because that won't

Re: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[<lak...@t-...>]

Vincent Massol wrote:

>  
>
>>-----Original Message-----
>>From: cli...@li... [mailto:clirr-devel-
>>ad...@li...] On Behalf Of Lars Kühne
>>Sent: samedi 21 août 2004 14:25
>>To: cli...@li...
>>Subject: Re: [Clirr-devel] CVS:
>>clirr/core/src/java/net/sf/clirr/core/internal/checks
>>InterfaceSetCheck.java,1.3,1.4
>>
>>Vincent Massol wrote:
>>
>>    
>>
>>>One more precision: I also got the following message in the console:
>>>
>>>[...]
>>>   [junit] Testsuite: org.apache.cactus.TestWebRequest
>>>   [junit] Tests run: 10, Failures: 0, Errors: 0, Time elapsed: 0,04 sec
>>>   [junit]
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>>>java.lang.ClassNotFoundException: junit.framework.Test not found.
>>>
>>>BUILD FAILED
>>>java.lang.NullPointerException
>>>       at
>>>org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)
>>>       at
>>>net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetChe
>>>      
>>>
>>ck.
>>    
>>
>>>java:58)
>>>
>>>So maybe there is some problem with the junit jar not being in some
>>>classpath?
>>>
>>>
>>>      
>>>
>>Yes, I'd guess that this is the result of the first issue I mentioned in
>>my other mail: dependencies are not considered (<[new/old]ClassPath>
>>subelements of the clirr Ant task)
>>
>>Any chance that you can add references to the same classpath that is
>>used for java compilation?
>>    
>>
>
>I'll check that. However, I still believe Clirr should not stop with a NPE.
>The error message should be better I think.
>
>  
>

I agree, but note that the NPE is thrown by BCEL, not by the clirr code 
- probably there isn't much we can do here...

Lars

Re: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[<lak...@t-...>]

Vincent Massol wrote:

>Lars,
>
>I've modified the clirr taskdef definition to:
>
><ant:path id="clirr.classpath">
>[...]
>  <ant:path refid="maven.dependency.classpath"/>
></ant:path>
>
>This adds all the projects defined in project.xml. However it doesn't help.
>I haven't looked at the Ant task code but the doc (anttask.xml) doesn't
>mention any additional classpath element for the clirr task.
>
>Any idea?
>
>Thanks
>-Vincent
>  
>

What I meant was the nested <newClassPath> and <oldClassPath> elements 
of the clirr task itself (not the class definition). I'm working on that 
right now...

Lars

RE: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[Vincent M. <vma...@pi...>]

Lars,

I've modified the clirr taskdef definition to:

<ant:path id=3D"clirr.classpath">
[...]
  <ant:path refid=3D"maven.dependency.classpath"/>
</ant:path>

This adds all the projects defined in project.xml. However it doesn't =
help.
I haven't looked at the Ant task code but the doc (anttask.xml) doesn't
mention any additional classpath element for the clirr task.

Any idea?

Thanks
-Vincent

> -----Original Message-----
> From: cli...@li... [mailto:clirr-devel-
> ad...@li...] On Behalf Of Lars K=FChne
> Sent: samedi 21 ao=FBt 2004 14:25
> To: cli...@li...
> Subject: Re: [Clirr-devel] CVS:
> clirr/core/src/java/net/sf/clirr/core/internal/checks
> InterfaceSetCheck.java,1.3,1.4
>=20
> Vincent Massol wrote:
>=20
> >One more precision: I also got the following message in the console:
> >
> >[...]
> >    [junit] Testsuite: org.apache.cactus.TestWebRequest
> >    [junit] Tests run: 10, Failures: 0, Errors: 0, Time elapsed: 0,04 =
sec
> >    [junit]
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.Test not found.
> >
> >BUILD FAILED
> >java.lang.NullPointerException
> >        at
> =
>org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)=

> >        at
> =
>net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetCh=
e
> ck.
> >java:58)
> >
> >So maybe there is some problem with the junit jar not being in some
> >classpath?
> >
> >
>=20
> Yes, I'd guess that this is the result of the first issue I mentioned =
in
> my other mail: dependencies are not considered (<[new/old]ClassPath>
> subelements of the clirr Ant task)
>=20
> Any chance that you can add references to the same classpath that is
> used for java compilation?
>=20
> Lars
>=20
>=20
> -------------------------------------------------------
> SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
> 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
> Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
> http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
> _______________________________________________
> Clirr-devel mailing list
> Cli...@li...
> https://lists.sourceforge.net/lists/listinfo/clirr-devel

RE: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[Vincent M. <vma...@pi...>]

> -----Original Message-----
> From: cli...@li... [mailto:clirr-devel-
> ad...@li...] On Behalf Of Lars K=FChne
> Sent: samedi 21 ao=FBt 2004 14:25
> To: cli...@li...
> Subject: Re: [Clirr-devel] CVS:
> clirr/core/src/java/net/sf/clirr/core/internal/checks
> InterfaceSetCheck.java,1.3,1.4
>=20
> Vincent Massol wrote:
>=20
> >One more precision: I also got the following message in the console:
> >
> >[...]
> >    [junit] Testsuite: org.apache.cactus.TestWebRequest
> >    [junit] Tests run: 10, Failures: 0, Errors: 0, Time elapsed: 0,04 =
sec
> >    [junit]
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.TestCase not found.
> >java.lang.ClassNotFoundException: junit.framework.Test not found.
> >
> >BUILD FAILED
> >java.lang.NullPointerException
> >        at
> =
>org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)=

> >        at
> =
>net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetCh=
e
> ck.
> >java:58)
> >
> >So maybe there is some problem with the junit jar not being in some
> >classpath?
> >
> >
>=20
> Yes, I'd guess that this is the result of the first issue I mentioned =
in
> my other mail: dependencies are not considered (<[new/old]ClassPath>
> subelements of the clirr Ant task)
>=20
> Any chance that you can add references to the same classpath that is
> used for java compilation?

I'll check that. However, I still believe Clirr should not stop with a =
NPE.
The error message should be better I think.

-Vincent

Re: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[<lak...@t-...>]

Vincent Massol wrote:

>One more precision: I also got the following message in the console:
>
>[...]
>    [junit] Testsuite: org.apache.cactus.TestWebRequest
>    [junit] Tests run: 10, Failures: 0, Errors: 0, Time elapsed: 0,04 sec
>    [junit]
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.TestCase not found.
>java.lang.ClassNotFoundException: junit.framework.Test not found.
>
>BUILD FAILED
>java.lang.NullPointerException
>        at
>org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)
>        at
>net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetCheck.
>java:58)
>
>So maybe there is some problem with the junit jar not being in some
>classpath?
>  
>

Yes, I'd guess that this is the result of the first issue I mentioned in 
my other mail: dependencies are not considered (<[new/old]ClassPath> 
subelements of the clirr Ant task)

Any chance that you can add references to the same classpath that is 
used for java compilation?

Lars

RE: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[Vincent M. <vma...@pi...>]

One more precision: I also got the following message in the console:

[...]
    [junit] Testsuite: org.apache.cactus.TestWebRequest
    [junit] Tests run: 10, Failures: 0, Errors: 0, Time elapsed: 0,04 =
sec
    [junit]
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.TestCase not found.
java.lang.ClassNotFoundException: junit.framework.Test not found.

BUILD FAILED
java.lang.NullPointerException
        at
org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)
        at
net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetChe=
ck.
java:58)

So maybe there is some problem with the junit jar not being in some
classpath?

-Vincent


> -----Original Message-----
> From: Vincent Massol [mailto:vma...@pi...]
> Sent: samedi 21 ao=FBt 2004 13:55
> To: 'cli...@li...'
> Subject: RE: [Clirr-devel] CVS:
> clirr/core/src/java/net/sf/clirr/core/internal/checks
> InterfaceSetCheck.java,1.3,1.4
>=20
> Hi Lars,
>=20
> I've just tried it again with Clirr CVS HEAD on the cactus framework =
and
> still got an NPE:
>=20
> BUILD FAILED
> java.lang.NullPointerException
>         at
> =
org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)
>         at
> =
net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetChe=
c
> k.java:58)
>         at net.sf.clirr.core.Checker.runClassChecks(Checker.java:361)
>         at net.sf.clirr.core.Checker.reportDiffs(Checker.java:315)
>         at net.sf.clirr.core.Checker.reportDiffs(Checker.java:174)
>         at net.sf.clirr.ant.AntTask.execute(AntTask.java:267)
>         at org.apache.tools.ant.Task.perform(Task.java:341)
>         at =
org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:232)
>=20
> Any idea?
>=20
> Thanks
> -Vincent
>=20
> > -----Original Message-----
> > From: cli...@li... [mailto:clirr-devel-
> > ad...@li...] On Behalf Of Lars K=FChne
> > Sent: samedi 21 ao=FBt 2004 13:11
> > To: cli...@li...
> > Subject: [Clirr-devel] CVS:
> > clirr/core/src/java/net/sf/clirr/core/internal/checks
> > InterfaceSetCheck.java,1.3,1.4
> >
> > Update of
> > /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks
> > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24975
> >
> > Modified Files:
> > 	InterfaceSetCheck.java
> > Log Message:
> > avoid ClassCastException that was caused by adding Strings to a Set =
and
> > trying to extract JavaClass objects later
> > This should fix the Maven plugin problem that Vincent experienced
> >
> > Index: InterfaceSetCheck.java
> > =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > RCS file:
> >
> =
/cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/Inte=
r
> > faceSetCheck.java,v
> > retrieving revision 1.3
> > retrieving revision 1.4
> > diff -u -r1.3 -r1.4
> > --- InterfaceSetCheck.java	16 Jul 2004 10:16:50 -0000	1.3
> > +++ InterfaceSetCheck.java	21 Aug 2004 11:10:37 -0000	1.4
> > @@ -19,8 +19,8 @@
> >
> >  package net.sf.clirr.core.internal.checks;
> >
> > -import java.util.HashSet;
> >  import java.util.Set;
> > +import java.util.TreeSet;
> >
> >  import net.sf.clirr.core.Severity;
> >  import net.sf.clirr.core.Message;
> > @@ -110,13 +110,20 @@
> >          return true;
> >      }
> >
> > +    /**
> > +     * Creates a Set of JavaClass objects.
> > +     * @param classes the classes to include in the set, might =
contain
> > duplicates
> > +     * @return Set<JavaClass>
> > +     */
> >      private Set createClassSet(JavaClass[] classes)
> >      {
> > -        Set current =3D new HashSet();
> > +        // JavaClass does not define equals(), so we use a Set
> > implementation
> > +        // that determines equality by invoking a Comparator =
instead of
> > calling equals()
> > +
> > +        Set current =3D new =
TreeSet(JavaClassNameComparator.COMPARATOR);
> >          for (int i =3D 0; i < classes.length; i++)
> >          {
> > -            String currentInterface =3D classes[i].getClassName();
> > -            current.add(currentInterface);
> > +            current.add(classes[i]);
> >          }
> >          return current;
> >      }
> >
> >
> >
> > -------------------------------------------------------
> > SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank =
Media
> > 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
> > Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
> > http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
> > _______________________________________________
> > Clirr-devel mailing list
> > Cli...@li...
> > https://lists.sourceforge.net/lists/listinfo/clirr-devel

[Clirr-devel] maven plugin is working now

[<lak...@t-...>]

Hi guys,

I finally had the time to dig into Vincent's ClassCastException, it was 
a problem in InterfaceSetCheck where we added Strings to a Set and then 
expected it to contain JavaClass objects.

I have also made a small change in the plugin code to ensure that the 
baseline jar is downloaded only once, not every time the clirr goal is 
running.

After adding <versions> to the POM I was able to run "maven clirr" 
without any problems on commons-collections. Vincent, could you please 
retest with Cactus?

Open issues I see with the Maven plugin:

    * dependencies are not considered (<[new/old]ClassPath> subelements
      of the clirr Ant task), I don't know how things work out in the
      plugin if 3rd party classes appear in method signatures of the
      code clirr wants to check.
    * clirr:check calls jar:jar. In typical use cases (like adding clirr
      as a pregoal for jar:install) that will run jar:jar twice.

Cheers,
Lars

[Clirr-devel] CVS: clirr .cvsignore,1.4,1.5

[Vincent M. <vm...@us...>]

Update of /cvsroot/clirr/clirr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5784

Modified Files:
	.cvsignore 
Log Message:
More ignore files

Index: .cvsignore
===================================================================
RCS file: /cvsroot/clirr/clirr/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jul 2004 17:11:11 -0000	1.4
+++ .cvsignore	21 Aug 2004 11:58:08 -0000	1.5
@@ -7,3 +7,4 @@
 .classpath
 .project
 .settings
+.clover
\ No newline at end of file

RE: [Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[Vincent M. <vma...@pi...>]

Hi Lars,

I've just tried it again with Clirr CVS HEAD on the cactus framework and
still got an NPE:

BUILD FAILED
java.lang.NullPointerException
        at
org.apache.bcel.classfile.JavaClass.getAllInterfaces(JavaClass.java:808)
        at
net.sf.clirr.core.internal.checks.InterfaceSetCheck.check(InterfaceSetChe=
ck.
java:58)
        at net.sf.clirr.core.Checker.runClassChecks(Checker.java:361)
        at net.sf.clirr.core.Checker.reportDiffs(Checker.java:315)
        at net.sf.clirr.core.Checker.reportDiffs(Checker.java:174)
        at net.sf.clirr.ant.AntTask.execute(AntTask.java:267)
        at org.apache.tools.ant.Task.perform(Task.java:341)
        at =
org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:232)

Any idea?

Thanks
-Vincent

> -----Original Message-----
> From: cli...@li... [mailto:clirr-devel-
> ad...@li...] On Behalf Of Lars K=FChne
> Sent: samedi 21 ao=FBt 2004 13:11
> To: cli...@li...
> Subject: [Clirr-devel] CVS:
> clirr/core/src/java/net/sf/clirr/core/internal/checks
> InterfaceSetCheck.java,1.3,1.4
>=20
> Update of
> /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24975
>=20
> Modified Files:
> 	InterfaceSetCheck.java
> Log Message:
> avoid ClassCastException that was caused by adding Strings to a Set =
and
> trying to extract JavaClass objects later
> This should fix the Maven plugin problem that Vincent experienced
>=20
> Index: InterfaceSetCheck.java
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file:
> =
/cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/Inte=
r
> faceSetCheck.java,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- InterfaceSetCheck.java	16 Jul 2004 10:16:50 -0000	1.3
> +++ InterfaceSetCheck.java	21 Aug 2004 11:10:37 -0000	1.4
> @@ -19,8 +19,8 @@
>=20
>  package net.sf.clirr.core.internal.checks;
>=20
> -import java.util.HashSet;
>  import java.util.Set;
> +import java.util.TreeSet;
>=20
>  import net.sf.clirr.core.Severity;
>  import net.sf.clirr.core.Message;
> @@ -110,13 +110,20 @@
>          return true;
>      }
>=20
> +    /**
> +     * Creates a Set of JavaClass objects.
> +     * @param classes the classes to include in the set, might =
contain
> duplicates
> +     * @return Set<JavaClass>
> +     */
>      private Set createClassSet(JavaClass[] classes)
>      {
> -        Set current =3D new HashSet();
> +        // JavaClass does not define equals(), so we use a Set
> implementation
> +        // that determines equality by invoking a Comparator instead =
of
> calling equals()
> +
> +        Set current =3D new =
TreeSet(JavaClassNameComparator.COMPARATOR);
>          for (int i =3D 0; i < classes.length; i++)
>          {
> -            String currentInterface =3D classes[i].getClassName();
> -            current.add(currentInterface);
> +            current.add(classes[i]);
>          }
>          return current;
>      }
>=20
>=20
>=20
> -------------------------------------------------------
> SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
> 100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
> Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
> http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
> _______________________________________________
> Clirr-devel mailing list
> Cli...@li...
> https://lists.sourceforge.net/lists/listinfo/clirr-devel

[Clirr-devel] CVS: clirr/maven/src/main/net/sf/clirr/maven ClirrUtils.java,1.1,1.2

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/maven/src/main/net/sf/clirr/maven
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29408/src/main/net/sf/clirr/maven

Modified Files:
	ClirrUtils.java 
Log Message:
avoid download of baseline if already available

Index: ClirrUtils.java
===================================================================
RCS file: /cvsroot/clirr/clirr/maven/src/main/net/sf/clirr/maven/ClirrUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClirrUtils.java	15 Jul 2004 13:34:22 -0000	1.1
+++ ClirrUtils.java	21 Aug 2004 11:26:05 -0000	1.2
@@ -75,11 +75,13 @@
     public static void getBaselineJar(MavenJellyContext context)
         throws Exception
     {
+        String targetFileName = (String) context.getVariable("clirr.baseline.destination");
+        File targetFile = new File(targetFileName);
         HttpUtils.getFile(
             (String) context.getVariable("clirr.baseline.url"),
-            new File((String) context.getVariable("clirr.baseline.destination")),
-            false,
+            targetFile,
             false,
+            true,
             null,
             null,
             null,

[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/checks InterfaceSetCheck.java,1.3,1.4

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24975

Modified Files:
	InterfaceSetCheck.java 
Log Message:
avoid ClassCastException that was caused by adding Strings to a Set and trying to extract JavaClass objects later
This should fix the Maven plugin problem that Vincent experienced

Index: InterfaceSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/checks/InterfaceSetCheck.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InterfaceSetCheck.java	16 Jul 2004 10:16:50 -0000	1.3
+++ InterfaceSetCheck.java	21 Aug 2004 11:10:37 -0000	1.4
@@ -19,8 +19,8 @@
 
 package net.sf.clirr.core.internal.checks;
 
-import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import net.sf.clirr.core.Severity;
 import net.sf.clirr.core.Message;
@@ -110,13 +110,20 @@
         return true;
     }
 
+    /**
+     * Creates a Set of JavaClass objects.
+     * @param classes the classes to include in the set, might contain duplicates
+     * @return Set<JavaClass>
+     */
     private Set createClassSet(JavaClass[] classes)
     {
-        Set current = new HashSet();
+        // JavaClass does not define equals(), so we use a Set implementation
+        // that determines equality by invoking a Comparator instead of calling equals()
+
+        Set current = new TreeSet(JavaClassNameComparator.COMPARATOR);
         for (int i = 0; i < classes.length; i++)
         {
-            String currentInterface = classes[i].getClassName();
-            current.add(currentInterface);
+            current.add(classes[i]);
         }
         return current;
     }

Re: [Clirr-devel] Release 0.4

[<lak...@t-...>]

Simon Kitching wrote:

>On Fri, 2004-08-06 at 23:52, Lars Kühne wrote:
>  
>
>>Hi guys,
>>
>>I'm back from vacation. What remains to be done for the 0.4 release? Any 
>>bugs that absolutely *have* to be fixed? Vincent, did you resolve the 
>>problems with the Maven plugin when testing against cactus?
>>
>>What is "best practice" for a multiproject release? Do people tag and 
>>release each subproject individually or do they tag everything and 
>>release the results of the multiproject build?
>>    
>>
>
>Hi Lars,
>
>Welcome back.
>
>I'm not aware of any critical bugs. Lots of features still waiting to be
>added, but no bugs. I think a 0.4 release would be nice.
>
>  
>

OK, great. This only leaves the Maven plugin, which was the reason why 
we started the whole source tree restructuring game. I'd really like to 
get that sorted out before the release, so the Maven users in 
Apache-land can soon start to use Clirr without too much effort.

I'll try to use the plugin in commons-collections (which is probably a 
bit simpler than Cactus) next week to see if I can reproduce/fix 
Vincent's ClassCastException.

>Other issues:
>
>Before you left, we were discussing the way MethodSetCheck "pairs up"
>methods, and reports "changed" rather than "deleted" for the old
>prototype and "added" for the new one. We agreed that if the changed
>method previously overrode an inherited method, then we should instead
>report "deleted". I tried to implement this, but couldn't come up with a
>solution that wasn't seriously ugly. Maybe you could give this a go?
>
>  
>

Yep, but I can't promise anything - the Olympics really get in the way 
... :-)

>I'm also getting concerned in general about how complex the
>MethodSetCheck class is getting. And there are 3 or 4 requests in the
>bugtracker from Stephen Colebourne that mean we need to add even more
>code to this class. I think we need to figure out a way to break this
>down into a set of smaller classes somehow.
>
>  
>

Agreed, but I think that can wait until after 0.4.

Cheers,
Lars

Re: [Clirr-devel] Multiproject build fails

[<lak...@t-...>]

Vincent Massol wrote:

>>>[...]
>>>      
>>>
>>Thanks, that helped. I can now build both subprojects and the combined
>>website, but I think there is currently no way to do it all in one step
>>(jar:install isn't being called). I'll try to resolve that ASAP, but
>>help would be much appreciated.
>>    
>>
>
>To do it all in one step, you can create a custom goal in the the toplevel
>maven.xml:
>
><goal name="dist">
>  <j:set var="goal" value="dist"/>
>  <attainGoal name="dist"/>
></goal>
>
><goal name="dist-site" prereqs="dist,multiproject:site"/>
>
>And then in each subproject's maven.xml, have a custom dist goal. For
>example for core:
>
><goal name="dist" prereqs="jar:install"/>
>
>For maven:
>
><goal name="dist" prereqs="plugin:install"/>
>
>-Vincent
>  
>

OK, I have it working, you should now be able to use "maven dist" in the 
toplevel project to build everything.

Thanks,
Lars

[Clirr-devel] CVS: clirr/core/xdocs runcli.xml,1.1,1.2

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25001

Modified Files:
	runcli.xml 
Log Message:
fixed filename of uberjar to include "core"


Index: runcli.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/core/xdocs/runcli.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- runcli.xml	10 Jul 2004 13:24:04 -0000	1.1
+++ runcli.xml	15 Aug 2004 11:06:11 -0000	1.2
@@ -1,7 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
 <document>
   <properties>
     <title>Clirr Command-Line Usage</title>
-    <author>Lars Kühne</author>
+    <author>Lars Kühne</author>
   </properties>
   <body>
     <section name="Running Clirr from the Command Line">
@@ -11,7 +13,7 @@
         executable jar file. Clirr can then be run from a commandline
         via the command:
         <code>
-          java -jar clirr-1.0-uber.jar
+          java -jar clirr-core-1.0-uber.jar
         </code>
         Running clirr with no command-line arguments will display the
         available options.

[Clirr-devel] CVS: clirr/core maven.xml,1.1,1.2

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24148/core

Modified Files:
	maven.xml 
Log Message:
added dist goal to build all modules from toplevel project

Index: maven.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/core/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml	10 Jul 2004 13:24:03 -0000	1.1
+++ maven.xml	15 Aug 2004 11:01:13 -0000	1.2
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 
-<project default="java:jar"
+<project default="dist"
         xmlns:u="jelly:util"
   	xmlns:j="jelly:core">
   
+    <goal name="dist" prereqs="jar:install,uberjar:uberjar"/>
+
     <preGoal name="test:test">
         <attainGoal name="clirr:compiletestlibs"/>
     </preGoal>

[Clirr-devel] CVS: clirr maven.xml,1.2,1.3

[<lk...@us...>]

Update of /cvsroot/clirr/clirr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24148

Modified Files:
	maven.xml 
Log Message:
added dist goal to build all modules from toplevel project

Index: maven.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml	10 Jul 2004 13:48:25 -0000	1.2
+++ maven.xml	15 Aug 2004 11:01:12 -0000	1.3
@@ -5,10 +5,13 @@
   	xmlns:j="jelly:core">

   

   <goal name="dist">

+    <!-- call the dist target of each sub-project -->

     <j:set var="goal" value="dist"/>

     <attainGoal name="multiproject:goal"/>

   </goal>

 

+  <goal name="dist-site" prereqs="dist,multiproject:site"/>

+

   <preGoal name="clean">

     <attainGoal name="multiproject:clean"/>

   </preGoal>