svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java

[hlship]

Author: hlship
Date: Mon Oct 31 20:48:21 2011
New Revision: 1195662

URL: http://svn.apache.org/viewvc?rev=1195662&view=rev
Log:
TAP5-1737: Loading all pages using PageCatalog page fails with 
java.lang.ClassFormatError: Illegal field modifiers in class 
org/apache/tapestry5/corelib/pages/package-info: 0x12

Modified:
    
tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java

Modified: 
tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java?rev=1195662&r1=1195661&r2=1195662&view=diff
==============================================================================
--- 
tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
 (original)
+++ 
tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
 Mon Oct 31 20:48:21 2011
@@ -278,7 +278,9 @@ public class ClassNameLocatorImpl implem
                 {
                     scanDir(packageName + "." + fileName, file, 
componentClassNames);
                 }
-                else if (fileName.endsWith(CLASS_SUFFIX))
+                // https://issues.apache.org/jira/browse/TAP5-1737
+                // Use of package-info.java leaves these package-info.class 
files around.
+                else if (fileName.endsWith(CLASS_SUFFIX) && ! 
fileName.equals("package-info"))
                 {
                     String className = packageName + "." + 
fileName.substring(0,
                                                                               
fileName.length() - CLASS_SUFFIX.length());