You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/10/31 21:48:21 UTC
svn commit: r1195662 -
/tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
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());
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Bob Harner <bo...@gmail.com>.
pain, not pin.
Bob Harner
On Nov 1, 2011 6:53 AM, "Bob Harner" <bo...@gmail.com> wrote:
> 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" <hl...@gmail.com> 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, <hl...@apache.org> 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: dev-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>
>>
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
Bob ... don't worry about it. It's not like we had a test for this
... I saw that you had added package infos (thanks!) and even I didn't
expect there to be a problem.
I'm more concerned about problems with template parsing I may have
introduced in the late betas.
On Tue, Nov 1, 2011 at 5:01 AM, Igor Drobiazko <ig...@gmail.com> wrote:
> I'd rather say you found a bug which is fixed now. Tapestry users would
> experience same problems, if they would place package-info.java into
> components sub-package. Thank you, Bob.
>
> On Tue, Nov 1, 2011 at 11:53 AM, Bob Harner <bo...@gmail.com> wrote:
>
>> 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" <hl...@gmail.com> 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, <hl...@apache.org> 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: dev-unsubscribe@tapestry.apache.org
>> > For additional commands, e-mail: dev-help@tapestry.apache.org
>> >
>> >
>>
>
>
>
> --
> Best regards,
>
> Igor Drobiazko
> http://tapestry5.de
>
--
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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Igor Drobiazko <ig...@gmail.com>.
I'd rather say you found a bug which is fixed now. Tapestry users would
experience same problems, if they would place package-info.java into
components sub-package. Thank you, Bob.
On Tue, Nov 1, 2011 at 11:53 AM, Bob Harner <bo...@gmail.com> wrote:
> 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" <hl...@gmail.com> 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, <hl...@apache.org> 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: dev-unsubscribe@tapestry.apache.org
> > For additional commands, e-mail: dev-help@tapestry.apache.org
> >
> >
>
--
Best regards,
Igor Drobiazko
http://tapestry5.de
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Bob Harner <bo...@gmail.com>.
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" <hl...@gmail.com> 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, <hl...@apache.org> 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: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Massimo Lusetti <ml...@gmail.com>.
On Wed, Nov 2, 2011 at 9:25 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> I'm using svn 1.6.15 and git 1.7.6, perhaps that's a factor?
Here I'm on git 1.7.1 and svn 1.6.12 ... I'm not sure that's the cause
but I'll try to upgrade asap.
Cheers
--
Massimo
http://meridio.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
I'm using svn 1.6.15 and git 1.7.6, perhaps that's a factor?
On Wed, Nov 2, 2011 at 12:18 PM, Massimo Lusetti <ml...@gmail.com> wrote:
> On Wed, Nov 2, 2011 at 8:13 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>
>> I tend to do this in one window:
>>
>> gitt diff head^ | pbcopy
>>
>> and in the other:
>>
>> pbpaste | patch -p 1
>>
>> pbcopy / pbpaste are Mac commands for interacting with the system paste buffer
>
> Here I'm having problems with the patch generate by git diff which
> isn't correctly applied with the patch command.
> I've tried some (a lot?) combinations of git diff --no-prefix with
> patch -p0 but no luck.
>
> The code snipped I've pasted produce output like svn diff so it's (at
> least should) finely applied with the patch command.
>
> Cheers
> --
> Massimo
> http://meridio.blogspot.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Massimo Lusetti <ml...@gmail.com>.
On Wed, Nov 2, 2011 at 8:13 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> I tend to do this in one window:
>
> gitt diff head^ | pbcopy
>
> and in the other:
>
> pbpaste | patch -p 1
>
> pbcopy / pbpaste are Mac commands for interacting with the system paste buffer
Here I'm having problems with the patch generate by git diff which
isn't correctly applied with the patch command.
I've tried some (a lot?) combinations of git diff --no-prefix with
patch -p0 but no luck.
The code snipped I've pasted produce output like svn diff so it's (at
least should) finely applied with the patch command.
Cheers
--
Massimo
http://meridio.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
I tend to do this in one window:
gitt diff head^ | pbcopy
and in the other:
pbpaste | patch -p 1
pbcopy / pbpaste are Mac commands for interacting with the system paste buffer
On Wed, Nov 2, 2011 at 8:44 AM, Massimo Lusetti <ml...@gmail.com> wrote:
> On Mon, Oct 31, 2011 at 9:56 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>
>> It's awkward, but gets the job done. Hopefully the only additional
>> change will be to switch over to the final version number.
>
> I'm having hard time managing to get patch out of git that will apply
> cleanly to svn.
>
> Even with your workflow patch is not so happy. I've tried something like:
>
> git diff --no-prefix EAD~1 HEAD | sed -e "s/^diff --git
> [^[:space:]]*/Index:/" -e
> "s/^index.*/===================================================================/"
>> /tmp/patch
>
> which will convert the output to something similar to svn diff but
> without any luck...
>
> It's a pain in the ass ...
>
> Cheers
> --
> Massimo
> http://meridio.blogspot.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Massimo Lusetti <ml...@gmail.com>.
On Mon, Oct 31, 2011 at 9:56 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> It's awkward, but gets the job done. Hopefully the only additional
> change will be to switch over to the final version number.
I'm having hard time managing to get patch out of git that will apply
cleanly to svn.
Even with your workflow patch is not so happy. I've tried something like:
git diff --no-prefix HEAD~1 HEAD | sed -e "s/^diff --git
[^[:space:]]*/Index:/" -e
"s/^index.*/===================================================================/"
> /tmp/patch
which will convert the output to something similar to svn diff but
without any luck...
It's a pain in the ass ...
Cheers
--
Massimo
http://meridio.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1195662 - /tapestry/tapestry5/branches/5.3/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
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, <hl...@apache.org> 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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org