Merge branch 'pr/96' This closes #96
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/5681a0b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/5681a0b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/5681a0b1 Branch: refs/heads/master Commit: 5681a0b1686e52b810f68396692125b0567c374e Parents: 73b9472 0d35743 Author: Matthias Bläsing <[email protected]> Authored: Sun Oct 8 20:28:43 2017 +0200 Committer: Matthias Bläsing <[email protected]> Committed: Sun Oct 8 20:28:43 2017 +0200 ---------------------------------------------------------------------- .../unit/data/example-external-projects/README | 16 ++++++++++++++++ .../example-external-projects/html4j/build.xml | 20 ++++++++++++++++++++ .../html4j/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../html4j/nbproject/genfiles.properties | 17 +++++++++++++++++ .../html4j/nbproject/platform.properties | 17 +++++++++++++++++ .../html4j/nbproject/project.properties | 17 +++++++++++++++++ .../html4j/nbproject/project.xml | 20 ++++++++++++++++++++ .../example-external-projects/javafx/build.xml | 20 ++++++++++++++++++++ .../javafx/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../javafx/nbproject/genfiles.properties | 17 +++++++++++++++++ .../javafx/nbproject/platform.properties | 17 +++++++++++++++++ .../javafx/nbproject/project.properties | 17 +++++++++++++++++ .../javafx/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite1/action-project/build.xml | 20 ++++++++++++++++++++ .../action-project/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../nbproject/genfiles.properties | 17 +++++++++++++++++ .../action-project/nbproject/project.properties | 16 ++++++++++++++++ .../suite1/action-project/nbproject/project.xml | 20 ++++++++++++++++++++ .../action-project/nbproject/suite.properties | 17 +++++++++++++++++ .../examples/modules/action/Bundle.properties | 17 +++++++++++++++++ .../netbeans/examples/modules/action/layer.xml | 20 ++++++++++++++++++++ .../test/qa-functional/src/.exists | 15 +++++++++++++++ .../example-external-projects/suite1/build.xml | 20 ++++++++++++++++++++ .../suite1/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../suite1/nbproject/genfiles.properties | 17 +++++++++++++++++ .../suite1/nbproject/platform.properties | 17 +++++++++++++++++ .../suite1/nbproject/project.properties | 17 +++++++++++++++++ .../suite1/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite1/support/lib-project/build.xml | 20 ++++++++++++++++++++ .../lib-project/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../lib-project/nbproject/genfiles.properties | 17 +++++++++++++++++ .../lib-project/nbproject/project.properties | 17 +++++++++++++++++ .../support/lib-project/nbproject/project.xml | 20 ++++++++++++++++++++ .../lib-project/nbproject/suite.properties | 17 +++++++++++++++++ .../examples/modules/lib/Bundle.properties | 17 +++++++++++++++++ .../example-external-projects/suite2/build.xml | 20 ++++++++++++++++++++ .../suite2/misc-project/build.xml | 20 ++++++++++++++++++++ .../misc-project/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../misc-project/nbproject/genfiles.properties | 17 +++++++++++++++++ .../misc-project/nbproject/project.properties | 17 +++++++++++++++++ .../suite2/misc-project/nbproject/project.xml | 20 ++++++++++++++++++++ .../misc-project/nbproject/suite.properties | 17 +++++++++++++++++ .../examples/modules/misc/Bundle.properties | 17 +++++++++++++++++ .../suite2/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../suite2/nbproject/genfiles.properties | 17 +++++++++++++++++ .../suite2/nbproject/platform.properties | 17 +++++++++++++++++ .../suite2/nbproject/project.properties | 17 +++++++++++++++++ .../suite2/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite3/dummy-project/build.xml | 20 ++++++++++++++++++++ .../dummy-project/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../dummy-project/nbproject/genfiles.properties | 17 +++++++++++++++++ .../dummy-project/nbproject/platform.properties | 17 +++++++++++++++++ .../dummy-project/nbproject/project.properties | 16 ++++++++++++++++ .../suite3/dummy-project/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite3/dummy-project/src/.placeholder | 17 +++++++++++++++++ .../dummy-project/test/unit/src/.placeholder | 16 ++++++++++++++++ .../example-external-projects/suite4/build.xml | 20 ++++++++++++++++++++ .../suite4/module1/build.xml | 20 ++++++++++++++++++++ .../suite4/module1/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../module1/nbproject/genfiles.properties | 17 +++++++++++++++++ .../suite4/module1/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite4/module1/nbproject/suite.properties | 17 +++++++++++++++++ .../module1/src/module1/Bundle.properties | 17 +++++++++++++++++ .../suite4/module1/src/module1/layer.xml | 20 ++++++++++++++++++++ .../suite4/module2/build.xml | 20 ++++++++++++++++++++ .../suite4/module2/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../module2/nbproject/genfiles.properties | 17 +++++++++++++++++ .../suite4/module2/nbproject/project.xml | 20 ++++++++++++++++++++ .../suite4/module2/nbproject/suite.properties | 17 +++++++++++++++++ .../module2/src/module2/Bundle.properties | 17 +++++++++++++++++ .../suite4/module2/src/module2/layer.xml | 20 ++++++++++++++++++++ .../suite4/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../suite4/nbproject/genfiles.properties | 17 +++++++++++++++++ .../suite4/nbproject/platform.properties | 17 +++++++++++++++++ .../suite4/nbproject/project.properties | 17 +++++++++++++++++ .../suite4/nbproject/project.xml | 20 ++++++++++++++++++++ .../test/unit/data/layers/a-layer.xml | 20 ++++++++++++++++++++ .../test/unit/data/layers/b-layer.xml | 20 ++++++++++++++++++++ .../jnlp/GenerateJNLPApplicationTest.xsl | 19 +++++++++++++++++++ .../qa-functional/data/testRename/build.xml | 20 ++++++++++++++++++++ .../data/testRename/nbproject/build-impl.xml | 20 ++++++++++++++++++++ .../testRename/nbproject/genfiles.properties | 17 +++++++++++++++++ .../testRename/nbproject/platform.properties | 17 +++++++++++++++++ .../data/testRename/nbproject/project.xml | 20 ++++++++++++++++++++ .../testRename/src/testRename/Bundle.properties | 17 +++++++++++++++++ .../testRename/src/testRename/MyResolver.xml | 20 ++++++++++++++++++++ .../testRename/src/testRename/MyTemplate.my | 16 ++++++++++++++++ .../src/testRename/WhereUsedResolver.xml | 20 ++++++++++++++++++++ .../src/testRename/WhereUsedTemplate.whu | 16 ++++++++++++++++ .../data/testRename/src/testRename/layer.xml | 20 ++++++++++++++++++++ nbbuild/build.xml | 1 + 91 files changed, 1657 insertions(+) ----------------------------------------------------------------------
