clirr-devel — Discussion about the source code of Clirr

[Clirr-devel] be hard-hearte

[Seajack N. <mod...@in...>]

Trophe in the air long before it came. But I couldn't warn Roger. I just
had to let him find out. I wasn't there when the blow fell; but I'll
tell you this, that Roger may have been a quixotic idiot in the eyes of
the world, but if he failed it was because he was a dreamer, and an
idealist, not a coward and a shirk." Her eyes were blazing. "Oh, if you
could hear what some people said of him, Mary." Mary could fancy what
they had said. "Oh, Cousin Patty, Cousin Patty," she cried, "Do you
think he will ever forgive me? I have let such people talk to me, and I
have listened!" CHAPTER XXII _In Which the Garden Begins to Bloom; and
in Which Roger Dreams._ March, which brings to the North sharp winds and
gray days, brings to the sand-hill country its season of greatest
beauty. Straight up from the unpromising soil springs 

[Clirr-devel] H claim to be such, date from after the Conquest."[55] In a similar str

[Kinville <ha...@be...>]

Ef temple of the Toltecs; the ruins of an ancient structure at
Tollantzinco were pointed out at the time of the Conquest as those of
this building (see Sahagun, _Hist. de la Nueva Espana_, Lib. X, cap.
29). _coatlaquetzalli_; this edifice, said to have been left incomplete
by Quetzalcoatl, when he forsook Tollan, had pillars in the form of a
serpent, the head at the base, the tail at the top of the pillar. (See
Orozco y Berra, _Hist. Antigua de Mexico_, Tom. III, pp. 30 and 46.) The
structure is mentioned as follows in the _Anales de Cuauhtitlan_:-- _Auh
iniquac nemia Quetzalcoatl quitzintica, quipeuahtica iteocal quimaman
coatlaquetzali ihuan amo quitzonquixti, amo quipantlaz."_ "And when
Quetzalcoatl was living, he began and commenced the temple of his which
is the Coatlaquetzali (Serpent Plumes), and he did not finish it, he did
not fully erect it." _Nacxitl Topiltzin_, "Our Lord the four-footed."
_Nacxitl_ appears to have been the name of Quetzalcoatl, in his position
as lord of the merchants. Compare Sahagun, ubi supra, Lib. I, cap. 19.
2. _Poyauhtecatl_, a vo

[Clirr-devel] Release 0.7?

[Jochen W. <joc...@gm...>]

Hi, Lars,

wouldn't it be good to publish a 0.7 release finally? I can't think of
any reasons that prevent it. With almost no changes over the last
year, the project is as stable as can be.

Otherwise, I'd feel forced to finally release a version of the
clirr-maven-plugin with the current version included. (Provided, I
feel able to resolve the licensing issues.)

Thanks,

Jochen

-- 
Germanys national anthem is the most boring in the world - how telling!

[Clirr-devel] Mmoned, he refused to speak, but shook the table to express hi

[Vacha <inc...@uk...>]

Idered for more than three years. Eaton and Cathcart had recommended it
in 1801, and Government approved of the plan. In 1802, when Jusuf Pacha
offered Hamet the Beyship of Benghazi and Derne, to break up these
negotiations, the United States Consuls promised him Jusuf's throne, if
he would refuse the offer, and threatened, if he accepted it, to treat
him as an enemy, and to send a frigate to prevent him from landing at
Derne. Later, when the Bey of Tunis showed some inclination to surrender
Hamet to his brother, the Consuls furnished him with the means of escape
to Malta. In 1803, he crossed over to Derne in an English brig, hoping
to receive assistance from the American fleet; but Commodore Morris left
him to his own resources; he was unable to hold his ground, and fled to
Egypt. All this was so well known at home, that members of the
Opposition in Congress jokingly accused the Administration of
undertaking to decide constitutional questions for the people of
Tripoli. Before the news of this flight into Egypt reached the United
States, Eaton had been instructed by the President to take command of an
expedition on the coast of Barbary in connection with Hamet. It had been
determined to furnish a few pieces of field-artillery, a thousand stand
of arms, and forty thousand dollars as a loan to the Pretender. But when
the President heard of

[Clirr-devel] guided his

[Matzen <tes...@we...>]

Ine! How you threw them over! Two or three cracked heads, anyway--the
cowardly swine!" "Look here!" said Swithin suddenly; "which is my way to
the Goldene Alp?" The Hungarian replied, "But you are coming with me,
for a glass of wine?" Swithin looked at the ground. 'Not if I know it!'
he thought. "Ah!" said the Hungarian with dignity, "you do not wish for
my friendship!" 'Touchy beggar!' thought Swithin. "Of course," he
stammered, "if you put it in that way--" The Hungarian bowed, murmuring,
"Forgive me!" They had not gone a dozen steps before a youth, with a
beardless face and hollow cheeks, accosted them. "For the love of
Christ, gentlemen," he said, "help me!" "Are you a German?" asked
Boleskey. "Yes," said the youth. "Then you may rot!" "Master, look
here!" Tearing open his coat, the youth displayed his skin, and a
leather belt drawn tight round it. Again Swithin felt that desire to
take to his heels. He was filled with horrid forebodings--a sense of
perpending intimacy with things such as no gentleman had dealings with.
The Hungarian crossed himself. "Brother," he said to the youth, "come
you in!" Swithin looked at them askance, and followed. By a dim light
they groped their way up some stairs into a large room, into which the
moon was shining through a window bulging over the street. A lamp burned
low; there was a smell of spirits and tobacco, with a faint, peculiar
scent, as of rose leaves. In one corner stood a czymbal, in another a
great pile of newspapers. On the wall hung some old-fashioned pistols,
and a rosary of yellow beads. Everything w

[Clirr-devel] hat skill

[Truglia T. <sen...@ab...>]

Pectators be your wife and children. But do not make your first effort
in the art at a company dinner. Every lady should learn the art. There
is no reason why she may not excel in it, as she has every opportunity
to study the

[Clirr-devel] rozelle

[prankishness<mil...@ar...>]

Seduce a Woman - Hoow to Seduce a Marrried Woman Into Bed.www.pill99{.com}

[Clirr-devel] attending

[Frasier A. <ste...@wo...>]

3 Most Dangerous Mistakes You Should Never Make in Bed - You Must Know Thgis Before tI's Too Late.www[dot]shop41[dot]net

[Clirr-devel] ostracisable

[Ravenscraft<na...@to...>]

Fool rPoof Tips on How to aMke Love to a Man.www .se57. net

[Clirr-devel] urethritis

[Garrahan <mon...@la...>]

How To Turn A Woman On In 3 Simple Steps -- Be An Alhpa Man.www-ze44-com

[Clirr-devel] synesis

[Oskins <ret...@cy...>]

How To Arouse A Woman -- Inn 4 Simple Steps.www+te81+net

[Clirr-devel] What You Caan Learn by Taking a Gender Identtity Test

[Hughen<te...@lu...>]

What You Cpan Leafrn by Taking a Gender Identity Test www. med95. net. Cihna sees red over revolutionary toilet hmuour

[Clirr-devel] Eortic Msasage - The Ultimate Warm Up Session Before sex

[peer <uni...@de...>]

Erotic Matssage - Thhe Ultimate Warm Up Session Before sex www. pill55. net. Phtkoo Slideshow | Reuters.com

[Clirr-devel] Kama uStra Positions -- The One Position That Can Give You The Most Pleasurable Night

[margarita<boo...@st...>]

BNA Reef Guilty Plea

[Clirr-devel] New Male Masturbatcinon Techniques-Updated

[misdirected<tr...@ga...>]

hTe Sad Saga Of Bricce

[Clirr-devel] CVS: clirr/core/src/test/net/sf/clirr/core/internal/checks AbstractCheckerTestCase.java, 1.6, 1.7

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2743/core/src/test/net/sf/clirr/core/internal/checks

Modified Files:
	AbstractCheckerTestCase.java 
Log Message:
javadoc cleanup

Index: AbstractCheckerTestCase.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks/AbstractCheckerTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractCheckerTestCase.java	29 May 2009 20:06:24 -0000	1.6
+++ AbstractCheckerTestCase.java	29 May 2009 20:11:02 -0000	1.7
@@ -96,9 +96,7 @@
     protected abstract ClassFilter createClassFilter();
 
     /**
-     * Createas the Checker that is configured to run this test.
-     *
-     * @param tdl a
+     * Creates the Checker that is configured to run this test.
      */
     protected abstract Checker createChecker();
 

[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/spi TypeArrayBuilderSupport.java, 1.3, 1.4 TypeArrayBuilder.java, 1.1, 1.2

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/spi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/java/net/sf/clirr/core/spi

Modified Files:
	TypeArrayBuilderSupport.java TypeArrayBuilder.java 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: TypeArrayBuilderSupport.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/spi/TypeArrayBuilderSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeArrayBuilderSupport.java	17 Aug 2008 11:13:08 -0000	1.3
+++ TypeArrayBuilderSupport.java	29 May 2009 20:06:25 -0000	1.4
@@ -8,26 +8,27 @@
 public abstract class TypeArrayBuilderSupport implements TypeArrayBuilder
 {
 
-    protected ClassLoader createClassLoader(File[] jarFiles, ClassLoader thirdPartyClasses)
+    protected ClassLoader createClassLoader(File[] classPathEntries, ClassLoader thirdPartyClasses)
     {
-        final URL[] jarUrls = new URL[jarFiles.length];
-        for (int i = 0; i < jarFiles.length; i++)
+        final URL[] entryUrls = new URL[classPathEntries.length];
+        for (int i = 0; i < classPathEntries.length; i++)
         {
-            File jarFile = jarFiles[i];
+            File entry = classPathEntries[i];
             try
             {
-                URL url = jarFile.toURI().toURL();
-                jarUrls[i] = url;
+                URL url = entry.toURI().toURL();
+                entryUrls[i] = url;
             }
             catch (MalformedURLException ex)
             {
+                String fileType = entry.isDirectory() ? "directory" : "jar file";
                 throw new IllegalArgumentException(
-				        "Cannot create classloader with jar file " + jarFile, ex);
+                        "Cannot create classloader with " + fileType + " " + entry, ex);
             }
         }
-        final URLClassLoader jarsLoader = new URLClassLoader(jarUrls, thirdPartyClasses);
-        
-        return jarsLoader;
+        final URLClassLoader loader = new URLClassLoader(entryUrls, thirdPartyClasses);
+
+        return loader;
     }
 
 }

Index: TypeArrayBuilder.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/spi/TypeArrayBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeArrayBuilder.java	16 Mar 2006 22:30:19 -0000	1.1
+++ TypeArrayBuilder.java	29 May 2009 20:06:25 -0000	1.2
@@ -10,17 +10,17 @@
     /**
      * Creates a set of classes to check.
      *
-     * @param jarFiles a set of jar filed to scan for class files.
+     * @param classPathEntries a set of jar files and directories to scan for class files.
      *
      * @param thirdPartyClasses loads classes that are referenced
-     * by the classes in the jarFiles
+     * by the classes in the classPathEntries
      *
-     * @param classSelector is an object which determines which classes from the
-     * old and new jars are to be compared. This parameter may be null, in
+     * @param classSelector is an object that determines which classes reachable via the
+     * classPathEntries are to be compared. This parameter may be null, in
      * which case all classes in the old and new jars are compared.
      */
     JavaType[] createClassSet(
-            File[] jarFiles, ClassLoader thirdPartyClasses, ClassFilter classSelector)
+            File[] classPathEntries, ClassLoader thirdPartyClasses, ClassFilter classSelector)
             throws CheckerException;
 
 }

[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/cli Clirr.java, 1.12, 1.13

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/java/net/sf/clirr/cli

Modified Files:
	Clirr.java 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: Clirr.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli/Clirr.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Clirr.java	23 Sep 2008 22:39:17 -0000	1.12
+++ Clirr.java	29 May 2009 20:06:25 -0000	1.13
@@ -138,8 +138,8 @@
         }
 
 
-        File[] origJars = pathToFileArray(oldPath);
-        File[] newJars = pathToFileArray(newPath);
+        File[] origClassPathEntries = pathToFileArray(oldPath);
+        File[] newClassPathEntries = pathToFileArray(newPath);
 
         checker.addDiffListener(diffListener);
 
@@ -149,18 +149,18 @@
             ClassLoader loader2 = new URLClassLoader(convertFilesToURLs(pathToFileArray(newClassPath)));
 
             DefaultTypeArrayBuilderFactory tabFactory = new DefaultTypeArrayBuilderFactory();
-            
+
             TypeArrayBuilder tab1 = tabFactory.build();
             TypeArrayBuilder tab2 = tabFactory.build();
 
             final JavaType[] origClasses =
-                tab1.createClassSet(origJars, loader1, classSelector);
-            
+                tab1.createClassSet(origClassPathEntries, loader1, classSelector);
+
             final JavaType[] newClasses =
-                tab2.createClassSet(newJars, loader2, classSelector);
-            
+                tab2.createClassSet(newClassPathEntries, loader2, classSelector);
+
             checker.reportDiffs(origClasses, newClasses);
-            
+
             System.exit(0);
         }
         catch (CheckerException ex)
@@ -193,7 +193,7 @@
      * @param options
      * @return
      */
-    private CommandLine parseCommandLine(String[] args, Options options) 
+    private CommandLine parseCommandLine(String[] args, Options options)
     {
         BasicParser parser = new BasicParser();
         CommandLine cmdline = null;
@@ -245,9 +245,9 @@
     {
         if (path == null)
         {
-            return new File[0];            
+            return new File[0];
         }
-        
+
         ArrayList files = new ArrayList();
 
         int pos = 0;
@@ -266,7 +266,7 @@
 
         return (File[]) files.toArray(new File[files.size()]);
     }
-    
+
     private URL[] convertFilesToURLs(File[] files) throws MalformedURLException
     {
         URL[] ret = new URL[files.length];

[Clirr-devel] CVS: clirr/core/src/changes changes.xml,1.2,1.3

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/changes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/changes

Modified Files:
	changes.xml 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: changes.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/changes/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml	9 Oct 2008 21:05:07 -0000	1.2
+++ changes.xml	29 May 2009 20:06:25 -0000	1.3
@@ -8,6 +8,13 @@
   <body>
 
     <release version="0.7-SNAPSHOT" date="in CVS">
+        <action dev="lkuehne" type="add">
+            Old and new classes no longer have to be packaged in jars, a directory will work as well,
+            both on the command line tool and the SPI level
+            (request by Jochen Wiedmann from the clirr-maven-plugin team).
+            For the Ant frontend this feature is currently not available, because the origFiles and
+            newFiles filesets cannot contain directories.
+        </action>
         <action dev="lkuehne" type="fix">
             Removed dependency commons-lang.
         </action>

[Clirr-devel] CVS: clirr/core/src/test/net/sf/clirr/core/internal/checks AbstractCheckerTestCase.java, 1.5, 1.6

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/test/net/sf/clirr/core/internal/checks

Modified Files:
	AbstractCheckerTestCase.java 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: AbstractCheckerTestCase.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks/AbstractCheckerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractCheckerTestCase.java	24 Mar 2009 21:23:49 -0000	1.5
+++ AbstractCheckerTestCase.java	29 May 2009 20:06:24 -0000	1.6
@@ -38,7 +38,7 @@
     }
 
     /**
-     * Returns the baseline jar files to test against (the old version).
+     * Returns the baseline classpath entry files to test against (the old version).
      */
     protected File[] getBaseLine()
     {
@@ -48,12 +48,12 @@
     }
 
     /**
-     * Returns the current set of jar files (the new version).
+     * Returns the current set of classpath entry files (the new version).
      */
     protected File[] getCurrent()
     {
         return new File[]{
-            new File(getTestInputDir(), "testlib-v2.jar")
+            new File(getTestInputDir(), "testinput/testlib-v2")
         };
     }
 

[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/internal/asm AsmTypeArrayBuilder.java, 1.2, 1.3

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/asm
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/java/net/sf/clirr/core/internal/asm

Modified Files:
	AsmTypeArrayBuilder.java 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: AsmTypeArrayBuilder.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/asm/AsmTypeArrayBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsmTypeArrayBuilder.java	19 May 2007 12:05:29 -0000	1.2
+++ AsmTypeArrayBuilder.java	29 May 2009 20:06:25 -0000	1.3
@@ -1,11 +1,18 @@
 package net.sf.clirr.core.internal.asm;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -17,13 +24,11 @@
 
 public class AsmTypeArrayBuilder extends TypeArrayBuilderSupport
 {
-
-
     public AsmTypeArrayBuilder()
     {
     }
 
-    public JavaType[] createClassSet(File[] jarFiles, ClassLoader thirdPartyClasses, ClassFilter classSelector) throws CheckerException
+    public JavaType[] createClassSet(File[] classPathEntries, ClassLoader thirdPartyClasses, ClassFilter classSelector) throws CheckerException
     {
         if (classSelector == null)
         {
@@ -31,75 +36,161 @@
             classSelector = new ClassSelector(ClassSelector.MODE_UNLESS);
         }
 
-        ClassLoader classLoader = createClassLoader(jarFiles, thirdPartyClasses);
+        ClassLoader classLoader = createClassLoader(classPathEntries, thirdPartyClasses);
 
         Repository repository = new Repository(classLoader);
 
         List selected = new ArrayList();
 
-        for (int i = 0; i < jarFiles.length; i++)
+        for (int i = 0; i < classPathEntries.length; i++)
         {
-            File jarFile = jarFiles[i];
-            ZipFile zip = null;
-            try
+            File classPathEntry = classPathEntries[i];
+            if (classPathEntry.isDirectory())
             {
-                zip = new ZipFile(jarFile, ZipFile.OPEN_READ);
-            }
-            catch (IOException ex)
-            {
-                throw new CheckerException(
-                    "Cannot open " + jarFile + " for reading", ex);
-            }
-            Enumeration enumEntries = zip.entries();
-            while (enumEntries.hasMoreElements())
-            {
-                ZipEntry zipEntry = (ZipEntry) enumEntries.nextElement();
-                if (!zipEntry.isDirectory() && zipEntry.getName().endsWith(".class"))
+                List classFiles = scanDirForClassFiles(classPathEntry);
+                for (Iterator it = classFiles.iterator(); it.hasNext();)
                 {
-                    final AsmJavaType javaType = extractClass(repository, zipEntry, zip);
+                    File classFile = (File) it.next();
+                    final AsmJavaType javaType = extractClass(repository, classFile);
                     if (classSelector.isSelected(javaType))
                     {
                         selected.add(javaType);
                     }
                 }
             }
+            else
+            {
+                File jarFile = classPathEntry;
+                ZipFile zip = null;
+                try
+                {
+                    zip = new ZipFile(jarFile, ZipFile.OPEN_READ);
+                }
+                catch (IOException ex)
+                {
+                    throw new CheckerException(
+                            "Cannot open " + jarFile + " for reading", ex);
+                }
+                Enumeration enumEntries = zip.entries();
+                while (enumEntries.hasMoreElements())
+                {
+                    ZipEntry zipEntry = (ZipEntry) enumEntries.nextElement();
+                    if (!zipEntry.isDirectory() && zipEntry.getName().endsWith(".class"))
+                    {
+                        final AsmJavaType javaType = extractClass(repository, zipEntry, zip);
+                        if (classSelector.isSelected(javaType))
+                        {
+                            selected.add(javaType);
+                        }
+                    }
+                }
+            }
         }
 
         JavaType[] ret = new JavaType[selected.size()];
         selected.toArray(ret);
         return ret;
+    }
+
+    private List scanDirForClassFiles(File rootDir) throws CheckerException
+    {
+        // implementation note: we need to avoid infinite loops
+        // that are created by symbolic links in the file system
 
+        try
+        {
+            List ret = new ArrayList();
+
+            final Set canonicalPathsSeen = new HashSet();
+            LinkedList dirQueue = new LinkedList();
+            dirQueue.add(rootDir);
+            canonicalPathsSeen.add(rootDir.getCanonicalPath());
+            while (!dirQueue.isEmpty())
+            {
+                File dir = (File) dirQueue.removeLast();
+                File[] files = dir.listFiles(new FileFilter() {
+                    public boolean accept(File pathname) {
+                        return !pathname.isDirectory() && pathname.getName().endsWith(".class");
+                    }
+                });
+                for (int i = 0; i < files.length; i++) {
+                    ret.add(files[i]);
+                }
+
+                File[] subdirs = dir.listFiles(new FileFilter() {
+                    public boolean accept(File pathname) {
+                        return pathname.isDirectory();
+                    }
+                });
+                for (int i = 0; i < subdirs.length; i++)
+                {
+                    File subdir = subdirs[i];
+                    String canonicalPath = subdir.getCanonicalPath();
+                    if (!canonicalPathsSeen.contains(canonicalPath))
+                    {
+                        dirQueue.add(subdir);
+                        canonicalPathsSeen.add(canonicalPath);
+                    }
+                }
+            }
+            return ret;
+        }
+        catch (IOException ex)
+        {
+            throw new CheckerException("unable to scan directory " + rootDir + " for class files", ex);
+        }
     }
-    
-    private AsmJavaType extractClass(
-            Repository repository, ZipEntry zipEntry, ZipFile zip)
-            throws CheckerException
+
+    private AsmJavaType extractClass(Repository repository, ZipEntry zipEntry, ZipFile zip) throws CheckerException
     {
+        String rootLocation = zip.getName();
+        String streamName = zipEntry.getName();
         InputStream is = null;
         try
         {
             is = zip.getInputStream(zipEntry);
-            
             return repository.readJavaTypeFromStream(is);
         }
         catch (IOException ex)
         {
-            throw new CheckerException(
-                    "Cannot read " + zipEntry.getName() + " from " + zip.getName(),
-                    ex);
+            throw new CheckerException("Cannot read " + streamName + " from " + rootLocation, ex);
         }
         finally
         {
-            if (is != null)
+            close(is, streamName);
+        }
+    }
+
+    private AsmJavaType extractClass(Repository repository, File classFile) throws CheckerException
+    {
+        String streamName = classFile.getPath();
+        InputStream is = null;
+        try
+        {
+            is = new BufferedInputStream(new FileInputStream(classFile));
+            return repository.readJavaTypeFromStream(is);
+        }
+        catch (IOException ex)
+        {
+            throw new CheckerException("Cannot read " + streamName, ex);
+        }
+        finally
+        {
+            close(is, streamName);
+        }
+    }
+
+    private void close(InputStream is, String streamName) throws CheckerException
+    {
+        if (is != null)
+        {
+            try
             {
-                try
-                {
-                    is.close();
-                }
-                catch (IOException ex)
-                {
-                    throw new CheckerException("Cannot close " + zip.getName(), ex);
-                }
+                is.close();
+            }
+            catch (IOException ex)
+            {
+                throw new CheckerException("Cannot close " + streamName, ex);
             }
         }
     }

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

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18137/core/src/test/net/sf/clirr/core/internal/checks

Modified Files:
	AbstractCheckTestCase.java 
Log Message:
fixed typo

Index: AbstractCheckTestCase.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks/AbstractCheckTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractCheckTestCase.java	9 Jan 2006 21:38:38 -0000	1.4
+++ AbstractCheckTestCase.java	24 May 2009 20:26:39 -0000	1.5
@@ -13,9 +13,9 @@
 public abstract class AbstractCheckTestCase extends AbstractCheckerTestCase
 {
     /**
-     * Createas the Checker that is configured to run this test.
-     * 
-     * @param tdl a 
+     * Creates the Checker that is configured to run this test.
+     *
+     * @param tdl a
      */
     protected Checker createChecker()
     {

[Clirr-devel] [ clirr-Feature Requests-2794039 ] API Support for checking dirs, not just jars

[SourceForge.net <no...@so...>]

Feature Requests item #2794039, was opened at 2009-05-19 21:27
Message generated for change (Tracker Item Submitted) made by lkuehne
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=590802&aid=2794039&group_id=89627

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lars Kühne (lkuehne)
Assigned to: Lars Kühne (lkuehne)
Summary: API Support for checking dirs, not just jars

Initial Comment:
Request from J. Wiedmann, maintainer of clirr maven plugin:

The clirr API should support checking of classes outside a jar, because the maven plugin needs to work with class files, not jars

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=590802&aid=2794039&group_id=89627

Re: [Clirr-devel] Patch to convert clirr-maven-plugin

[Jochen W. <joc...@gm...>]

Lars, any feedback on this?


On Mon, Mar 30, 2009 at 11:34 PM, Jochen Wiedmann
<joc...@gm...> wrote:
> Hi,
>
> in order to convert the clirr-maven-plugin to 0.7, I would beg to
> either apply the patch below or to advice me what other solutions I
> should choose.
>
> Thanks,
>
> Jochen
>
> P.S: What's the equivalent of Repository.storeClass in 0.7? Is it required?
>
> --
> I have always wished for my computer to be as easy to use as my
> telephone; my wish has come true because I can no longer figure out
> how to use my telephone.
>
>    -- (Bjarne Stroustrup,
> http://www.research.att.com/~bs/bs_faq.html#really-say-that
>       My guess: Nokia E50)
>
>
> ### Eclipse Workspace Patch 1.0
> #P clirr
> Index: core/src/java/net/sf/clirr/core/internal/asm/Repository.java
> ===================================================================
> RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/asm/Repository.java,v
> retrieving revision 1.6
> diff -u -r1.6 Repository.java
> --- core/src/java/net/sf/clirr/core/internal/asm/Repository.java        23
> Sep 2008 21:18:06 -0000 1.6
> +++ core/src/java/net/sf/clirr/core/internal/asm/Repository.java        30
> Mar 2009 21:32:31 -0000
> @@ -18,7 +18,7 @@
>  *
>  * @author lkuehne
>  */
> -class Repository
> +public class Repository
>  {
>     private static final Pattern PRIMITIVE_PATTERN =
> Pattern.compile("(int|float|long|double|boolean|char|short|byte)");
>     private static final Pattern ARRAY_PATTERN = Pattern.compile("(\\[\\])+$");
> Index: core/src/java/net/sf/clirr/core/internal/asm/AsmTypeArrayBuilder.java
> ===================================================================
> RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/internal/asm/AsmTypeArrayBuilder.java,v
> retrieving revision 1.2
> diff -u -r1.2 AsmTypeArrayBuilder.java
> --- core/src/java/net/sf/clirr/core/internal/asm/AsmTypeArrayBuilder.java       19
> May 2007 12:05:29 -0000 1.2
> +++ core/src/java/net/sf/clirr/core/internal/asm/AsmTypeArrayBuilder.java       30
> Mar 2009 21:32:30 -0000
> @@ -56,7 +56,7 @@
>                 ZipEntry zipEntry = (ZipEntry) enumEntries.nextElement();
>                 if (!zipEntry.isDirectory() &&
> zipEntry.getName().endsWith(".class"))
>                 {
> -                    final AsmJavaType javaType =
> extractClass(repository, zipEntry, zip);
> +                    final JavaType javaType =
> extractClass(repository, zipEntry, zip);
>                     if (classSelector.isSelected(javaType))
>                     {
>                         selected.add(javaType);
> @@ -70,17 +70,14 @@
>         return ret;
>
>     }
> -
> -    private AsmJavaType extractClass(
> +
> +    private JavaType extractClass(
>             Repository repository, ZipEntry zipEntry, ZipFile zip)
>             throws CheckerException
>     {
> -        InputStream is = null;
>         try
>         {
> -            is = zip.getInputStream(zipEntry);
> -
> -            return repository.readJavaTypeFromStream(is);
> +            return extractClass(repository, zip.getInputStream(zipEntry));
>         }
>         catch (IOException ex)
>         {
> @@ -88,21 +85,34 @@
>                     "Cannot read " + zipEntry.getName() + " from " +
> zip.getName(),
>                     ex);
>         }
> +    }
> +
> +    public JavaType extractClass(
> +            Repository repository, InputStream stream)
> +            throws IOException
> +    {
> +        InputStream is = null;
> +        try
> +        {
> +            is = stream;
> +            AsmJavaType result = repository.readJavaTypeFromStream(is);
> +            is = null;
> +            stream.close();
> +            return result;
> +        }
>         finally
>         {
>             if (is != null)
>             {
>                 try
>                 {
> -                    is.close();
> +                    stream.close();
>                 }
>                 catch (IOException ex)
>                 {
> -                    throw new CheckerException("Cannot close " +
> zip.getName(), ex);
> +                    // Ignore this, throw the inner exception.
>                 }
>             }
>         }
>     }
> -
> -
>  }
>



-- 
Don't trust a government that doesn't trust you.

[Clirr-devel] [ clirr-Feature Requests-1722291 ] migrate build to maven 2

[SourceForge.net <no...@so...>]

Feature Requests item #1722291, was opened at 2007-05-20 21:54
Message generated for change (Comment added) made by joe
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=590802&aid=1722291&group_id=89627

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lars Kühne (lkuehne)
Assigned to: Nobody/Anonymous (nobody)
Summary: migrate build to maven 2

Initial Comment:
this should lead to better multi-module support, better IDE integration, etc.

main issues:
* How do we call javac for generating the test resources? Do we need more modules, one for each version of the test library?
* How do we create the final distribution files? Maybe look at the dist module of Apache Yoko...

----------------------------------------------------------------------

Comment By: Jochen Wiedmann (joe)
Date: 2009-05-01 15:12

Message:
I think this issue can be closed?


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=590802&aid=1722291&group_id=89627