You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/11/30 18:05:20 UTC

[incubator-netbeans] branch master updated (3ba0a27 -> ff1e629)

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.


    from 3ba0a27  Merge pull request #301 from JaroslavTulach/jtulach/HTMLComponent
     add 9164018  [NETBEANS-54] Module review websvc.saas.*
     add 3940228  [NETBEANS-54] Module review web.*
     add 3d349ca  [NETBEANS-54] Module review schema2bean
     add 2cea3c8  [NETBEANS-54] Add missing license header and remove unused files
     add fdfe8c3  [NETBEANS-54] Remove xhtml1-dtd download and embed DTDs as in html.editor
     add 60d13aa  [NETBEANS-54] Recognize application of ALv2 in short form
     add 232370e  [NETBEANS-54] Module review form - add license header for class list
     add a4bc453  [NETBEANS-54] Module review html.parser and html.validation
     add 0fccfd4  [NETBEANS-54] Module review httpserver
     add 58bd77f  [NETBEANS-54] Module review j2ee.eclipselink, j2ee.eclipselinkmodelgen
     new ff1e629  Merge pull request #302 from matthiasblaesing/licenses

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |   2 -
 classfile/jar-excludes.txt                         |   5 -
 csl.api/changes.txt                                |   3 +
 .../editor/module/main/properties/description.txt  |   3 +
 .../binding/resources/BindingSystemClasses.txt     |  16 +
 .../modules/form/project/ClassPathUtils.java       |   2 +-
 .../modules/form/resources/SystemClasses.txt       |  16 +
 .../src/org/netbeans/modules/html/custom/spec.txt  |   3 +
 .../src/org/netbeans/modules/html/custom/todo.txt  |   3 +
 html.parser/external/howtoupgrade.txt              |   3 +
 .../src/org/netbeans/modules/html/parser/todo      |   3 +
 .../test/unit/data/testfiles/netbeans_org.html     |  21 +-
 html.parser/test/unit/data/testfiles/test2.html    |  23 +-
 .../modules/html/parser/Html5ParserTest.java       |  86 +++--
 html.validation/external/org.whattf.datatype.patch |  19 +
 .../test/unit/data/testfiles/test1.xhtml           |  20 +
 .../test/unit/data/testfiles/test2.xhtml           |  20 +
 .../test/unit/data/testfiles/wicket.xhtml          |  20 +
 .../org/netbeans/test/gui/httpserver/Module.java   |   2 +-
 .../src/org/netbeans/test/gui/httpserver/test.txt  |   3 +
 .../testfs/org/netbeans/test/httpserver/Page.html  |  20 +
 .../dir with spaces/file with spaces.txt           |  19 +
 .../unit/testfs/org/netbeans/test/httpserver/empty |   0
 j2ee.eclipselink/build.xml                         |  23 ++
 j2ee.eclipselink/external/binaries-list            |  11 +-
 ...2-licence.txt => eclipselink-2.5.2-license.txt} |   5 +-
 j2ee.eclipselink/nbproject/project.properties      |  20 +-
 j2ee.eclipselink/nbproject/project.xml             |  15 +-
 .../modules/j2ee/eclipselink/eclipselink_lib.xml   |  16 +-
 .../modules/j2ee/eclipselink/jpa20-persistence.xml |   2 +-
 j2ee.eclipselinkmodelgen/external/binaries-list    |   2 +-
 ...2-licence.txt => eclipselink-2.5.2-license.txt} |   2 +-
 .../nbproject/project.properties                   |   4 +-
 .../eclipselinkmodelgen_lib.xml                    |   2 +-
 j2ee.jpa.refactoring/nbproject/project.properties  |  10 +-
 .../nbproject/project.properties                   |   8 +-
 j2ee.metadata.model.support/nbproject/project.xml  |  10 +-
 j2ee.persistenceapi/nbproject/project.properties   |   8 +-
 .../maven/osgi/templates/Activator.java.template   |  21 +-
 .../org/netbeans/nbbuild/Arch-fake-xhtml.dtd       |  42 ---
 nbbuild/antsrc/org/netbeans/nbbuild/Arch.java      |  61 +---
 .../antsrc/org/netbeans/nbbuild}/xhtml-lat1.ent    |   0
 .../antsrc/org/netbeans/nbbuild}/xhtml-special.ent |   0
 .../antsrc/org/netbeans/nbbuild}/xhtml-symbol.ent  |   0
 .../antsrc/org/netbeans/nbbuild}/xhtml1-strict.dtd |   0
 nbbuild/build.xml                                  |  27 +-
 nbbuild/external/binaries-list                     |   1 -
 .../nbbuild-xhtml1-dtds-resources-license.txt      | 280 --------------
 nbbuild/templates/projectized.xml                  |  11 +-
 .../README-xml-resolver-1.2-netbeans.patch         |   3 +
 o.apache.xml.resolver/external/readme.txt          |  48 ---
 o.apache.xml.resolver/external/resolver.patch      | 129 -------
 openide.util.lookup/build.xml                      |   3 -
 .../src/jbiasa/.ignore                             |   0
 project.libraries/devel/design/uispec.txt          |   6 +-
 .../project/ui/resources/explorer-override.wsmode  |  20 +
 .../modules/schema2beansdev/metadd/gen.ksh         |   1 -
 .../netbeans/modules/web/common/api/WebServer.java |   6 +-
 .../org/netbeans/modules/web/common/api/mime.types |  17 +
 .../modules/web/common/api/WebServerTest.java      |   9 +
 web.common/web.common.webloc                       |   8 -
 .../modules/web/webkit/debugging/api/css/CSS.java  |  20 +-
 .../css/{Longhands.txt => Longhands.properties}    |  16 +
 .../web/webkit/debugging/api/css/CSSTest.java      |  95 +++++
 websvc.saas.api/build.xml                          |   4 -
 websvc.saas.api/external/binaries-list             |  17 -
 ...svc-saas-api-external-resources-8.2-license.txt | 406 ---------------------
 .../modules/websvc/saas/model/wadl20061109.xsd     | 289 +++++++++++++++
 .../modules/websvc/saas/model/wadl200902.xsd       | 312 ++++++++++++++++
 .../saas/codegen/java/resources/apikey.properties  |  20 +
 .../codegen/java/resources/httpbasic.properties    |  20 +
 .../codegen/java/resources/sessionkey.properties   |  20 +
 .../codegen/java/resources/signedurl.properties    |  20 +
 73 files changed, 1295 insertions(+), 1087 deletions(-)
 delete mode 100644 classfile/jar-excludes.txt
 delete mode 100644 httpserver/test/unit/testfs/org/netbeans/test/httpserver/empty
 rename j2ee.eclipselink/external/{eclipselink-2.5.2-licence.txt => eclipselink-2.5.2-license.txt} (97%)
 rename j2ee.eclipselinkmodelgen/external/{eclipselink-2.5.2-licence.txt => eclipselink-2.5.2-license.txt} (99%)
 delete mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
 copy {html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml => nbbuild/antsrc/org/netbeans/nbbuild}/xhtml-lat1.ent (100%)
 copy {html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml => nbbuild/antsrc/org/netbeans/nbbuild}/xhtml-special.ent (100%)
 copy {html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml => nbbuild/antsrc/org/netbeans/nbbuild}/xhtml-symbol.ent (100%)
 copy {html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml => nbbuild/antsrc/org/netbeans/nbbuild}/xhtml1-strict.dtd (100%)
 delete mode 100644 nbbuild/external/nbbuild-xhtml1-dtds-resources-license.txt
 delete mode 100644 o.apache.xml.resolver/external/readme.txt
 delete mode 100644 o.apache.xml.resolver/external/resolver.patch
 delete mode 100644 performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/jbiasa/.ignore
 delete mode 100644 schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
 delete mode 100644 web.common/web.common.webloc
 rename web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/{Longhands.txt => Longhands.properties} (84%)
 create mode 100644 web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/css/CSSTest.java
 delete mode 100644 websvc.saas.api/external/binaries-list
 delete mode 100644 websvc.saas.api/external/websvc-saas-api-external-resources-8.2-license.txt
 create mode 100644 websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
 create mode 100644 websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd

-- 
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].

[incubator-netbeans] 01/01: Merge pull request #302 from matthiasblaesing/licenses

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit ff1e629118ca4d1c87839656c3ded499de418e16
Merge: 3ba0a27 58bd77f
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Nov 30 19:05:17 2017 +0100

    Merge pull request #302 from matthiasblaesing/licenses
    
    Various license fixes to satisfy rat checks

 .gitignore                                         |    2 -
 classfile/jar-excludes.txt                         |    5 -
 csl.api/changes.txt                                |    3 +
 .../editor/module/main/properties/description.txt  |    3 +
 .../binding/resources/BindingSystemClasses.txt     |   16 +
 .../modules/form/project/ClassPathUtils.java       |    2 +-
 .../modules/form/resources/SystemClasses.txt       |   16 +
 .../src/org/netbeans/modules/html/custom/spec.txt  |    3 +
 .../src/org/netbeans/modules/html/custom/todo.txt  |    3 +
 html.parser/external/howtoupgrade.txt              |    3 +
 .../src/org/netbeans/modules/html/parser/todo      |    3 +
 .../test/unit/data/testfiles/netbeans_org.html     |   21 +-
 html.parser/test/unit/data/testfiles/test2.html    |   23 +-
 .../modules/html/parser/Html5ParserTest.java       |   86 +-
 html.validation/external/org.whattf.datatype.patch |   19 +
 .../test/unit/data/testfiles/test1.xhtml           |   20 +
 .../test/unit/data/testfiles/test2.xhtml           |   20 +
 .../test/unit/data/testfiles/wicket.xhtml          |   20 +
 .../org/netbeans/test/gui/httpserver/Module.java   |    2 +-
 .../src/org/netbeans/test/gui/httpserver/test.txt  |    3 +
 .../testfs/org/netbeans/test/httpserver/Page.html  |   20 +
 .../dir with spaces/file with spaces.txt           |   19 +
 .../unit/testfs/org/netbeans/test/httpserver/empty |    0
 j2ee.eclipselink/build.xml                         |   23 +
 j2ee.eclipselink/external/binaries-list            |   11 +-
 ...2-licence.txt => eclipselink-2.5.2-license.txt} |    5 +-
 j2ee.eclipselink/nbproject/project.properties      |   20 +-
 j2ee.eclipselink/nbproject/project.xml             |   15 +-
 .../modules/j2ee/eclipselink/eclipselink_lib.xml   |   16 +-
 .../modules/j2ee/eclipselink/jpa20-persistence.xml |    2 +-
 j2ee.eclipselinkmodelgen/external/binaries-list    |    2 +-
 ...2-licence.txt => eclipselink-2.5.2-license.txt} |    2 +-
 .../nbproject/project.properties                   |    4 +-
 .../eclipselinkmodelgen_lib.xml                    |    2 +-
 j2ee.jpa.refactoring/nbproject/project.properties  |   10 +-
 .../nbproject/project.properties                   |    8 +-
 j2ee.metadata.model.support/nbproject/project.xml  |   10 +-
 j2ee.persistenceapi/nbproject/project.properties   |    8 +-
 .../maven/osgi/templates/Activator.java.template   |   21 +-
 .../org/netbeans/nbbuild/Arch-fake-xhtml.dtd       |   42 -
 nbbuild/antsrc/org/netbeans/nbbuild/Arch.java      |   61 +-
 nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent |  196 ++++
 .../antsrc/org/netbeans/nbbuild/xhtml-special.ent  |   80 ++
 .../antsrc/org/netbeans/nbbuild/xhtml-symbol.ent   |  237 +++++
 .../antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd  | 1025 ++++++++++++++++++++
 nbbuild/build.xml                                  |   27 +-
 nbbuild/external/binaries-list                     |    1 -
 .../nbbuild-xhtml1-dtds-resources-license.txt      |  280 ------
 nbbuild/templates/projectized.xml                  |   11 +-
 .../README-xml-resolver-1.2-netbeans.patch         |    3 +
 o.apache.xml.resolver/external/readme.txt          |   48 -
 o.apache.xml.resolver/external/resolver.patch      |  129 ---
 openide.util.lookup/build.xml                      |    3 -
 .../src/jbiasa/.ignore                             |    0
 project.libraries/devel/design/uispec.txt          |    6 +-
 .../project/ui/resources/explorer-override.wsmode  |   20 +
 .../modules/schema2beansdev/metadd/gen.ksh         |    1 -
 .../netbeans/modules/web/common/api/WebServer.java |    6 +-
 .../org/netbeans/modules/web/common/api/mime.types |   17 +
 .../modules/web/common/api/WebServerTest.java      |    9 +
 web.common/web.common.webloc                       |    8 -
 .../modules/web/webkit/debugging/api/css/CSS.java  |   20 +-
 .../css/{Longhands.txt => Longhands.properties}    |   16 +
 .../web/webkit/debugging/api/css/CSSTest.java      |   95 ++
 websvc.saas.api/build.xml                          |    4 -
 websvc.saas.api/external/binaries-list             |   17 -
 ...svc-saas-api-external-resources-8.2-license.txt |  406 --------
 .../modules/websvc/saas/model/wadl20061109.xsd     |  289 ++++++
 .../modules/websvc/saas/model/wadl200902.xsd       |  312 ++++++
 .../saas/codegen/java/resources/apikey.properties  |   20 +
 .../codegen/java/resources/httpbasic.properties    |   20 +
 .../codegen/java/resources/sessionkey.properties   |   20 +
 .../codegen/java/resources/signedurl.properties    |   20 +
 73 files changed, 2833 insertions(+), 1087 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.