You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@harmony.apache.org by Nathan Beyer <nd...@apache.org> on 2009/08/04 04:23:04 UTC
Re: svn commit: r800268 - /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
This reminds me, we need to put the standard Apache header on all
these files. Since they are under public domain (not actually a
license), we are actually taken ownership of the files. We can check
with legal-discuss@ if anyone has concerns.
-Nathan
On Mon, Aug 3, 2009 at 4:12 AM, <hi...@apache.org> wrote:
> Author: hindessm
> Date: Mon Aug 3 09:12:45 2009
> New Revision: 800268
>
> URL: http://svn.apache.org/viewvc?rev=800268&view=rev
> Log:
> Remove misleading comment - the only diff from latest Doug Lea version.
>
> Modified:
> harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
>
> Modified: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java?rev=800268&r1=800267&r2=800268&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (original)
> +++ harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java Mon Aug 3 09:12:45 2009
> @@ -4,11 +4,6 @@
> * http://creativecommons.org/licenses/publicdomain
> */
>
> -/*
> - * Modified in Apache Harmony to comply with Java 5 signature
> - * specification.
> - */
> -
> package java.util.concurrent;
>
> import java.util.*;
>
>
>
Re: svn commit: r800268 - /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
Posted by Jesse Wilson <je...@google.com>.
On Mon, Aug 3, 2009 at 10:23 PM, Nathan Beyer <nd...@apache.org> wrote:
> This reminds me, we need to put the standard Apache header on all
> these files. Since they are under public domain (not actually a
> license), we are actually taken ownership of the files. We can check
> with legal-discuss@ if anyone has concerns.
My only objection is that it could add friction in keeping the module
up-to-date. Decent merge tools make this easy enough, but I prefer to avoid
cosmetic deltas between ourselves and the upstream project.
Re: svn commit: r800268 - /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
Posted by Nathan Beyer <nd...@apache.org>.
The conversation sort of got derailed, but from what I gathered, we
can leave the unchanged files as is, but we should inject the header
to files that we have changed [1].
It was also suggested that we place an entry in NOTICE to recognize
the contribution of the code to the public. There was some
disagreement about it this though.
-Nathan
[1] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200908.mbox/%3C3b3f27c60908051855n9079b33q95c0aeb34a45edbf@mail.gmail.com%3E
On Tue, Aug 4, 2009 at 7:58 PM, Nathan Beyer<nd...@apache.org> wrote:
> On Tue, Aug 4, 2009 at 7:33 AM, sebb<se...@gmail.com> wrote:
>> On 04/08/2009, Nathan Beyer <nd...@apache.org> wrote:
>>> This reminds me, we need to put the standard Apache header on all
>>> these files. Since they are under public domain (not actually a
>>> license), we are actually taken ownership of the files. We can check
>>> with legal-discuss@ if anyone has concerns.
>>
>> I have a concern.
>> It does not seem correct to change the files in that way.
>
> Ack. I'll post a question on legal-discuss@ and get verification.
>
> -Nathan
>
>>
>>> -Nathan
>>>
>>> On Mon, Aug 3, 2009 at 4:12 AM, <hi...@apache.org> wrote:
>>> > Author: hindessm
>>> > Date: Mon Aug 3 09:12:45 2009
>>> > New Revision: 800268
>>> >
>>> > URL: http://svn.apache.org/viewvc?rev=800268&view=rev
>>> > Log:
>>> > Remove misleading comment - the only diff from latest Doug Lea version.
>>> >
>>> > Modified:
>>> > harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
>>> >
>>> > Modified: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
>>> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java?rev=800268&r1=800267&r2=800268&view=diff
>>> > ==============================================================================
>>> > --- harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (original)
>>> > +++ harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java Mon Aug 3 09:12:45 2009
>>> > @@ -4,11 +4,6 @@
>>> > * http://creativecommons.org/licenses/publicdomain
>>> > */
>>> >
>>> > -/*
>>> > - * Modified in Apache Harmony to comply with Java 5 signature
>>> > - * specification.
>>> > - */
>>> > -
>>> > package java.util.concurrent;
>>> >
>>> > import java.util.*;
>>> >
>>> >
>>> >
>>>
>>
>
Re: svn commit: r800268 - /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
Posted by Nathan Beyer <nd...@apache.org>.
On Tue, Aug 4, 2009 at 7:33 AM, sebb<se...@gmail.com> wrote:
> On 04/08/2009, Nathan Beyer <nd...@apache.org> wrote:
>> This reminds me, we need to put the standard Apache header on all
>> these files. Since they are under public domain (not actually a
>> license), we are actually taken ownership of the files. We can check
>> with legal-discuss@ if anyone has concerns.
>
> I have a concern.
> It does not seem correct to change the files in that way.
Ack. I'll post a question on legal-discuss@ and get verification.
-Nathan
>
>> -Nathan
>>
>> On Mon, Aug 3, 2009 at 4:12 AM, <hi...@apache.org> wrote:
>> > Author: hindessm
>> > Date: Mon Aug 3 09:12:45 2009
>> > New Revision: 800268
>> >
>> > URL: http://svn.apache.org/viewvc?rev=800268&view=rev
>> > Log:
>> > Remove misleading comment - the only diff from latest Doug Lea version.
>> >
>> > Modified:
>> > harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
>> >
>> > Modified: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
>> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java?rev=800268&r1=800267&r2=800268&view=diff
>> > ==============================================================================
>> > --- harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (original)
>> > +++ harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java Mon Aug 3 09:12:45 2009
>> > @@ -4,11 +4,6 @@
>> > * http://creativecommons.org/licenses/publicdomain
>> > */
>> >
>> > -/*
>> > - * Modified in Apache Harmony to comply with Java 5 signature
>> > - * specification.
>> > - */
>> > -
>> > package java.util.concurrent;
>> >
>> > import java.util.*;
>> >
>> >
>> >
>>
>
Re: svn commit: r800268 - /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
Posted by sebb <se...@gmail.com>.
On 04/08/2009, Nathan Beyer <nd...@apache.org> wrote:
> This reminds me, we need to put the standard Apache header on all
> these files. Since they are under public domain (not actually a
> license), we are actually taken ownership of the files. We can check
> with legal-discuss@ if anyone has concerns.
I have a concern.
It does not seem correct to change the files in that way.
> -Nathan
>
> On Mon, Aug 3, 2009 at 4:12 AM, <hi...@apache.org> wrote:
> > Author: hindessm
> > Date: Mon Aug 3 09:12:45 2009
> > New Revision: 800268
> >
> > URL: http://svn.apache.org/viewvc?rev=800268&view=rev
> > Log:
> > Remove misleading comment - the only diff from latest Doug Lea version.
> >
> > Modified:
> > harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
> >
> > Modified: harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java?rev=800268&r1=800267&r2=800268&view=diff
> > ==============================================================================
> > --- harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (original)
> > +++ harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java Mon Aug 3 09:12:45 2009
> > @@ -4,11 +4,6 @@
> > * http://creativecommons.org/licenses/publicdomain
> > */
> >
> > -/*
> > - * Modified in Apache Harmony to comply with Java 5 signature
> > - * specification.
> > - */
> > -
> > package java.util.concurrent;
> >
> > import java.util.*;
> >
> >
> >
>