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/10/07 15:39:08 UTC

[1/8] incubator-netbeans git commit: [NETBEANS-54] Module Review api.templates

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 3a78eabda -> c18b28ed9


[NETBEANS-54] Module Review api.templates


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/d06d586d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/d06d586d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/d06d586d

Branch: refs/heads/master
Commit: d06d586d745a60d711ffd0e9779ecf697467861a
Parents: 2150433
Author: geertjan <ge...@oracle.com>
Authored: Sat Oct 7 14:59:09 2017 +0200
Committer: geertjan <ge...@oracle.com>
Committed: Sat Oct 7 14:59:09 2017 +0200

----------------------------------------------------------------------
 .../src/org/netbeans/modules/templates/utf8.xml | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d06d586d/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
----------------------------------------------------------------------
diff --git a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
index b508d10..5bddc48 100644
--- a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
+++ b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 print('<?xml version="1.0"?>');
 print('<root>');
 print('    Žluťoučký kůň skákal přes čtvero mezí.');


[5/8] incubator-netbeans git commit: Merge branch 'pr/75'

Posted by ma...@apache.org.
Merge branch 'pr/75'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ee0d6dad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ee0d6dad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ee0d6dad

Branch: refs/heads/master
Commit: ee0d6dad84ffd7af4f3806feebd1f046205cb7e5
Parents: 3a78eab d06d586
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 17:35:58 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 17:35:58 2017 +0200

----------------------------------------------------------------------
 .../src/org/netbeans/modules/templates/utf8.xml | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------



[3/8] incubator-netbeans git commit: [NETBEANS-54] Module Review api.search

Posted by ma...@apache.org.
[NETBEANS-54] Module Review api.search


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/d6b8677c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/d6b8677c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/d6b8677c

Branch: refs/heads/master
Commit: d6b8677c4b858d3ff734e2fe541ad27e0c9b1179
Parents: 2150433
Author: geertjan <ge...@oracle.com>
Authored: Sat Oct 7 15:24:57 2017 +0200
Committer: geertjan <ge...@oracle.com>
Committed: Sat Oct 7 15:24:57 2017 +0200

----------------------------------------------------------------------
 .../projects/UtilitiesTestProject/build.xml     | 20 ++++++++++++++++++++
 .../nbproject/build-impl.xml                    | 20 ++++++++++++++++++++
 .../nbproject/genfiles.properties               | 17 +++++++++++++++++
 .../nbproject/project.properties                | 17 +++++++++++++++++
 .../UtilitiesTestProject/nbproject/project.xml  | 20 ++++++++++++++++++++
 .../test/unit/data/projects/Project1/build.xml  | 20 ++++++++++++++++++++
 .../projects/Project1/nbproject/build-impl.xml  | 20 ++++++++++++++++++++
 .../Project1/nbproject/genfiles.properties      | 17 +++++++++++++++++
 .../Project1/nbproject/project.properties       | 17 +++++++++++++++++
 .../projects/Project1/nbproject/project.xml     | 20 ++++++++++++++++++++
 10 files changed, 188 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/qa-functional/data/projects/UtilitiesTestProject/build.xml
----------------------------------------------------------------------
diff --git a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/build.xml b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/build.xml
index 0b08bc2..3e753e7 100644
--- a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/build.xml
+++ b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/build.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/build-impl.xml
----------------------------------------------------------------------
diff --git a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/build-impl.xml b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/build-impl.xml
index 1b52924..3c2d555 100644
--- a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/build-impl.xml
+++ b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/build-impl.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!--
 *** GENERATED FROM project.xml - DO NOT EDIT  ***
 ***         EDIT ../build.xml INSTEAD         ***
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/genfiles.properties
----------------------------------------------------------------------
diff --git a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/genfiles.properties b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/genfiles.properties
index 48d45d5..715a8bf 100644
--- a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/genfiles.properties
+++ b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/genfiles.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 build.xml.data.CRC32=8f370949
 build.xml.script.CRC32=5c289c47
 build.xml.stylesheet.CRC32=be360661

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.properties b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.properties
index d3b550a..59d3e28 100644
--- a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.properties
+++ b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.xml b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.xml
index 020df76..56632cf 100644
--- a/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.xml
+++ b/api.search/test/qa-functional/data/projects/UtilitiesTestProject/nbproject/project.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/unit/data/projects/Project1/build.xml
----------------------------------------------------------------------
diff --git a/api.search/test/unit/data/projects/Project1/build.xml b/api.search/test/unit/data/projects/Project1/build.xml
index a1aee56..11db0cb 100644
--- a/api.search/test/unit/data/projects/Project1/build.xml
+++ b/api.search/test/unit/data/projects/Project1/build.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/unit/data/projects/Project1/nbproject/build-impl.xml
----------------------------------------------------------------------
diff --git a/api.search/test/unit/data/projects/Project1/nbproject/build-impl.xml b/api.search/test/unit/data/projects/Project1/nbproject/build-impl.xml
index b4e13fb..fbd7017 100644
--- a/api.search/test/unit/data/projects/Project1/nbproject/build-impl.xml
+++ b/api.search/test/unit/data/projects/Project1/nbproject/build-impl.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!--
 *** GENERATED FROM project.xml - DO NOT EDIT  ***
 ***         EDIT ../build.xml INSTEAD         ***
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/unit/data/projects/Project1/nbproject/genfiles.properties
----------------------------------------------------------------------
diff --git a/api.search/test/unit/data/projects/Project1/nbproject/genfiles.properties b/api.search/test/unit/data/projects/Project1/nbproject/genfiles.properties
index db88765..85d237e 100644
--- a/api.search/test/unit/data/projects/Project1/nbproject/genfiles.properties
+++ b/api.search/test/unit/data/projects/Project1/nbproject/genfiles.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 build.xml.data.CRC32=56684484
 build.xml.script.CRC32=00ebfa0e
 build.xml.stylesheet.CRC32=ba5d3624

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/unit/data/projects/Project1/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/api.search/test/unit/data/projects/Project1/nbproject/project.properties b/api.search/test/unit/data/projects/Project1/nbproject/project.properties
index 51d8acb..bd0f31e 100644
--- a/api.search/test/unit/data/projects/Project1/nbproject/project.properties
+++ b/api.search/test/unit/data/projects/Project1/nbproject/project.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 application.args=
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d6b8677c/api.search/test/unit/data/projects/Project1/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/api.search/test/unit/data/projects/Project1/nbproject/project.xml b/api.search/test/unit/data/projects/Project1/nbproject/project.xml
index d4cb353..d0f81fd 100644
--- a/api.search/test/unit/data/projects/Project1/nbproject/project.xml
+++ b/api.search/test/unit/data/projects/Project1/nbproject/project.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>


[7/8] incubator-netbeans git commit: Merge branch 'pr/77'

Posted by ma...@apache.org.
Merge branch 'pr/77'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/39bc8748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/39bc8748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/39bc8748

Branch: refs/heads/master
Commit: 39bc87482e44f6ac52d6d0a91d192e049fd58632
Parents: f73e57c d6b8677
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 17:37:43 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 17:37:43 2017 +0200

----------------------------------------------------------------------
 .../projects/UtilitiesTestProject/build.xml     | 20 ++++++++++++++++++++
 .../nbproject/build-impl.xml                    | 20 ++++++++++++++++++++
 .../nbproject/genfiles.properties               | 17 +++++++++++++++++
 .../nbproject/project.properties                | 17 +++++++++++++++++
 .../UtilitiesTestProject/nbproject/project.xml  | 20 ++++++++++++++++++++
 .../test/unit/data/projects/Project1/build.xml  | 20 ++++++++++++++++++++
 .../projects/Project1/nbproject/build-impl.xml  | 20 ++++++++++++++++++++
 .../Project1/nbproject/genfiles.properties      | 17 +++++++++++++++++
 .../Project1/nbproject/project.properties       | 17 +++++++++++++++++
 .../projects/Project1/nbproject/project.xml     | 20 ++++++++++++++++++++
 10 files changed, 188 insertions(+)
----------------------------------------------------------------------



[6/8] incubator-netbeans git commit: Merge branch 'pr/76'

Posted by ma...@apache.org.
Merge branch 'pr/76'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/f73e57c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/f73e57c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/f73e57c4

Branch: refs/heads/master
Commit: f73e57c45bfe356ceab658f1556fdc3193b4c7ce
Parents: ee0d6da 6843063
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 17:36:31 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 17:36:31 2017 +0200

----------------------------------------------------------------------
 api.visual/examples-readme.txt | 53 ++++++++++---------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)
----------------------------------------------------------------------



[4/8] incubator-netbeans git commit: [NETBEANS-54] Module Review autoupdate.services

Posted by ma...@apache.org.
[NETBEANS-54] Module Review autoupdate.services


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/8b059393
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/8b059393
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/8b059393

Branch: refs/heads/master
Commit: 8b059393a2d7932cbe094d7458801e35b58e806b
Parents: 2150433
Author: geertjan <ge...@oracle.com>
Authored: Sat Oct 7 15:43:33 2017 +0200
Committer: geertjan <ge...@oracle.com>
Committed: Sat Oct 7 15:43:33 2017 +0200

----------------------------------------------------------------------
 .../api/autoupdate/data/updates-subset.xml      | 20 ++++++++
 .../netbeans/api/autoupdate/data/updates.xml    | 20 ++++++++
 .../org/netbeans/api/autoupdate/mf-layer.xml    | 52 ++++++-------------
 .../autoupdate/updateprovider/data/catalog.xml  | 21 +++++++-
 .../autoupdate/updateprovider/malformed.xml     | 20 ++++++++
 .../netbeans/updater/UpdateTrackingTest.java    | 53 ++++++--------------
 6 files changed, 109 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates-subset.xml
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates-subset.xml b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates-subset.xml
index 3fd3413..13fdd20 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates-subset.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates-subset.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.3//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_3.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <module_updates timestamp="31/17/17/31/01/2007">
 
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates.xml
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates.xml b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates.xml
index 3cbb34b..8848751 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/data/updates.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.5//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_5.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <module_updates timestamp="31/17/17/31/01/2007">
     
 <module codenamebase="org.yourorghere.depending" distribution="nbresloc:/org/netbeans/api/autoupdate/data/org-yourorghere-depending.nbm" downloadsize="2642" homepage="" license="AD9FBBC9" moduleauthor="" needsrestart="false" releasedate="2007/01/30">

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
index 495ee6b..728b3dc 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
@@ -1,48 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
 -->
 <filesystem>
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml
index 2b93caa..bf367ef 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.6//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_6.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <module_updates timestamp="08/08/08/08/08/2008">
     
 <notification url="http://plugins.netbeans.org/tests">Important thing!</notification>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/malformed.xml
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/malformed.xml b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/malformed.xml
index 73f2f4b..f9e51a4 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/malformed.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/malformed.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <methodCall>
 <methodName>mt.supportedMethods</methodName>
 <params/>

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/8b059393/autoupdate.services/test/unit/src/org/netbeans/updater/UpdateTrackingTest.java
----------------------------------------------------------------------
diff --git a/autoupdate.services/test/unit/src/org/netbeans/updater/UpdateTrackingTest.java b/autoupdate.services/test/unit/src/org/netbeans/updater/UpdateTrackingTest.java
index bbe6fed..995109b 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/updater/UpdateTrackingTest.java
+++ b/autoupdate.services/test/unit/src/org/netbeans/updater/UpdateTrackingTest.java
@@ -1,43 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Contributor(s):
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.netbeans.updater;


[2/8] incubator-netbeans git commit: [NETBEANS-54] Module Review api.visual

Posted by ma...@apache.org.
[NETBEANS-54] Module Review api.visual


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/68430637
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/68430637
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/68430637

Branch: refs/heads/master
Commit: 684306372dbebb72fc978064e77016556e808796
Parents: 2150433
Author: geertjan <ge...@oracle.com>
Authored: Sat Oct 7 15:06:24 2017 +0200
Committer: geertjan <ge...@oracle.com>
Committed: Sat Oct 7 15:06:24 2017 +0200

----------------------------------------------------------------------
 api.visual/examples-readme.txt | 53 ++++++++++---------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/68430637/api.visual/examples-readme.txt
----------------------------------------------------------------------
diff --git a/api.visual/examples-readme.txt b/api.visual/examples-readme.txt
index eb8dd57..8fb5847 100644
--- a/api.visual/examples-readme.txt
+++ b/api.visual/examples-readme.txt
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Contributor(s):
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ================================================================================
 === Visual Library - the project locations                                   ===
 ================================================================================


[8/8] incubator-netbeans git commit: Merge branch 'pr/78'

Posted by ma...@apache.org.
Merge branch 'pr/78'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c18b28ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c18b28ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c18b28ed

Branch: refs/heads/master
Commit: c18b28ed9b4d539a8e7389aeaecf9844d7b0da51
Parents: 39bc874 8b05939
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 17:38:35 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 17:38:35 2017 +0200

----------------------------------------------------------------------
 .../api/autoupdate/data/updates-subset.xml      | 20 ++++++++
 .../netbeans/api/autoupdate/data/updates.xml    | 20 ++++++++
 .../autoupdate/updateprovider/data/catalog.xml  | 21 +++++++-
 .../autoupdate/updateprovider/malformed.xml     | 20 ++++++++
 .../netbeans/updater/UpdateTrackingTest.java    | 53 ++++++--------------
 5 files changed, 95 insertions(+), 39 deletions(-)
----------------------------------------------------------------------