Derby
  1. Derby
  2. DERBY-1377

Update copyright headers to comply with new ASF policy

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 10.2.2.0
    • Fix Version/s: 10.3.1.4
    • Component/s: Documentation
    • Labels:
      None
    • Urgency:
      Urgent

      Description

      A new copyright header policy will take effect for distributions released starting on Sep 1, 2006. Committers will receive notification, but a heads up with details is in the legal-discuss thread starting with http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c1551070F-EDE7-40DC-9C97-79BF24E9FD59@apache.org%3e
      Date was 1-Aug-2006, is now 1-Sep-2006:
      http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200607.mbox/%3cc5e632550607111955g640c8053ld092df554cea34ee@mail.gmail.com%3e

      1. DERBY-1377_NOTICE_diff.txt
        1 kB
        Daniel John Debrunner
      2. engineOrgApacheDerbyImplSql.zip
        24 kB
        Dag H. Wanvik
      3. engineOrgApacheDerbyIapiSql.zip
        10 kB
        Dag H. Wanvik
      4. engineOrgApacheDerbyIapiError.zip
        1 kB
        Dag H. Wanvik
      5. engineOrgApacheDerbyIapiReference.zip
        2 kB
        Dag H. Wanvik
      6. engineOrgApacheDerbyIapiUtil.zip
        2 kB
        Dag H. Wanvik
      7. engineOrgApacheDerbyImplLoad.zip
        2 kB
        Dag H. Wanvik
      8. testingOrgApacheDerbyTestingFunctionTestsTestsLang.diff
        242 kB
        Dag H. Wanvik
      9. testingOrgApacheDerbyTestingFunctionTestsTestsLang.stat
        16 kB
        Dag H. Wanvik
      10. testingOrgApacheDerbyTestingFunctionTestsTestsLang.diff
        79 kB
        Dag H. Wanvik
      11. testingOrgApacheDerbyTestingFunctionTestsTestsLang.stat
        5 kB
        Dag H. Wanvik
      12. fixsqlheaders.ksh
        0.3 kB
        Andrew McIntyre
      13. ij_header
        0.8 kB
        Andrew McIntyre
      14. license_header
        0.8 kB
        Andrew McIntyre
      15. derby-1377-v01.diff
        1.28 MB
        Rick Hillegas
      16. derby-1377-v01.status
        61 kB
        Rick Hillegas
      17. derby-1377-v02-nist.diff
        285 kB
        Rick Hillegas
      18. derby-1377-v02-nist.status
        17 kB
        Rick Hillegas

        Activity

        Hide
        Jean T. Anderson added a comment -

        So far, it look like this will be required in all source, but the final notice has not been emailed yet, so this is just an FYI:

        1) Move the ASF copyright to the NOTICE file (see references [3] and [4])
        2) Header of each source gets the license header as shown in [1]
        3) The html files generated by DITA doc builds need the same header, see [2], so the DITA
        build process needs to be tweaked.

        [1]
        http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c1551070F-EDE7-40DC-9C97-79BF24E9FD59@apache.org%3e
        [2]
        http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c410DFE6A-1EFE-4C91-894F-5B497F86A094@apache.org%3e
        [3] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c8042AD24-06D7-4A38-B748-F80361F14082@gbiv.com%3e
        [4] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c2D576A08-E207-412F-955C-9A367D30AE2A@apache.org%3e

        Show
        Jean T. Anderson added a comment - So far, it look like this will be required in all source, but the final notice has not been emailed yet, so this is just an FYI: 1) Move the ASF copyright to the NOTICE file (see references [3] and [4] ) 2) Header of each source gets the license header as shown in [1] 3) The html files generated by DITA doc builds need the same header, see [2] , so the DITA build process needs to be tweaked. [1] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c1551070F-EDE7-40DC-9C97-79BF24E9FD59@apache.org%3e [2] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c410DFE6A-1EFE-4C91-894F-5B497F86A094@apache.org%3e [3] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c8042AD24-06D7-4A38-B748-F80361F14082@gbiv.com%3e [4] http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c2D576A08-E207-412F-955C-9A367D30AE2A@apache.org%3e
        Show
        Jean T. Anderson added a comment - Nothing is required for web site pages (at least not yet): http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c410DFE6A-1EFE-4C91-894F-5B497F86A094@apache.org%3e
        Hide
        Rick Hillegas added a comment -

        Bumping the priority of this issue.

        Show
        Rick Hillegas added a comment - Bumping the priority of this issue.
        Show
        Jean T. Anderson added a comment - Minor note: due date moved from 1-August- 2006 to 1-September-2006; see http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200607.mbox/%3cc5e632550607111955g640c8053ld092df554cea34ee@mail.gmail.com%3e
        Hide
        Jean T. Anderson added a comment -
        Show
        Jean T. Anderson added a comment - The policy is now posted at http://www.apache.org/legal/src-headers.html
        Hide
        David Van Couvering added a comment -

        From the FAQ at http://www.apache.org/legal/src-headers.html

        "With few exceptions, all human-readable Apache-developed files that are included within a distribution must include the header text."

        and

        "A file without any degree of creativity in either its literal elements or its structure is not protected by copyright law; therefore, such a file does not require a license header. If in doubt about the extent of the file's creativity, add the license header to the file."

        I have noticed that there are a some files in Derby currently with no header. In the root directory I see build.xml, index.html, README, published_api_overview.html. Shouldn't these have license headers?

        Show
        David Van Couvering added a comment - From the FAQ at http://www.apache.org/legal/src-headers.html "With few exceptions, all human-readable Apache-developed files that are included within a distribution must include the header text." and "A file without any degree of creativity in either its literal elements or its structure is not protected by copyright law; therefore, such a file does not require a license header. If in doubt about the extent of the file's creativity, add the license header to the file." I have noticed that there are a some files in Derby currently with no header. In the root directory I see build.xml, index.html, README, published_api_overview.html. Shouldn't these have license headers?
        Hide
        David Van Couvering added a comment -

        The COPYRIGHT file in our root directory contains copyrights for IBM. Does anyone know if this needs to be changed/migrated to the NOTICE file? Unless someone says otherwise, I'll assume it should remain as is as it is not mentioned in the policy.

        Show
        David Van Couvering added a comment - The COPYRIGHT file in our root directory contains copyrights for IBM. Does anyone know if this needs to be changed/migrated to the NOTICE file? Unless someone says otherwise, I'll assume it should remain as is as it is not mentioned in the policy.
        Hide
        Jean T. Anderson added a comment -

        I think the IBM copyright belongs in the NOTICE file – http://www.apache.org/legal/src-headers.html#notice says:

        "The remainder of the NOTICE file is to be used for required third-party notices. The NOTICE file may also include copyright notices moved from source files submitted to the ASF."

        Show
        Jean T. Anderson added a comment - I think the IBM copyright belongs in the NOTICE file – http://www.apache.org/legal/src-headers.html#notice says: "The remainder of the NOTICE file is to be used for required third-party notices. The NOTICE file may also include copyright notices moved from source files submitted to the ASF."
        Hide
        Andrew McIntyre added a comment -

        Not to complicate things, but there was a big round-about with this in the early days of Derby.

        The 'resolution' is here:

        http://mail-archives.apache.org/mod_mbox/db-derby-dev/200411.mbox/%3c418A7D06.8000806@Golux.Com%3e

        Has this determination been changed by the recent revision to the header policy?

        Show
        Andrew McIntyre added a comment - Not to complicate things, but there was a big round-about with this in the early days of Derby. The 'resolution' is here: http://mail-archives.apache.org/mod_mbox/db-derby-dev/200411.mbox/%3c418A7D06.8000806@Golux.Com%3e Has this determination been changed by the recent revision to the header policy?
        Hide
        Daniel John Debrunner added a comment -

        This FAQ in http://www.apache.org/legal/src-headers.html is relevant to Andrew's comment:
        ---------------
        Should a project move non-ASF copyright notices from Apache source files to the NOTICE file?

        No. If the copyright owner is still involved with the project, they should move the notice themselves or permit us to do so. If the owner cannot be found, the copyright notice should be left as is, but the new licensing header should be added or substituted for any existing Apache license header.
        ---------------

        Are the copyright headers in Derby's source files "ASF" or "non-ASF" copyright notices?

        Show
        Daniel John Debrunner added a comment - This FAQ in http://www.apache.org/legal/src-headers.html is relevant to Andrew's comment: --------------- Should a project move non-ASF copyright notices from Apache source files to the NOTICE file? No. If the copyright owner is still involved with the project, they should move the notice themselves or permit us to do so. If the owner cannot be found, the copyright notice should be left as is, but the new licensing header should be added or substituted for any existing Apache license header. --------------- Are the copyright headers in Derby's source files "ASF" or "non-ASF" copyright notices?
        Hide
        Andrew McIntyre added a comment -

        The current headers have ASF copyright notices, e.g.:

        Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.

        There is no mention of the COPYRIGHT file in the header policy that was posted. Is this an oversight or intentional? In light of the previous resolution to this issue, I think the copyright notices in COPYRIGHT should remain there until we can get clarification that moving them to NOTICES is the right thing to do.

        Show
        Andrew McIntyre added a comment - The current headers have ASF copyright notices, e.g.: Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable. There is no mention of the COPYRIGHT file in the header policy that was posted. Is this an oversight or intentional? In light of the previous resolution to this issue, I think the copyright notices in COPYRIGHT should remain there until we can get clarification that moving them to NOTICES is the right thing to do.
        Hide
        Daniel John Debrunner added a comment -

        Depends on what the defintion of an "ASF copyright notice" is.

        Could be:

        A) A copyright notice statement that includes the text "Apache Software Foundation"

        B) A copyright notice statement where the copyright is actually held by the Apache Software Foundation

        The ones in Derby are A) but are not B).

        I'm trying to understand a bit more before going to legal-discuss.

        Show
        Daniel John Debrunner added a comment - Depends on what the defintion of an "ASF copyright notice" is. Could be: A) A copyright notice statement that includes the text "Apache Software Foundation" B) A copyright notice statement where the copyright is actually held by the Apache Software Foundation The ones in Derby are A) but are not B). I'm trying to understand a bit more before going to legal-discuss.
        Hide
        Andrew McIntyre added a comment -

        "B) A copyright notice statement where the copyright is actually held by the Apache Software Foundation"

        Since the Apache License and ICLA/CCLA involve granting the ASF a copyright license for any contribution, is there any case where B would be true?

        Show
        Andrew McIntyre added a comment - "B) A copyright notice statement where the copyright is actually held by the Apache Software Foundation" Since the Apache License and ICLA/CCLA involve granting the ASF a copyright license for any contribution, is there any case where B would be true?
        Hide
        Daniel John Debrunner added a comment -

        The ASF claims copyright on the distribution, the collection of many contributions from many, so that is one case where
        Copyright [yyyy] The Apache Software Foundation
        is correct (though I'm not a laywer).

        It's interesting to read through the discussion in legal-disucss archives, follow the first [1] link Jean gave. One reading could be that notices of the form:

        Copyright [yyyy] The Apache Software Foundation

        are being removed from source files because they are legally incorrect, no copyright assignment at ASF.

        Since Derby is a somewhat new project it has been following the newer policy( that Andrew pointed out) and thus has legally correct notices:

        Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.

        Removing these might require the permission of the actual copyright holders, which might be a pain to track down as to who has copyright on each file (allowing multiple holders per file). The new ASF policy does allow copyright notices to be left in the header (but would prefer not to).

        Show
        Daniel John Debrunner added a comment - The ASF claims copyright on the distribution, the collection of many contributions from many, so that is one case where Copyright [yyyy] The Apache Software Foundation is correct (though I'm not a laywer). It's interesting to read through the discussion in legal-disucss archives, follow the first [1] link Jean gave. One reading could be that notices of the form: Copyright [yyyy] The Apache Software Foundation are being removed from source files because they are legally incorrect, no copyright assignment at ASF. Since Derby is a somewhat new project it has been following the newer policy( that Andrew pointed out) and thus has legally correct notices: Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable. Removing these might require the permission of the actual copyright holders, which might be a pain to track down as to who has copyright on each file (allowing multiple holders per file). The new ASF policy does allow copyright notices to be left in the header (but would prefer not to).
        Hide
        Rick Hillegas added a comment -

        Adjusting urgency and severity.

        Show
        Rick Hillegas added a comment - Adjusting urgency and severity.
        Hide
        David Van Couvering added a comment -

        Do we have any conclusion about how we should take care of this? I'm thinking of unassigning myself from this problem as I feel like I don't have the complete context, not being part of the team that originally contributed the code...

        Show
        David Van Couvering added a comment - Do we have any conclusion about how we should take care of this? I'm thinking of unassigning myself from this problem as I feel like I don't have the complete context, not being part of the team that originally contributed the code...
        Hide
        Daniel John Debrunner added a comment -

        Patch DERBY-1377_NOTICE_diff.txt moves the information in the COPYRIGHT file into the NOTICE file and removed the COPYRIGHT file.

        Show
        Daniel John Debrunner added a comment - Patch DERBY-1377 _NOTICE_diff.txt moves the information in the COPYRIGHT file into the NOTICE file and removed the COPYRIGHT file.
        Hide
        David Van Couvering added a comment -

        Dan, I just noticed this patch you added. Is this something for review only, or do you want me to commit it?

        Show
        David Van Couvering added a comment - Dan, I just noticed this patch you added. Is this something for review only, or do you want me to commit it?
        Hide
        Daniel John Debrunner added a comment -

        review - I'll commit it once it's reviewed.

        Show
        Daniel John Debrunner added a comment - review - I'll commit it once it's reviewed.
        Hide
        David Van Couvering added a comment -

        Does our generated javadoc need to have license headers? My intuition is yes, but looking for others opinions

        Show
        David Van Couvering added a comment - Does our generated javadoc need to have license headers? My intuition is yes, but looking for others opinions
        Hide
        Daniel John Debrunner added a comment -

        I would say no to the generated javadoc, they are not source files.
        Though maybe the copyright statement in the footer should be modified to be just copyright ASF, matching the first copyright in the NOTICE file.
        Ie. the collected works copyright.

        The overview to the javadoc does contain a licence statement.

        Show
        Daniel John Debrunner added a comment - I would say no to the generated javadoc, they are not source files. Though maybe the copyright statement in the footer should be modified to be just copyright ASF, matching the first copyright in the NOTICE file. Ie. the collected works copyright. The overview to the javadoc does contain a licence statement.
        Hide
        David Van Couvering added a comment -

        Progress being tracked (and hopefully coordination being managed) through this Wiki page:

        http://wiki.apache.org/db-derby/FixingLicenseHeader

        Show
        David Van Couvering added a comment - Progress being tracked (and hopefully coordination being managed) through this Wiki page: http://wiki.apache.org/db-derby/FixingLicenseHeader
        Hide
        Daniel John Debrunner added a comment -

        Patch for moving notices from COPYRIGHT to NOTICE file committed revision 428924

        Show
        Daniel John Debrunner added a comment - Patch for moving notices from COPYRIGHT to NOTICE file committed revision 428924
        Hide
        Daniel John Debrunner added a comment -

        FYI Geir Magnusson Jr asked on legal-discuss if the deadline of 9/1 for this could be extended to account for the fact that it's summer vacation season in the northern hemisphere.
        While I think we want to make progress on this, not having to do it all for 10.2 might be a relief.
        And seeing how much work it is (thanks to david for the wiki page), it seems like a future bug fix release on 10.1 is very unlikely, which is a shame.

        Show
        Daniel John Debrunner added a comment - FYI Geir Magnusson Jr asked on legal-discuss if the deadline of 9/1 for this could be extended to account for the fact that it's summer vacation season in the northern hemisphere. While I think we want to make progress on this, not having to do it all for 10.2 might be a relief. And seeing how much work it is (thanks to david for the wiki page), it seems like a future bug fix release on 10.1 is very unlikely, which is a shame.
        Hide
        Daniel John Debrunner added a comment -

        The question on legal-discuss

        http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3c44D25C9D.20404@apache.org%3e

        and the answer

        http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3c3FA81EC4-64CC-4075-8D60-8C995582339A@gbiv.com%3e

        indicates it's ok to remove the existing copyright statements in the derby source code that are like:

        Copyright [yyyy] The Apache Software Foundation or its licensors, as applicable.

        Show
        Daniel John Debrunner added a comment - The question on legal-discuss http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3c44D25C9D.20404@apache.org%3e and the answer http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3c3FA81EC4-64CC-4075-8D60-8C995582339A@gbiv.com%3e indicates it's ok to remove the existing copyright statements in the derby source code that are like: Copyright [yyyy] The Apache Software Foundation or its licensors, as applicable.
        Hide
        Andrew McIntyre added a comment -

        Now that I've got some experience with these tools, I'll start knocking off the files in the code tree, starting with network server and client.

        What about the message properties files? Those certainly seem to qualify as 'creative works' to me. Unless I hear any objections, I'll make sure that the message properties files get the license header as well.

        Show
        Andrew McIntyre added a comment - Now that I've got some experience with these tools, I'll start knocking off the files in the code tree, starting with network server and client. What about the message properties files? Those certainly seem to qualify as 'creative works' to me. Unless I hear any objections, I'll make sure that the message properties files get the license header as well.
        Hide
        Dag H. Wanvik added a comment -

        Zipped diff and stat files for all directories under engine.org.apache.derby.impl.sql.
        Added licences to two files: catalog/metadata_net.properties and build.xml.
        Compiles cleanly. Starting derbyall now.

        Show
        Dag H. Wanvik added a comment - Zipped diff and stat files for all directories under engine.org.apache.derby.impl.sql. Added licences to two files: catalog/metadata_net.properties and build.xml. Compiles cleanly. Starting derbyall now.
        Hide
        Rick Hillegas added a comment -

        Rototilled license headers under java/shared/org/apache/derby/shared/ in subversion revisions:

        429768
        429771
        429781

        Show
        Rick Hillegas added a comment - Rototilled license headers under java/shared/org/apache/derby/shared/ in subversion revisions: 429768 429771 429781
        Hide
        Rick Hillegas added a comment -

        Rototilled tree under java/engine/org/apache/derby/impl/jdbc/ at subversion revision 429791. Added license header to ignored file metadata.properties.

        Show
        Rick Hillegas added a comment - Rototilled tree under java/engine/org/apache/derby/impl/jdbc/ at subversion revision 429791. Added license header to ignored file metadata.properties.
        Hide
        Rick Hillegas added a comment -

        Rototilled tree under java/engine/org/apache/derby/impl/services/ at subversion revision 429794.

        Show
        Rick Hillegas added a comment - Rototilled tree under java/engine/org/apache/derby/impl/services/ at subversion revision 429794.
        Hide
        Rick Hillegas added a comment -

        Rototilled tree under java/engine/org/apache/derby/impl/store/ at subversion revision 429802.

        Show
        Rick Hillegas added a comment - Rototilled tree under java/engine/org/apache/derby/impl/store/ at subversion revision 429802.
        Hide
        Andrew McIntyre added a comment -

        Committed java/drda changes with revision 429803, java/client changes with 429795.

        Show
        Andrew McIntyre added a comment - Committed java/drda changes with revision 429803, java/client changes with 429795.
        Hide
        Rick Hillegas added a comment -

        Rototilled tree under java/engine/org/apache/derby/iapi/services/ at subversion revision 429811.

        Show
        Rick Hillegas added a comment - Rototilled tree under java/engine/org/apache/derby/iapi/services/ at subversion revision 429811.
        Hide
        Dag H. Wanvik added a comment -

        Uploaded a zip file with new licence headers for the hierarchy engine.org.apache.derby.iapi.sql.
        One file received a new licence header: build.xml.
        Compiles cleanly. Running derbyall now.

        Show
        Dag H. Wanvik added a comment - Uploaded a zip file with new licence headers for the hierarchy engine.org.apache.derby.iapi.sql. One file received a new licence header: build.xml. Compiles cleanly. Running derbyall now.
        Hide
        Jean T. Anderson added a comment -

        Committed plugins changes with revision 429773.

        Show
        Jean T. Anderson added a comment - Committed plugins changes with revision 429773.
        Hide
        Rick Hillegas added a comment -

        Rototilled tree under java/engine/org/apache/derby/iapi/store/ at subversion revision 429816.

        Show
        Rick Hillegas added a comment - Rototilled tree under java/engine/org/apache/derby/iapi/store/ at subversion revision 429816.
        Hide
        Rick Hillegas added a comment -

        Rototilled trees under java/engine/org/apache/derby/impl/db/ and java/engine/org/apache/derby/impl/io/ at subversion revision 429836.

        Show
        Rick Hillegas added a comment - Rototilled trees under java/engine/org/apache/derby/impl/db/ and java/engine/org/apache/derby/impl/io/ at subversion revision 429836.
        Hide
        Dag H. Wanvik added a comment -

        Uploaded patches for iapi/error, iapi/reference and iapi/util directories.
        Introduced headers in two build.xml files, changed layout of header in
        reference/JDBC40Translation.java to look like the others.
        Compiles cleanly, starting derbyall.

        Show
        Dag H. Wanvik added a comment - Uploaded patches for iapi/error, iapi/reference and iapi/util directories. Introduced headers in two build.xml files, changed layout of header in reference/JDBC40Translation.java to look like the others. Compiles cleanly, starting derbyall.
        Hide
        Dag H. Wanvik added a comment -

        Uploaded patches for impl/load.
        Introduced header in build.xml.
        Compiles cleanly, starting derbyall.

        Show
        Dag H. Wanvik added a comment - Uploaded patches for impl/load. Introduced header in build.xml. Compiles cleanly, starting derbyall.
        Hide
        Dag H. Wanvik added a comment -

        Uploaded licence a licence header patch for
        testing/org/apache/derbyTesting/functionTests/tests/lang. Running derbylang now.
        I introduced headers in *.sql scripts, including subscripts, as well as .xml files.

        Show
        Dag H. Wanvik added a comment - Uploaded licence a licence header patch for testing/org/apache/derbyTesting/functionTests/tests/lang. Running derbylang now. I introduced headers in *.sql scripts, including subscripts, as well as .xml files.
        Hide
        Dag H. Wanvik added a comment -

        I need to recheck the patch for tests/lang (I see errors), so please do not commit it. I will upload
        a corrected version.

        Show
        Dag H. Wanvik added a comment - I need to recheck the patch for tests/lang (I see errors), so please do not commit it. I will upload a corrected version.
        Hide
        Dag H. Wanvik added a comment -

        I have backed out the .sql licence headers, as it seems they are not (yet) filtered out, and I
        balk at updating all the masters.. Until we decide what to do with this, I just upload a patch
        for the other files. Running derbylang again.

        Show
        Dag H. Wanvik added a comment - I have backed out the .sql licence headers, as it seems they are not (yet) filtered out, and I balk at updating all the masters.. Until we decide what to do with this, I just upload a patch for the other files. Running derbylang again.
        Hide
        Andrew McIntyre added a comment -

        If the determination is that we have to include the header in the .sql files, since they qualify as creative works, and sedding out the header isn't an option, then I'm willing to take one for the team and update all the masters as appropriate. It can't be that bad. Since the header as it appears in the master is static, it can be sedded into the master files, and then it's just a matter of verification. I'll get to work on that and report back if there are any problems.

        Show
        Andrew McIntyre added a comment - If the determination is that we have to include the header in the .sql files, since they qualify as creative works, and sedding out the header isn't an option, then I'm willing to take one for the team and update all the masters as appropriate. It can't be that bad. Since the header as it appears in the master is static, it can be sedded into the master files, and then it's just a matter of verification. I'll get to work on that and report back if there are any problems.
        Hide
        Andrew McIntyre added a comment -

        Actually, the deadline has been pushed back to:

        http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3cc5e632550608080954s923afdfk14c8028238fff004@mail.gmail.com%3e

        I propose that we fix all the java files now, and then come up with some scripts to ease the pain of fixing the sql test files or come up with some other solution, and push this out to 10.2.2. That way, if we want to do a 10.1.4 (which I don't think we should give up on), the license header file changes can be made to the 10.1 branch without any unnecessary pain.

        Show
        Andrew McIntyre added a comment - Actually, the deadline has been pushed back to: http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200608.mbox/%3cc5e632550608080954s923afdfk14c8028238fff004@mail.gmail.com%3e I propose that we fix all the java files now, and then come up with some scripts to ease the pain of fixing the sql test files or come up with some other solution, and push this out to 10.2.2. That way, if we want to do a 10.1.4 (which I don't think we should give up on), the license header file changes can be made to the 10.1 branch without any unnecessary pain.
        Hide
        Andrew McIntyre added a comment -

        Well, it's Cliff's deadline, and he said: "I think November 1 seems pretty reasonable since that will be more than 2.5 months that every single committer will have had notice and thorough documentation to get it done."

        Agreed that it's not 100% committal, but if it's his deadline and he agrees that pushing it back is reasonable...

        No need to be paranoid, though. If you're worried about it, we should ask for clarification.

        Show
        Andrew McIntyre added a comment - Well, it's Cliff's deadline, and he said: "I think November 1 seems pretty reasonable since that will be more than 2.5 months that every single committer will have had notice and thorough documentation to get it done." Agreed that it's not 100% committal, but if it's his deadline and he agrees that pushing it back is reasonable... No need to be paranoid, though. If you're worried about it, we should ask for clarification.
        Hide
        Andrew McIntyre added a comment -

        Committed revision 430143 which fixes the remaining java files in functionTests. The only remaining work for this issue is coming up for a solution to adding the license header to the .sql test files in o.a.dT.fT.tests (and possibly their associated master files as well).

        Show
        Andrew McIntyre added a comment - Committed revision 430143 which fixes the remaining java files in functionTests. The only remaining work for this issue is coming up for a solution to adding the license header to the .sql test files in o.a.dT.fT.tests (and possibly their associated master files as well).
        Hide
        Andrew McIntyre added a comment -

        Jean pointed out that Cliff states in the mail that he will be making a formal announcement of the new requirement to committers@, and that the likelihood of a Sep. 1 in light of that is highly unlikely. So, moving this out to 10.2.2. Once the formal announcement is made, we can readjust to the requirements in the announcement, if necessary.

        Show
        Andrew McIntyre added a comment - Jean pointed out that Cliff states in the mail that he will be making a formal announcement of the new requirement to committers@, and that the likelihood of a Sep. 1 in light of that is highly unlikely. So, moving this out to 10.2.2. Once the formal announcement is made, we can readjust to the requirements in the announcement, if necessary.
        Hide
        David Van Couvering added a comment -

        I believe with my last checkin that the entire source tree is completed, except for the .sql files. The .sql files are waiting until after 10.2. I am not sure where we stand with the documentation and web site subtasks.

        Show
        David Van Couvering added a comment - I believe with my last checkin that the entire source tree is completed, except for the .sql files. The .sql files are waiting until after 10.2. I am not sure where we stand with the documentation and web site subtasks.
        Hide
        David Van Couvering added a comment -

        Assigning to Andrew as the only task left is the javadoc work, which he owns...

        Show
        David Van Couvering added a comment - Assigning to Andrew as the only task left is the javadoc work, which he owns...
        Hide
        Andrew McIntyre added a comment -

        What about the SQL scripts in the tests? Are we now passing on those? I had thought that we had decided that they qualified as creative works and needed the header text, or am I misremembering?

        Show
        Andrew McIntyre added a comment - What about the SQL scripts in the tests? Are we now passing on those? I had thought that we had decided that they qualified as creative works and needed the header text, or am I misremembering?
        Hide
        Andrew McIntyre added a comment -

        script to update the headers in the sql files

        Show
        Andrew McIntyre added a comment - script to update the headers in the sql files
        Hide
        Andrew McIntyre added a comment -

        output file license header

        Show
        Andrew McIntyre added a comment - output file license header
        Hide
        Andrew McIntyre added a comment -

        license header file for use with fixsqlheaders.ksh

        Show
        Andrew McIntyre added a comment - license header file for use with fixsqlheaders.ksh
        Hide
        Daniel John Debrunner added a comment -

        It might work a little better with a semi-colon as the last element in the licence_header file.
        Otherwise the licence comment will be part of the first command and (I think) subsequently effect the output of the next line.
        At least if you see unexpected diffs try that trick.

        Show
        Daniel John Debrunner added a comment - It might work a little better with a semi-colon as the last element in the licence_header file. Otherwise the licence comment will be part of the first command and (I think) subsequently effect the output of the next line. At least if you see unexpected diffs try that trick.
        Hide
        Andrew McIntyre added a comment -

        That's a good improvement, it would allow for only one header file with the script. As it was, I just sedded out the first ij and added it back in the ij_header file.

        There are a couple of masters that have lines long enough that they break sed on my machine (e.g. bit2.out), so i'm not confident that they were updated properly. Also there might be .sql files that are included via 'run x.sql' that might cause diffs in some other master, haven't looked to see if that's actually the case. I figured any fallout like that could be caught in a derbyall run.

        Show
        Andrew McIntyre added a comment - That's a good improvement, it would allow for only one header file with the script. As it was, I just sedded out the first ij and added it back in the ij_header file. There are a couple of masters that have lines long enough that they break sed on my machine (e.g. bit2.out), so i'm not confident that they were updated properly. Also there might be .sql files that are included via 'run x.sql' that might cause diffs in some other master, haven't looked to see if that's actually the case. I figured any fallout like that could be caught in a derbyall run.
        Hide
        Rick Hillegas added a comment -

        I have assigned this task to myself. Using Andrew's script, I have fixed up the sql scripts and canons in the trunk. I've mopped up the outliers so that the tests run cleanly on solaris on 1.4, 1.5, and 1.6. I'm ready to check in this slug of work as soon as I can get over the subversion problems which are blocking me from updating and committing.

        Show
        Rick Hillegas added a comment - I have assigned this task to myself. Using Andrew's script, I have fixed up the sql scripts and canons in the trunk. I've mopped up the outliers so that the tests run cleanly on solaris on 1.4, 1.5, and 1.6. I'm ready to check in this slug of work as soon as I can get over the subversion problems which are blocking me from updating and committing.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1377-v01.diff at subversion version 467793. The corresponding derby-1377-v01.status lists the files touched. This adds copyright headers to the sql scripts used by the tests. My tests now run cleanly on 1.4, 1.5, 1.6 using the Sun vms. However, I think there may need to be some mop up on the ibm vms and on the jsr169 platform. Would appreciate it if someone could run the tests on those platforms and check in the outlier canons.

        The test run on 1.3 failed for me because of a ClassNotFound issue. Since I'm working on a new laptop, I may have some environmental issue here. Or the 1.3 tests may be broken now for other reasons. It is hard to imagine these headers introducing this problem. It would be good if someone else could try out the 1.3 tests. Thanks.

        Thanks again to Andrew for the script.

        Show
        Rick Hillegas added a comment - Committed derby-1377-v01.diff at subversion version 467793. The corresponding derby-1377-v01.status lists the files touched. This adds copyright headers to the sql scripts used by the tests. My tests now run cleanly on 1.4, 1.5, 1.6 using the Sun vms. However, I think there may need to be some mop up on the ibm vms and on the jsr169 platform. Would appreciate it if someone could run the tests on those platforms and check in the outlier canons. The test run on 1.3 failed for me because of a ClassNotFound issue. Since I'm working on a new laptop, I may have some environmental issue here. Or the 1.3 tests may be broken now for other reasons. It is hard to imagine these headers introducing this problem. It would be good if someone else could try out the 1.3 tests. Thanks. Thanks again to Andrew for the script.
        Hide
        Daniel John Debrunner added a comment -

        I believe the SQL scripts under nist should not have the Apache Licence header, since they are actually under the public domain.

        Show
        Daniel John Debrunner added a comment - I believe the SQL scripts under nist should not have the Apache Licence header, since they are actually under the public domain.
        Hide
        Rick Hillegas added a comment -

        Ported 467793 from trunk to 10.2 branch at subversion revision 478087.

        I will scrub the copyright headers from the nist tests and canons next.

        Show
        Rick Hillegas added a comment - Ported 467793 from trunk to 10.2 branch at subversion revision 478087. I will scrub the copyright headers from the nist tests and canons next.
        Hide
        Rick Hillegas added a comment -

        Committed derby-1377-v02-nist.diff at subversion revision 468102. This removes the copyright headers from the nist sql scripts and canons. The nist suite passes cleanly on solaris on sun 1.4, 1.5, and 1.6 vms.

        Show
        Rick Hillegas added a comment - Committed derby-1377-v02-nist.diff at subversion revision 468102. This removes the copyright headers from the nist sql scripts and canons. The nist suite passes cleanly on solaris on sun 1.4, 1.5, and 1.6 vms.
        Hide
        Rick Hillegas added a comment -

        Ported 468102 from trunk to 10.2 branch at subversion revision 468116. This removes the copyrights from the nist tests in the 10.2 branch.

        Show
        Rick Hillegas added a comment - Ported 468102 from trunk to 10.2 branch at subversion revision 468116. This removes the copyrights from the nist tests in the 10.2 branch.
        Hide
        Jean T. Anderson added a comment -

        I don't see any outstanding items, so am closing.

        Show
        Jean T. Anderson added a comment - I don't see any outstanding items, so am closing.
        Hide
        Myrna van Lunteren added a comment -

        reopening; some more headers are needed, especially in the functionTests area, into .subsql, .sql1, .sql2, .policy, .properties files.

        Show
        Myrna van Lunteren added a comment - reopening; some more headers are needed, especially in the functionTests area, into .subsql, .sql1, .sql2, .policy, .properties files.
        Hide
        Myrna van Lunteren added a comment -

        To be explicit:
        the following file-extensions indicate files that do not need a header:
        .ant, .exclude, .runall : are just lists of files, either for building, or running of tests
        .asc, .banner, .ctrl, .dat, .data, .del, .inc are data input files, which , although it may be creative to have come up with, do not constitute creative works by themselves
        . out files are generated
        the top level RELEASE_NOTES.html is generated

        Show
        Myrna van Lunteren added a comment - To be explicit: the following file-extensions indicate files that do not need a header: .ant, .exclude, .runall : are just lists of files, either for building, or running of tests .asc, .banner, .ctrl, .dat, .data, .del, .inc are data input files, which , although it may be creative to have come up with, do not constitute creative works by themselves . out files are generated the top level RELEASE_NOTES.html is generated
        Hide
        Myrna van Lunteren added a comment -

        to continue:
        .multi is data input
        .tests is data input
        .tstlog is both generated & data input
        .utf is data input
        jdbc/short.txt is data input
        testData/*.txt are data input files

        Show
        Myrna van Lunteren added a comment - to continue: .multi is data input .tests is data input .tstlog is both generated & data input .utf is data input jdbc/short.txt is data input testData/*.txt are data input files
        Hide
        Myrna van Lunteren added a comment -

        I added licenses to all .properties, .subsql, .sql1, .sql2 files and adjusted the saved generated output (master) files as appropriate.

        Do we need to do a similar exercise for the 10.2 branch or can we wait until someone chooses to make a release?

        Show
        Myrna van Lunteren added a comment - I added licenses to all .properties, .subsql, .sql1, .sql2 files and adjusted the saved generated output (master) files as appropriate. Do we need to do a similar exercise for the 10.2 branch or can we wait until someone chooses to make a release?
        Hide
        Jean T. Anderson added a comment -

        Myrna asked:
        >
        Do we need to do a similar exercise for the 10.2 branch or can we wait until someone chooses to make a release?

        Wait until there is a release need. We should add a "Check source headers" item to http://wiki.apache.org/db-derby/DerbySnapshotOrRelease if it isn't there already.

        thanks for taking care of this, Myrna!

        Show
        Jean T. Anderson added a comment - Myrna asked: > Do we need to do a similar exercise for the 10.2 branch or can we wait until someone chooses to make a release? Wait until there is a release need. We should add a "Check source headers" item to http://wiki.apache.org/db-derby/DerbySnapshotOrRelease if it isn't there already. thanks for taking care of this, Myrna!
        Hide
        Myrna van Lunteren added a comment -

        So, for now, this is done. Closing.
        I added a note to the Derbysnapshotorrelease page.

        Show
        Myrna van Lunteren added a comment - So, for now, this is done. Closing. I added a note to the Derbysnapshotorrelease page.

          People

          • Assignee:
            Myrna van Lunteren
            Reporter:
            Jean T. Anderson
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Due:
              Created:
              Updated:
              Resolved:

              Development