Details

    • Type: Sub-task Sub-task
    • Status: Resolved
    • Priority: Blocker Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 1.6.0
    • Component/s: Android
    • Labels:
      None

      Description

      The callback-android codebase should be updated to use the Apache source header as described in http://www.apache.org/legal/src-headers.html.

        Activity

        Hide
        Joe Bowser added a comment -

        Added headers and sent a pull request. I need someone to notify me about the status of the Contacts API and confirm whether we remove the undocumented Crypto API

        Show
        Joe Bowser added a comment - Added headers and sent a pull request. I need someone to notify me about the status of the Contacts API and confirm whether we remove the undocumented Crypto API
        Hide
        Joe Bowser added a comment -

        Removed the undocumented crypto API.

        Show
        Joe Bowser added a comment - Removed the undocumented crypto API.
        Hide
        Joe Bowser added a comment -

        Hey

        Can you please have a look over it? I think we're done with the Apache Source Headers and can close this.

        Show
        Joe Bowser added a comment - Hey Can you please have a look over it? I think we're done with the Apache Source Headers and can close this.
        Hide
        Jukka Zitting added a comment -

        Running Apache Rat (http://incubator.apache.org/rat/) against the android source tree (java -jar apache-rat-0.8.jar incubator-cordova-android) flagged still the following files, categorized by required action. I already filtered out some files (VERSION, .project, etc. for which a header is clearly not needed as discussed in LEGAL-124)

        Simple bin scripts (header not absolutely needed for such small files, see LEGAL-124):

        • bin/BOOM
        • bin/autotest
        • bin/bench
        • bin/create
        • bin/create.bat
        • bin/create.js
        • bin/create.xml
        • bin/test

        Node.js modules (no header changes, but these need to be mentioned in LICENSE or alternatively replaced with auto-downloaded npm dependencies):

        • bin/node_modules/coffee-script/...
        • bin/node_modules/nodeunit/...

        Template files (not sure if a header is appropriate for such templates, see LEGAL-124)

        • bin/templates/project/cordova/...

        Test scripts (header not absolutely needed for such small files, see LEGAL-124):

        • bin/tests/...

        Framework files (need case-by-case review):

        • framework/AndroidManifest.xml
        • framework/ant.properties
        • framework/build.xml
        • framework/default.properties
        • framework/project.properties
        • framework/assets/www/index.html
        • framework/res/layout/main.xml
        • framework/res/values/strings.xml
        • framework/res/xml/cordova.xml
        • framework/res/xml/plugins.xml
        • framework/src/org/apache/cordova/AuthenticationToken.java
        • framework/src/org/apache/cordova/PreferenceNode.java
        • framework/src/org/apache/cordova/PreferenceSet.java
        • framework/test/org/apache/cordova/PreferenceNodeTest.java
        • framework/test/org/apache/cordova/PreferenceSetTest.java

        On a related note, the framework/libs/junit-4.10.jar archive mentioned in NOTICE and LICENSE is not present in the source tree, so it probably shouldn't be mentioned in those files.

        Show
        Jukka Zitting added a comment - Running Apache Rat ( http://incubator.apache.org/rat/ ) against the android source tree (java -jar apache-rat-0.8.jar incubator-cordova-android) flagged still the following files, categorized by required action. I already filtered out some files (VERSION, .project, etc. for which a header is clearly not needed as discussed in LEGAL-124 ) Simple bin scripts (header not absolutely needed for such small files, see LEGAL-124 ): bin/BOOM bin/autotest bin/bench bin/create bin/create.bat bin/create.js bin/create.xml bin/test Node.js modules (no header changes, but these need to be mentioned in LICENSE or alternatively replaced with auto-downloaded npm dependencies): bin/node_modules/coffee-script/... bin/node_modules/nodeunit/... Template files (not sure if a header is appropriate for such templates, see LEGAL-124 ) bin/templates/project/cordova/... Test scripts (header not absolutely needed for such small files, see LEGAL-124 ): bin/tests/... Framework files (need case-by-case review): framework/AndroidManifest.xml framework/ant.properties framework/build.xml framework/default.properties framework/project.properties framework/assets/www/index.html framework/res/layout/main.xml framework/res/values/strings.xml framework/res/xml/cordova.xml framework/res/xml/plugins.xml framework/src/org/apache/cordova/AuthenticationToken.java framework/src/org/apache/cordova/PreferenceNode.java framework/src/org/apache/cordova/PreferenceSet.java framework/test/org/apache/cordova/PreferenceNodeTest.java framework/test/org/apache/cordova/PreferenceSetTest.java On a related note, the framework/libs/junit-4.10.jar archive mentioned in NOTICE and LICENSE is not present in the source tree, so it probably shouldn't be mentioned in those files.
        Hide
        Simon MacDonald added a comment -

        Hey Jukka,

        Can you take a look at this commit:

        https://github.com/macdonst/cordova-android/commit/8555c42196b4250ee25ec1c9542a8dde62587d64

        as I've done the following:

        1) Skipped everything in bin/ as per LEGAL-124.
        2) Add headers to:

        framework/AndroidManifest.xml
        framework/ant.properties
        framework/build.xml
        framework/assets/www/index.html
        framework/res/layout/main.xml
        framework/res/values/strings.xml
        framework/res/xml/cordova.xml
        framework/res/xml/plugins.xml
        framework/src/org/apache/cordova/AuthenticationToken.java
        framework/src/org/apache/cordova/PreferenceNode.java
        framework/src/org/apache/cordova/PreferenceSet.java
        framework/test/org/apache/cordova/PreferenceNodeTest.java
        framework/test/org/apache/cordova/PreferenceSetTest.java

        3) Skipped the headers on the following auto generated files:

        framework/default.properties
        framework/project.properties

        4) Removed references to jUnit in NOTICE and LICENSE files.

        If it looks good to you I will apply it.

        Show
        Simon MacDonald added a comment - Hey Jukka, Can you take a look at this commit: https://github.com/macdonst/cordova-android/commit/8555c42196b4250ee25ec1c9542a8dde62587d64 as I've done the following: 1) Skipped everything in bin/ as per LEGAL-124 . 2) Add headers to: framework/AndroidManifest.xml framework/ant.properties framework/build.xml framework/assets/www/index.html framework/res/layout/main.xml framework/res/values/strings.xml framework/res/xml/cordova.xml framework/res/xml/plugins.xml framework/src/org/apache/cordova/AuthenticationToken.java framework/src/org/apache/cordova/PreferenceNode.java framework/src/org/apache/cordova/PreferenceSet.java framework/test/org/apache/cordova/PreferenceNodeTest.java framework/test/org/apache/cordova/PreferenceSetTest.java 3) Skipped the headers on the following auto generated files: framework/default.properties framework/project.properties 4) Removed references to jUnit in NOTICE and LICENSE files. If it looks good to you I will apply it.
        Hide
        Joe Bowser added a comment -

        Can you push the changes up to the Apache repo so we can get them in for the RC? I could just pull from your repo, but I think it's preferred if you do it for some reason(I think).

        Show
        Joe Bowser added a comment - Can you push the changes up to the Apache repo so we can get them in for the RC? I could just pull from your repo, but I think it's preferred if you do it for some reason(I think).
        Hide
        Simon MacDonald added a comment -

        Changes have been pushed.

        Show
        Simon MacDonald added a comment - Changes have been pushed.
        Hide
        Joe Bowser added a comment -

        I looked over Simon's commit, it should be good, but can you please confirm?

        Show
        Joe Bowser added a comment - I looked over Simon's commit, it should be good, but can you please confirm?
        Hide
        Joe Bowser added a comment -

        BUMP! It'd be good for a mentor to sign off on this before we close it.

        Show
        Joe Bowser added a comment - BUMP! It'd be good for a mentor to sign off on this before we close it.
        Hide
        Joe Bowser added a comment -

        I'm going to assume that this has been resolved. If not, it can be re-opened.

        Show
        Joe Bowser added a comment - I'm going to assume that this has been resolved. If not, it can be re-opened.

          People

          • Assignee:
            Unassigned
            Reporter:
            Jukka Zitting
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development