[jboss-cvs] JBossAS SVN: r92306 - in projects/annotations/trunk/core/src/main/java/org/jboss/annotations: javassistclasspool and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-08-13 09:03:33 -0400 (Thu, 13 Aug 2009)
New Revision: 92306

Modified:
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java
   projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistinputstream/JavassistInputStream.java
Log:
[JBANN-10] Create the JBoss Annotations XSD (Part 4)

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-13 12:21:04 UTC (rev 92305)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javalangreflect/JavaClass.java	2009-08-13 13:03:33 UTC (rev 92306)
@@ -89,14 +89,17 @@
             JarFile jar = null;
             try
             {
+               File jarFile = new File(u.toURI());
+               jar = new JarFile(jarFile);
+               
+               Scan scan = getScan(jar);
+
+               if (scan != null && scan.isExcludeAll())
+                  continue;
+
                List<String> classes = getClassNames(new URL[] {u});
                if (classes != null)
                {
-                  File jarFile = new File(u.toURI());
-                  jar = new JarFile(jarFile);
-
-                  Scan scan = getScan(jar);
-
                   for (String className : classes)
                   {
                      try

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java	2009-08-13 12:21:04 UTC (rev 92305)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistclasspool/JavassistClassPool.java	2009-08-13 13:03:33 UTC (rev 92306)
@@ -98,17 +98,20 @@
 
          for (URL u : urls)
          {
-            List<String> classes = getClassNames(new URL[] {u});
-            if (classes != null)
+            JarFile jar = null;
+            try
             {
-               JarFile jar = null;
-               try
-               {
-                  File jarFile = new File(u.toURI());
-                  jar = new JarFile(jarFile);
+               File jarFile = new File(u.toURI());
+               jar = new JarFile(jarFile);
+                  
+               Scan scan = getScan(jar);
 
-                  Scan scan = getScan(jar);
+               if (scan != null && scan.isExcludeAll())
+                  continue;
 
+               List<String> classes = getClassNames(new URL[] {u});
+               if (classes != null)
+               {
                   for (String className : classes)
                   {
                      try
@@ -135,23 +138,23 @@
                      }
                   }
                }
-               catch (Throwable t)
+            }
+            catch (Throwable t)
+            {
+               // Ignore
+            }
+            finally
+            {
+               if (jar != null)
                {
-                  // Ignore
-               }
-               finally
-               {
-                  if (jar != null)
+                  try
                   {
-                     try
-                     {
-                        jar.close();
-                     }
-                     catch (IOException ioe)
-                     {
-                        // Ignore
-                     }
+                     jar.close();
                   }
+                  catch (IOException ioe)
+                  {
+                     // Ignore
+                  }
                }
             }
          }

Modified: projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistinputstream/JavassistInputStream.java
===================================================================
--- projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistinputstream/JavassistInputStream.java	2009-08-13 12:21:04 UTC (rev 92305)
+++ projects/annotations/trunk/core/src/main/java/org/jboss/annotations/javassistinputstream/JavassistInputStream.java	2009-08-13 13:03:33 UTC (rev 92306)
@@ -107,6 +107,9 @@
 
                Scan scan = getScan(jar);
 
+               if (scan != null && scan.isExcludeAll())
+                  continue;
+
                Enumeration<JarEntry> entries = jar.entries();
 
                while ((isJava5 == null || isJava5.booleanValue()) && entries.hasMoreElements())