Uploaded image for project: 'Struts 1'
  1. Struts 1
  2. STR-1988

Update to apache 2.0 license

    XMLWordPrintableJSON

Details

    • Improvement
    • Status: Closed
    • Minor
    • Resolution: Fixed
    • Nightly Build
    • 1.2 Family
    • Unknown
    • None
    • Operating System: All
      Platform: All
    • 27137

    Description

      The java source files have been updated to use the apache 2.0 license. There is
      a main patch file that will have all the updates to files in CVS. Additionally,
      I have added two new files. NOTICE.txt is a place for extra attributions
      besides ASF. The version I'm adding has just the apache boilerplate notice file
      text. I have also added a file called LICENSE.header, which is a file that can
      be appended to the top of new files.

      To explain the reason for adding LICENSE.header, I should first explain the most
      major change between the apache 1.1 and 2.0 license usage. The 1.1 license was
      put in it's entirety at the top of all source files. The LICENSE.CheckStyle is
      used by CheckStyle to make sure the headers at the top of source files are
      correct. So with version 1.1 of the license, LICENSE.CheckStyle was just a
      regular expression version of the LICENSE.txt file. When adding headers to a
      new file, the LICENSE.txt file was used.

      With the 2.0 license, only one complete license at the top of the distribution
      or jar file is kept. All the source files include a header with copyrights, an
      overview of the license and a URL where the complete license can be found.
      Since LICENSE.txt is no longer the text added to the top of all files, it seemed
      convenient to add another file with the boilerplate header. The
      LICENSE.CheckStyle is a regular expression version of the LICENSE.header file
      now, instead of a version of LICENSE.txt.

      The contrib files will be updated with a seperate patch. They are done
      seperately since the 1.2 cutoff is tonight and I need to make sure the
      committers have enough time to check this patch.

      Special Note should be taken at:
      /src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java
      /src/share/org/apache/struts/validator/validwhen/ValidWhenParser.java
      /src/share/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
      as they had a comment at the top of the file that I moved below the license
      header. I don't know there is any dependency that would require the comment to
      remain at the top of the file, but I suspect not.

      Attachments

        1. ASF.LICENSE.NOT.GRANTED--LICENSE.header
          0.6 kB
          Paul Sundling
        2. ASF.LICENSE.NOT.GRANTED--licenses-root-dir.patch
          19 kB
          Paul Sundling
        3. ASF.LICENSE.NOT.GRANTED--licenses-src-example.patch
          86 kB
          Paul Sundling
        4. ASF.LICENSE.NOT.GRANTED--licenses-src-examples.patch
          73 kB
          Paul Sundling
        5. ASF.LICENSE.NOT.GRANTED--licenses-src-share1.patch
          462 kB
          Paul Sundling
        6. ASF.LICENSE.NOT.GRANTED--licenses-src-share2.patch
          623 kB
          Paul Sundling
        7. ASF.LICENSE.NOT.GRANTED--licenses-src-test.patch
          491 kB
          Paul Sundling
        8. ASF.LICENSE.NOT.GRANTED--licenses-src-tiles-documentation.patch
          134 kB
          Paul Sundling
        9. ASF.LICENSE.NOT.GRANTED--NOTICE.txt
          0.1 kB
          Paul Sundling

        Activity

          People

            Unassigned Unassigned
            tomcatlist@tkz.net Paul Sundling
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: