Howard -- I'm very sorry for the pin I caused with the package-info files. I thought a little more documentation would be innocuous enough, but I should have known better considering the special treatment of pages, components and mixin directories.
Bob Harner On Oct 31, 2011 4:56 PM, "Howard Lewis Ship" <[email protected]> wrote: > BTW, because git svn gets easily confused by branches, here's my workflow. > > Make the change in Git trunk branch (my primary workspace). git > commit, git svn dcommit > > Use git diff to generate a diff file. .. something like git diff > --raw -p head^^..head^ > > In my SVN workspace (on the SVN 5.3 branch), apply the patch (using > patch --skip 1), then svn commit. > > It's awkward, but gets the job done. Hopefully the only additional > change will be to switch over to the final version number. > > > > On Mon, Oct 31, 2011 at 1:48 PM, <[email protected]> wrote: > > 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()); > > > > > > > > > > -- > Howard M. Lewis Ship > > Creator of Apache Tapestry > > The source for Tapestry training, mentoring and support. Contact me to > learn how I can get you up and productive in Tapestry fast! > > (971) 678-5210 > http://howardlewisship.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
